Merge branch 'main' into auth/pm-8111/browser-refresh-login-component

libs/common/src/enums/feature-flag.enum.ts

@@ -35,6 +35,7 @@ export enum FeatureFlag {
   PM11901_RefactorSelfHostingLicenseUploader = "PM-11901-refactor-self-hosting-license-uploader",
   Pm3478RefactorOrganizationUserApi = "pm-3478-refactor-organizationuser-api",
   AccessIntelligence = "pm-13227-access-intelligence",
+  Pm13322AddPolicyDefinitions = "pm-13322-add-policy-definitions",
 }
 
 export type AllowedFeatureFlagTypes = boolean | number | string;
@@ -80,6 +81,7 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader]: FALSE,
   [FeatureFlag.Pm3478RefactorOrganizationUserApi]: FALSE,
   [FeatureFlag.AccessIntelligence]: FALSE,
+  [FeatureFlag.Pm13322AddPolicyDefinitions]: FALSE,
 } satisfies Record<FeatureFlag, AllowedFeatureFlagTypes>;
 
 export type DefaultFeatureFlagValueType = typeof DefaultFeatureFlagValue;

libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html

@@ -43,8 +43,13 @@
       ></button>
       <bit-hint>{{ "sendPasswordDescV2" | i18n }}</bit-hint>
     </bit-form-field>
-    <bit-form-control *ngIf="!disableHideEmail">
-      <input bitCheckbox type="checkbox" formControlName="hideEmail" />
+    <bit-form-control *ngIf="!disableHideEmail || originalSendView.hideEmail">
+      <input
+        [disabled]="disableHideEmail && !sendOptionsForm.get('hideEmail').value"
+        bitCheckbox
+        type="checkbox"
+        formControlName="hideEmail"
+      />
       <bit-label>{{ "hideYourEmail" | i18n }}</bit-label>
     </bit-form-control>
     <bit-form-field disableMargin>