From 1b5faae7c3a7f550e1ffd4e2b404e0182b99aaae Mon Sep 17 00:00:00 2001
From: vinith-kovan <156108204+vinith-kovan@users.noreply.github.com>
Date: Tue, 28 May 2024 21:23:54 +0530
Subject: [PATCH 1/7] [PM-5011][PM-7284] migrate user subscription along with
 update license dialog (#8659)

* migrate user subscription along with update license dialog

* migrate user subscription along with update license dialog
---
 .../user-subscription.component.html          | 90 ++++++-------------
 .../individual/user-subscription.component.ts | 21 +++--
 .../billing/shared/billing-shared.module.ts   |  3 +
 .../update-license-dialog.component.html      | 40 +++++++++
 .../shared/update-license-dialog.component.ts | 38 ++++++++
 5 files changed, 118 insertions(+), 74 deletions(-)
 create mode 100644 apps/web/src/app/billing/shared/update-license-dialog.component.html
 create mode 100644 apps/web/src/app/billing/shared/update-license-dialog.component.ts

diff --git a/apps/web/src/app/billing/individual/user-subscription.component.html b/apps/web/src/app/billing/individual/user-subscription.component.html
index bed41c8dc5..5f9e6463f1 100644
--- a/apps/web/src/app/billing/individual/user-subscription.component.html
+++ b/apps/web/src/app/billing/individual/user-subscription.component.html
@@ -1,10 +1,10 @@
 <ng-container *ngIf="!firstLoaded && loading">
   <i
-    class="bwi bwi-spinner bwi-spin text-muted"
+    class="bwi bwi-spinner bwi-spin tw-text-muted"
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="sub">
   <bit-callout
@@ -19,19 +19,17 @@
     title="{{ 'pendingCancellation' | i18n }}"
     *ngIf="subscriptionMarkedForCancel"
   >
-    <p>{{ "subscriptionPendingCanceled" | i18n }}</p>
+    <p bitTypography="body1">{{ "subscriptionPendingCanceled" | i18n }}</p>
     <button
       bitButton
       type="button"
       buttonType="secondary"
       #reinstateBtn
-      class="btn-submit"
       (click)="reinstate()"
       [appApiAction]="reinstatePromise"
       [disabled]="$any(reinstateBtn).loading"
     >
-      <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
-      <span>{{ "reinstateSubscription" | i18n }}</span>
+      {{ "reinstateSubscription" | i18n }}
     </button>
   </bit-callout>
   <dl *ngIf="selfHosted">
@@ -39,12 +37,12 @@
     <dd *ngIf="sub.expiration">{{ sub.expiration | date: "mediumDate" }}</dd>
     <dd *ngIf="!sub.expiration">{{ "neverExpires" | i18n }}</dd>
   </dl>
-  <div class="row" *ngIf="!selfHosted">
-    <div class="col-4">
+  <div class="tw-flex tw-w-full" *ngIf="!selfHosted">
+    <div class="tw-w-1/3">
       <dl>
         <dt>{{ "status" | i18n }}</dt>
         <dd>
-          <span class="text-capitalize">{{ (subscription && subscription.status) || "-" }}</span>
+          <span class="tw-capitalize">{{ (subscription && subscription.status) || "-" }}</span>
           <span bitBadge variant="warning" *ngIf="subscriptionMarkedForCancel">{{
             "pendingCancellation" | i18n
           }}</span>
@@ -61,19 +59,19 @@
         </dd>
       </dl>
     </div>
-    <div class="col-8" *ngIf="subscription">
-      <strong class="d-block mb-1">{{ "details" | i18n }}</strong>
-      <table class="table">
-        <tbody>
+    <div class="tw-w-2/3" *ngIf="subscription">
+      <strong class="!tw-block tw-mb-1">{{ "details" | i18n }}</strong>
+      <bit-table>
+        <ng-template body>
           <tr *ngFor="let i of subscription.items">
-            <td>
+            <td bitCell>
               {{ i.name }} {{ i.quantity > 1 ? "&times;" + i.quantity : "" }} @
               {{ i.amount | currency: "$" }}
             </td>
-            <td>{{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }}</td>
+            <td bitCell>{{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }}</td>
           </tr>
-        </tbody>
-      </table>
+        </ng-template>
+      </bit-table>
     </div>
   </div>
   <ng-container *ngIf="selfHosted">
@@ -91,27 +89,9 @@
         {{ "launchCloudSubscription" | i18n }}
       </a>
     </div>
-    <div class="card mt-3" *ngIf="showUpdateLicense">
-      <div class="card-body">
-        <button
-          type="button"
-          class="close"
-          appA11yTitle="{{ 'cancel' | i18n }}"
-          (click)="closeUpdateLicense(false)"
-        >
-          <span aria-hidden="true">&times;</span>
-        </button>
-        <h3 class="card-body-header">{{ "updateLicense" | i18n }}</h3>
-        <app-update-license
-          (onUpdated)="closeUpdateLicense(true)"
-          (onCanceled)="closeUpdateLicense(false)"
-        >
-        </app-update-license>
-      </div>
-    </div>
   </ng-container>
   <ng-container *ngIf="!selfHosted">
-    <div class="d-flex">
+    <div class="tw-flex tw-justify-between">
       <button
         bitButton
         type="button"
@@ -126,43 +106,27 @@
         #cancelBtn
         type="button"
         buttonType="danger"
-        class="btn-submit tw-ml-auto"
+        class="tw-ml-auto"
         (click)="cancelSubscription()"
         [appApiAction]="cancelPromise"
         [disabled]="$any(cancelBtn).loading"
         *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel"
       >
-        <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
-        <span>{{ "cancelSubscription" | i18n }}</span>
+        {{ "cancelSubscription" | i18n }}
       </button>
     </div>
-    <h2 class="spaced-header">{{ "storage" | i18n }}</h2>
-    <p>{{ "subscriptionStorage" | i18n: sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}</p>
-    <div class="progress">
-      <div
-        class="progress-bar bg-success"
-        role="progressbar"
-        [ngStyle]="{ width: storageProgressWidth + '%' }"
-        [attr.aria-valuenow]="storagePercentage"
-        aria-valuemin="0"
-        aria-valuemax="100"
-      >
-        {{ storagePercentage / 100 | percent }}
-      </div>
-    </div>
+    <h3 bitTypography="h3" class="tw-mt-16">{{ "storage" | i18n }}</h3>
+    <p bitTypography="body1">
+      {{ "subscriptionStorage" | i18n: sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}
+    </p>
+    <bit-progress [barWidth]="storagePercentage" bgColor="success" size="default"></bit-progress>
     <ng-container *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel">
-      <div class="mt-3">
-        <div class="d-flex">
-          <button bitButton type="button" buttonType="secondary" [bitAction]="adjustStorage(true)">
+      <div class="tw-mt-3">
+        <div class="tw-flex tw-gap-1">
+          <button bitButton type="button" buttonType="secondary" (click)="adjustStorage(true)">
             {{ "addStorage" | i18n }}
           </button>
-          <button
-            bitButton
-            type="button"
-            buttonType="secondary"
-            class="tw-ml-1"
-            [bitAction]="adjustStorage(false)"
-          >
+          <button bitButton type="button" buttonType="secondary" (click)="adjustStorage(false)">
             {{ "removeStorage" | i18n }}
           </button>
         </div>
diff --git a/apps/web/src/app/billing/individual/user-subscription.component.ts b/apps/web/src/app/billing/individual/user-subscription.component.ts
index fa21317c18..8535f23f82 100644
--- a/apps/web/src/app/billing/individual/user-subscription.component.ts
+++ b/apps/web/src/app/billing/individual/user-subscription.component.ts
@@ -20,6 +20,10 @@ import {
   OffboardingSurveyDialogResultType,
   openOffboardingSurvey,
 } from "../shared/offboarding-survey.component";
+import {
+  UpdateLicenseDialogComponent,
+  UpdateLicenseDialogResult,
+} from "../shared/update-license-dialog.component";
 
 @Component({
   templateUrl: "user-subscription.component.html",
@@ -131,21 +135,16 @@ export class UserSubscriptionComponent implements OnInit {
     });
   }
 
-  updateLicense() {
+  updateLicense = async () => {
     if (this.loading) {
       return;
     }
-    this.showUpdateLicense = true;
-  }
-
-  closeUpdateLicense(load: boolean) {
-    this.showUpdateLicense = false;
-    if (load) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.load();
+    const dialogRef = UpdateLicenseDialogComponent.open(this.dialogService);
+    const result = await lastValueFrom(dialogRef.closed);
+    if (result === UpdateLicenseDialogResult.Updated) {
+      await this.load();
     }
-  }
+  };
 
   adjustStorage = (add: boolean) => {
     return async () => {
diff --git a/apps/web/src/app/billing/shared/billing-shared.module.ts b/apps/web/src/app/billing/shared/billing-shared.module.ts
index 35fe33c7e0..0031cff775 100644
--- a/apps/web/src/app/billing/shared/billing-shared.module.ts
+++ b/apps/web/src/app/billing/shared/billing-shared.module.ts
@@ -12,6 +12,7 @@ import { PaymentMethodComponent } from "./payment-method.component";
 import { PaymentComponent } from "./payment.component";
 import { SecretsManagerSubscribeComponent } from "./sm-subscribe.component";
 import { TaxInfoComponent } from "./tax-info.component";
+import { UpdateLicenseDialogComponent } from "./update-license-dialog.component";
 import { UpdateLicenseComponent } from "./update-license.component";
 
 @NgModule({
@@ -24,6 +25,7 @@ import { UpdateLicenseComponent } from "./update-license.component";
     PaymentMethodComponent,
     SecretsManagerSubscribeComponent,
     UpdateLicenseComponent,
+    UpdateLicenseDialogComponent,
     OffboardingSurveyComponent,
   ],
   exports: [
@@ -34,6 +36,7 @@ import { UpdateLicenseComponent } from "./update-license.component";
     BillingHistoryComponent,
     SecretsManagerSubscribeComponent,
     UpdateLicenseComponent,
+    UpdateLicenseDialogComponent,
     OffboardingSurveyComponent,
   ],
 })
diff --git a/apps/web/src/app/billing/shared/update-license-dialog.component.html b/apps/web/src/app/billing/shared/update-license-dialog.component.html
new file mode 100644
index 0000000000..6430c47528
--- /dev/null
+++ b/apps/web/src/app/billing/shared/update-license-dialog.component.html
@@ -0,0 +1,40 @@
+<form [formGroup]="updateLicenseForm" [bitSubmit]="submitLicenseDialog">
+  <bit-dialog dialogSize="default" [title]="'updateLicense' | i18n">
+    <ng-container bitDialogContent>
+      <bit-form-field>
+        <bit-label>{{ "licenseFile" | i18n }}</bit-label>
+        <div>
+          <button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
+            {{ "chooseFile" | i18n }}
+          </button>
+          {{ licenseFile ? licenseFile.name : ("noFileChosen" | i18n) }}
+        </div>
+        <input
+          bitInput
+          #fileSelector
+          type="file"
+          formControlName="file"
+          (change)="setSelectedFile($event)"
+          hidden
+        />
+        <bit-hint>{{ "licenseFileDesc" | i18n: "bitwarden_premium_license.json" }}</bit-hint>
+      </bit-form-field>
+    </ng-container>
+    <ng-container bitDialogFooter>
+      <button type="submit" buttonType="primary" bitButton bitFormButton>
+        {{ "submit" | i18n }}
+      </button>
+      <button
+        bitButton
+        *ngIf="showCancel"
+        bitFormButton
+        buttonType="secondary"
+        type="button"
+        bitDialogClose
+        [bitAction]="cancel"
+      >
+        {{ "cancel" | i18n }}
+      </button>
+    </ng-container>
+  </bit-dialog>
+</form>
diff --git a/apps/web/src/app/billing/shared/update-license-dialog.component.ts b/apps/web/src/app/billing/shared/update-license-dialog.component.ts
new file mode 100644
index 0000000000..5f9a1e94be
--- /dev/null
+++ b/apps/web/src/app/billing/shared/update-license-dialog.component.ts
@@ -0,0 +1,38 @@
+import { Component } from "@angular/core";
+import { FormBuilder } from "@angular/forms";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { DialogService } from "@bitwarden/components";
+
+import { UpdateLicenseComponent } from "./update-license.component";
+
+export enum UpdateLicenseDialogResult {
+  Updated = "updated",
+  Cancelled = "cancelled",
+}
+@Component({
+  templateUrl: "update-license-dialog.component.html",
+})
+export class UpdateLicenseDialogComponent extends UpdateLicenseComponent {
+  constructor(
+    apiService: ApiService,
+    i18nService: I18nService,
+    platformUtilsService: PlatformUtilsService,
+    organizationApiService: OrganizationApiServiceAbstraction,
+    formBuilder: FormBuilder,
+  ) {
+    super(apiService, i18nService, platformUtilsService, organizationApiService, formBuilder);
+  }
+  async submitLicense() {
+    await this.submit();
+  }
+  submitLicenseDialog = async () => {
+    await this.submitLicense();
+  };
+  static open(dialogService: DialogService) {
+    return dialogService.open<UpdateLicenseDialogResult>(UpdateLicenseDialogComponent);
+  }
+}

From 5a25024f591d590d6a1c297b97cf3168ff6fb96c Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Tue, 28 May 2024 17:38:15 +0100
Subject: [PATCH 2/7] Change Addons to Add-ons (#9392)

---
 apps/web/src/locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index c21955179d..e090f6a7ab 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2102,7 +2102,7 @@
     "message": "Bitwarden Families plan."
   },
   "addons": {
-    "message": "Addons"
+    "message": "Add-ons"
   },
   "premiumAccess": {
     "message": "Premium access"

From 3fc2570a0e2437242b880fd1662f31f573ab11c9 Mon Sep 17 00:00:00 2001
From: DanHillesheim <79476558+DanHillesheim@users.noreply.github.com>
Date: Tue, 28 May 2024 10:42:53 -0600
Subject: [PATCH 3/7] Trial initiation content updates (#9138)

---
 .../content/enterprise-content.component.html |  73 +++++++++++-------
 .../content/logo-badges.component.html        |  11 +++
 .../content/logo-badges.component.ts          |   7 ++
 .../content/teams1-content.component.html     |  43 +++++++----
 .../trial-initiation.module.ts                |   2 +
 .../register-layout/vault-signup-badges.png   | Bin 0 -> 20376 bytes
 6 files changed, 94 insertions(+), 42 deletions(-)
 create mode 100644 apps/web/src/app/auth/trial-initiation/content/logo-badges.component.html
 create mode 100644 apps/web/src/app/auth/trial-initiation/content/logo-badges.component.ts
 create mode 100644 apps/web/src/images/register-layout/vault-signup-badges.png

diff --git a/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html b/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html
index 120748d4c0..4abb44db4f 100644
--- a/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html
+++ b/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html
@@ -1,34 +1,51 @@
-<h1 class="tw-text-3xl !tw-text-alt2">The Password Manager Trusted by Millions</h1>
-<div class="tw-pt-32">
-  <h2 class="tw-text-2xl">Everything enterprises need out of a password manager:</h2>
+<h1 class="tw-text-3xl !tw-text-alt2">Start your 7-day free trial of Bitwarden</h1>
+<div class="tw-pt-20">
+  <h2 class="tw-text-2xl">
+    Strengthen business security with the password manager designed for seamless administration and
+    employee usability.
+  </h2>
 </div>
 <ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main tw-list-none tw-pl-0">
-  <li><i class="bwi bwi-lg bwi-check-circle tw-mr-4"></i>Secure password sharing</li>
-  <li>
-    <i class="bwi bwi-lg bwi-check-circle tw-mr-4"></i>Easy, flexible SSO and SCIM integrations
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Instantly and securely share credentials with the groups and individuals who need them</span
+    >
+  </li>
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Strengthen employee security practices through centralized administrative control and
+      policies</span
+    >
+  </li>
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Streamline user onboarding and automate account provisioning with turnkey SSO and SCIM
+      integrations</span
+    >
+  </li>
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Migrate to Bitwarden in minutes with comprehensive import options</span
+    >
+  </li>
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Save time and increase productivity with autofill and instant device syncing</span
+    >
+  </li>
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Empower employees to secure their digital life at home, at work, and on the go by offering a
+      free Families plan to all Enterprise users</span
+    >
   </li>
-  <li><i class="bwi bwi-lg bwi-check-circle tw-mr-4"></i>Free families plan for users</li>
-  <li><i class="bwi bwi-lg bwi-check-circle tw-mr-4"></i>Quick import and migration tools</li>
-  <li><i class="bwi bwi-lg bwi-check-circle tw-mr-4"></i>Simple, streamlined user experience</li>
-  <li><i class="bwi bwi-lg bwi-check-circle tw-mr-4"></i>Priority support and trainers</li>
 </ul>
 <div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-cnet-5-stars></app-logo-cnet-5-stars>
-  <div class="tw-flex tw-items-end tw-gap-8">
-    <review-logo
-      logoClass="tw-w-8"
-      logoSrc="../../images/register-layout/g2-logo.svg"
-      logoAlt="G2 Logo"
-    ></review-logo>
-    <review-logo
-      logoClass="tw-w-28"
-      logoSrc="../../images/register-layout/capterra-logo.svg"
-      logoAlt="Capterra Logo"
-    ></review-logo>
-    <review-logo
-      logoClass="tw-w-28"
-      logoSrc="../../images/register-layout/get-app-logo.svg"
-      logoAlt="Get App Logo"
-    ></review-logo>
-  </div>
+  <app-logo-badges></app-logo-badges>
 </div>
diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.html b/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.html
new file mode 100644
index 0000000000..d1b33eab3a
--- /dev/null
+++ b/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.html
@@ -0,0 +1,11 @@
+<figure>
+  <figcaption>
+    <cite>
+      <img
+        src="../../images/register-layout/vault-signup-badges.png"
+        class="tw-mx-auto tw-block tw-w-full"
+        alt="third party awards"
+      />
+    </cite>
+  </figcaption>
+</figure>
diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.ts b/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.ts
new file mode 100644
index 0000000000..c23432b67c
--- /dev/null
+++ b/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.ts
@@ -0,0 +1,7 @@
+import { Component } from "@angular/core";
+
+@Component({
+  selector: "app-logo-badges",
+  templateUrl: "logo-badges.component.html",
+})
+export class LogoBadgesComponent {}
diff --git a/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html b/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html
index d26bbabaef..42f99be26b 100644
--- a/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html
+++ b/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html
@@ -1,21 +1,36 @@
-<h1 class="tw-text-4xl !tw-text-alt2">Start Your Teams Free Trial Now</h1>
-<div class="tw-flex tw-flex-col tw-items-center tw-justify-center tw-pt-16">
-  <div class="tw-text-2xl">$4 per month / per user</div>
-  <div class="tw-text-xl">Annual subscription</div>
-</div>
+<h1 class="tw-text-4xl !tw-text-alt2">Start your 7-day free trial for Teams</h1>
+<div class="tw-flex tw-flex-col tw-items-center tw-justify-center tw-pt-16"></div>
 <div class="tw-pt-10">
   <h2 class="tw-text-2xl">
-    Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure password
-    storage and sharing.
+    Strengthen business security with an easy-to-use password manager your team will love.
   </h2>
 </div>
-<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main">
-  <li>Collaborate and share securely</li>
-  <li>Deploy and manage quickly and easily</li>
-  <li>Access anywhere on any device</li>
-  <li>Create your account to get started</li>
+<ul class="tw-mt-12 tw-flex tw-flex-col tw-gap-10 tw-text-2xl tw-text-main tw-list-none tw-pl-0">
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Instantly and securely share credentials with the groups and individuals who need them</span
+    >
+  </li>
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Migrate to Bitwarden in minutes with comprehensive import options</span
+    >
+  </li>
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Save time and increase productivity with autofill and instant device syncing</span
+    >
+  </li>
+  <li class="tw-flex tw-items-center">
+    <i class="bwi bwi-lg bwi-check-circle tw-mr-4 tw-flex-none"></i
+    ><span class="tw-flex-auto"
+      >Enhance security practices across your team with easy user management</span
+    >
+  </li>
 </ul>
 <div class="tw-mt-28 tw-flex tw-flex-col tw-items-center tw-gap-5">
-  <app-logo-forbes></app-logo-forbes>
-  <app-logo-us-news></app-logo-us-news>
+  <app-logo-badges></app-logo-badges>
 </div>
diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts
index 6e25e97858..57d982fd00 100644
--- a/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts
+++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts
@@ -24,6 +24,7 @@ import { DefaultContentComponent } from "./content/default-content.component";
 import { EnterpriseContentComponent } from "./content/enterprise-content.component";
 import { Enterprise1ContentComponent } from "./content/enterprise1-content.component";
 import { Enterprise2ContentComponent } from "./content/enterprise2-content.component";
+import { LogoBadgesComponent } from "./content/logo-badges.component";
 import { LogoCnet5StarsComponent } from "./content/logo-cnet-5-stars.component";
 import { LogoCnetComponent } from "./content/logo-cnet.component";
 import { LogoForbesComponent } from "./content/logo-forbes.component";
@@ -69,6 +70,7 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul
     CnetTeamsContentComponent,
     AbmEnterpriseContentComponent,
     AbmTeamsContentComponent,
+    LogoBadgesComponent,
     LogoCnet5StarsComponent,
     LogoCnetComponent,
     LogoForbesComponent,
diff --git a/apps/web/src/images/register-layout/vault-signup-badges.png b/apps/web/src/images/register-layout/vault-signup-badges.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a80ffaebb9ad3d6ba162b5237f0b465205f974d
GIT binary patch
literal 20376
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

literal 0
HcmV?d00001


From 7fbd9901f0ef72c32bfa3da9f5decd46a9021faf Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Tue, 28 May 2024 20:35:10 +0200
Subject: [PATCH 4/7] Fix missing confirmation toast on vault export (#9398)

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 apps/web/src/app/tools/vault-export/export.component.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/web/src/app/tools/vault-export/export.component.ts b/apps/web/src/app/tools/vault-export/export.component.ts
index 7902d2818d..df53e599ed 100644
--- a/apps/web/src/app/tools/vault-export/export.component.ts
+++ b/apps/web/src/app/tools/vault-export/export.component.ts
@@ -42,4 +42,9 @@ export class ExportComponent extends BaseExportComponent {
       organizationService,
     );
   }
+
+  protected saved() {
+    super.saved();
+    this.platformUtilsService.showToast("success", null, this.i18nService.t("exportSuccess"));
+  }
 }

From e14e2627ad7409b5a538bf928a9abdf5858957fe Mon Sep 17 00:00:00 2001
From: Cesar Gonzalez <cesar.a.gonzalezcs@gmail.com>
Date: Tue, 28 May 2024 14:05:24 -0500
Subject: [PATCH 5/7] [PM-8447] Autofill On Load Causes Extension to Hang After
 Browser Startup (#9400)

---
 .../services/autofill.service.spec.ts         | 20 +++++++++++++++++++
 .../src/autofill/services/autofill.service.ts |  7 ++++++-
 .../browser/src/background/main.background.ts |  1 +
 .../src/popup/services/services.module.ts     |  1 +
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts
index 24b1c90b3f..23f690544d 100644
--- a/apps/browser/src/autofill/services/autofill.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill.service.spec.ts
@@ -1,6 +1,8 @@
 import { mock, mockReset, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject, of } from "rxjs";
 
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service";
 import { AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants";
 import { AutofillSettingsService } from "@bitwarden/common/autofill/services/autofill-settings.service";
@@ -78,12 +80,17 @@ describe("AutofillService", () => {
   const userVerificationService = mock<UserVerificationService>();
   const billingAccountProfileStateService = mock<BillingAccountProfileStateService>();
   const platformUtilsService = mock<PlatformUtilsService>();
+  let activeAccountStatusMock$: BehaviorSubject<AuthenticationStatus>;
+  let authService: MockProxy<AuthService>;
 
   beforeEach(() => {
     scriptInjectorService = new BrowserScriptInjectorService(platformUtilsService, logService);
     inlineMenuVisibilityMock$ = new BehaviorSubject(AutofillOverlayVisibility.OnFieldFocus);
     autofillSettingsService = mock<AutofillSettingsService>();
     (autofillSettingsService as any).inlineMenuVisibility$ = inlineMenuVisibilityMock$;
+    activeAccountStatusMock$ = new BehaviorSubject(AuthenticationStatus.Unlocked);
+    authService = mock<AuthService>();
+    authService.activeAccountStatus$ = activeAccountStatusMock$;
     autofillService = new AutofillService(
       cipherService,
       autofillSettingsService,
@@ -95,6 +102,7 @@ describe("AutofillService", () => {
       billingAccountProfileStateService,
       scriptInjectorService,
       accountService,
+      authService,
     );
 
     domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider);
@@ -287,6 +295,18 @@ describe("AutofillService", () => {
       });
     });
 
+    it("skips injecting the autofiller script when the user's account is not unlocked", async () => {
+      activeAccountStatusMock$.next(AuthenticationStatus.Locked);
+
+      await autofillService.injectAutofillScripts(sender.tab, sender.frameId, true);
+
+      expect(BrowserApi.executeScriptInTab).not.toHaveBeenCalledWith(tabMock.id, {
+        file: "content/autofiller.js",
+        frameId: sender.frameId,
+        ...defaultExecuteScriptOptions,
+      });
+    });
+
     it("will inject the bootstrap-autofill-overlay script if the user has the autofill overlay enabled", async () => {
       await autofillService.injectAutofillScripts(sender.tab, sender.frameId);
 
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index 5348ca5b9a..9ec2052381 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -3,7 +3,9 @@ import { pairwise } from "rxjs/operators";
 
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants";
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
@@ -61,6 +63,7 @@ export default class AutofillService implements AutofillServiceInterface {
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private scriptInjectorService: ScriptInjectorService,
     private accountService: AccountService,
+    private authService: AuthService,
   ) {}
 
   /**
@@ -113,6 +116,8 @@ export default class AutofillService implements AutofillServiceInterface {
     // Autofill user settings loaded from state can await the active account state indefinitely
     // if not guarded by an active account check (e.g. the user is logged in)
     const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
+    const authStatus = await firstValueFrom(this.authService.activeAccountStatus$);
+    const accountIsUnlocked = authStatus === AuthenticationStatus.Unlocked;
     let overlayVisibility: InlineMenuVisibilitySetting = AutofillOverlayVisibility.Off;
     let autoFillOnPageLoadIsEnabled = false;
 
@@ -126,7 +131,7 @@ export default class AutofillService implements AutofillServiceInterface {
 
     const injectedScripts = [mainAutofillScript];
 
-    if (activeAccount) {
+    if (activeAccount && accountIsUnlocked) {
       autoFillOnPageLoadIsEnabled = await this.getAutofillOnPageLoad();
     }
 
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index a382a76781..2072f8396e 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -872,6 +872,7 @@ export default class MainBackground {
       this.billingAccountProfileStateService,
       this.scriptInjectorService,
       this.accountService,
+      this.authService,
     );
     this.auditService = new AuditService(this.cryptoFunctionService, this.apiService);
 
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index d260b4ec7b..342b3d26a6 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -341,6 +341,7 @@ const safeProviders: SafeProvider[] = [
       BillingAccountProfileStateService,
       ScriptInjectorService,
       AccountServiceAbstraction,
+      AuthService,
     ],
   }),
   safeProvider({

From e47f83db80546a6fec4bbd04d2cb49ab05c31c49 Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Tue, 28 May 2024 14:17:20 -0500
Subject: [PATCH 6/7] fix: remove view events menu option for users without
 permission, refs PM-7024 (#9355)

---
 apps/web/src/app/vault/org-vault/vault.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/app/vault/org-vault/vault.component.html b/apps/web/src/app/vault/org-vault/vault.component.html
index 06907b9e5d..af8789c906 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.html
+++ b/apps/web/src/app/vault/org-vault/vault.component.html
@@ -62,7 +62,7 @@
       [showPremiumFeatures]="organization?.useTotp"
       [showBulkMove]="false"
       [showBulkTrashOptions]="filter.type === 'trash'"
-      [useEvents]="organization?.useEvents"
+      [useEvents]="organization?.canAccessEventLogs"
       [showAdminActions]="true"
       (onEvent)="onVaultItemsEvent($event)"
       [showBulkEditCollectionAccess]="organization?.flexibleCollections"

From bc170f520748a8f320e0ccbc6fb2edcb31972fb2 Mon Sep 17 00:00:00 2001
From: Jake Fink <jfink@bitwarden.com>
Date: Tue, 28 May 2024 15:17:30 -0400
Subject: [PATCH 7/7] use valid userId when logging out (#9334)

---
 apps/browser/src/background/main.background.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 2072f8396e..51d18f15a3 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -1333,7 +1333,7 @@ export default class MainBackground {
     ]);
 
     //Needs to be checked before state is cleaned
-    const needStorageReseed = await this.needsStorageReseed(userId);
+    const needStorageReseed = await this.needsStorageReseed(userBeingLoggedOut);
 
     await this.stateService.clean({ userId: userBeingLoggedOut });
     await this.accountService.clean(userBeingLoggedOut);