fix copy, padding, cleanup observable logic

apps/web/src/app/admin-console/organizations/policies/auto-confirm-edit-policy-dialog.component.html

@@ -38,7 +38,7 @@
   <div class="tw-flex tw-flex-col">
     @let showBadge = firstTimeDialog();
     @if (showBadge) {
-      <span bitBadge variant="info" class="tw-w-28 tw-my-2"> {{ "availableNow" | i18n }}</span>
+      <span bitBadge variant="info" class="tw-w-[99px] tw-my-2"> {{ "availableNow" | i18n }}</span>
     }
     <span>
       {{ (firstTimeDialog ? "autoConfirm" : "editPolicy") | i18n }}

apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/auto-confirm-policy.component.html

@@ -47,12 +47,12 @@
     <bit-icon class="tw-w-[233px]" [icon]="autoConfirmSvg"></bit-icon>
   </div>
   <ol>
-    <li>1. {{ "autoConfirmStep1" | i18n }}</li>
+    <li>1. {{ "autoConfirmExtension1" | i18n }}</li>
 
     <li>
-      2. {{ "autoConfirmStep2a" | i18n }}
+      2. {{ "autoConfirmExtension2" | i18n }}
       <strong>
-        {{ "autoConfirmStep2b" | i18n }}
+        {{ "autoConfirmExtension3" | i18n }}
       </strong>
     </li>
   </ol>

apps/web/src/app/vault/individual-vault/vault.component.ts

@@ -23,6 +23,7 @@ import {
   take,
   takeUntil,
   tap,
+  withLatestFrom,
 } from "rxjs/operators";
 
 import {
@@ -642,25 +643,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       );
     void this.unifiedUpgradePromptService.displayUpgradePromptConditionally();
 
-    zip([
+    this.setupAutoConfirm();
-      this.configService.getFeatureFlag$(FeatureFlag.AutoConfirm),
-      this.userId$.pipe(switchMap((userId) => this.autoConfirmService.configuration$(userId))),
-      this.organizations$.pipe(map((organizations) => organizations[0])),
-    ])
-      .pipe(
-        filter(
-          ([enabled, autoConfirmState, organization]) =>
-            enabled &&
-            autoConfirmState.showSetupDialog &&
-            !!organization &&
-            organization.canManageUsers,
-        ),
-        first(),
-        takeUntil(this.destroy$),
-      )
-      .subscribe(([enabled, autoConfirmState, organization]) =>
-        this.openAutoConfirmFeatureDialog(organization),
-      );
   }
 
   ngOnDestroy() {
@@ -1589,6 +1572,39 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       },
     });
   }
+
+  private setupAutoConfirm() {
+    zip([
+      this.organizations$.pipe(map((organizations) => organizations[0])),
+      this.configService.getFeatureFlag$(FeatureFlag.AutoConfirm),
+      this.userId$.pipe(switchMap((userId) => this.autoConfirmService.configuration$(userId))),
+      this.userId$.pipe(
+        switchMap((userId) => this.policyService.policies$(userId)),
+        withLatestFrom(this.organizations$.pipe(map((organizations) => organizations[0]))),
+        map(([policies, organization]) =>
+          policies.some(
+            (p) =>
+              p.type === PolicyType.AutoConfirm &&
+              p.enabled &&
+              p.organizationId === organization.id,
+          ),
+        ),
+      ),
+    ])
+      .pipe(
+        filter(
+          ([organization, flagEnabled, autoConfirmState, policyEnabled]) =>
+            flagEnabled &&
+            !policyEnabled &&
+            autoConfirmState.showSetupDialog &&
+            !!organization &&
+            organization.canManageUsers,
+        ),
+        first(),
+        takeUntil(this.destroy$),
+      )
+      .subscribe(([organization]) => this.openAutoConfirmFeatureDialog(organization));
+  }
 }
 
 /**

apps/web/src/locales/en/messages.json

@@ -5801,16 +5801,16 @@
   "howToTurnOnAutoConfirm": {
     "message": "How to turn on automatic user confirmation"
   },
-  "autoConfirmStep1": {
+  "autoConfirmExtension1": {
-    "message": "Open your Bitwarden extension."
+    "message": "Open your Bitwarden extension"
   },
-  "autoConfirmStep2a": {
+  "autoConfirmExtension2": {
     "message": "Select",
-    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on.'"
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
   },
-  "autoConfirmStep2b": {
+  "autoConfirmExtension3": {
-    "message": " Turn on.",
+    "message": " Turn on",
-    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on.'"
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
   },
   "autoConfirmExtensionOpened": {
     "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."

libs/common/src/admin-console/services/policy/default-policy.service.ts

@@ -285,6 +285,8 @@ export class DefaultPolicyService implements PolicyService {
       case PolicyType.RemoveUnlockWithPin:
         // Remove Unlock with PIN policy
         return false;
+      case PolicyType.AutoConfirm:
+        return false;
       case PolicyType.OrganizationDataOwnership:
         // organization data ownership policy applies to everyone except admins and owners
         return organization.isAdmin;