Merge branch 'main' into ps/extension-refresh

libs/common/src/admin-console/services/organization-domain/org-domain.service.spec.ts

@@ -180,6 +180,5 @@ describe("Org Domain Service", () => {
   it("copyDnsTxt copies DNS TXT to clipboard and shows toast", () => {
     orgDomainService.copyDnsTxt("fakeTxt");
     expect(jest.spyOn(platformUtilService, "copyToClipboard")).toHaveBeenCalled();
-    expect(jest.spyOn(platformUtilService, "showToast")).toHaveBeenCalled();
   });
 });

libs/common/src/admin-console/services/organization-domain/org-domain.service.ts

@@ -23,11 +23,6 @@ export class OrgDomainService implements OrgDomainInternalServiceAbstraction {
 
   copyDnsTxt(dnsTxt: string): void {
     this.platformUtilsService.copyToClipboard(dnsTxt);
-    this.platformUtilsService.showToast(
-      "success",
-      null,
-      this.i18nService.t("valueCopied", this.i18nService.t("dnsTxtRecord")),
-    );
   }
 
   upsert(orgDomains: OrganizationDomainResponse[]): void {

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>

libs/vault/src/cipher-form/components/autofill-options/uri-option.component.spec.ts

@@ -58,6 +58,13 @@ describe("UriOptionComponent", () => {
     expect(component["uriMatchOptions"][0].label).toBe("default");
   });
 
+  it("should update the default uri match strategy label when it is domain", () => {
+    component.defaultMatchDetection = UriMatchStrategy.Domain;
+    fixture.detectChanges();
+
+    expect(component["uriMatchOptions"][0].label).toBe("defaultLabel baseDomain");
+  });
+
   it("should update the default uri match strategy label", () => {
     component.defaultMatchDetection = UriMatchStrategy.Exact;
     fixture.detectChanges();

libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts

@@ -84,7 +84,7 @@ export class UriOptionComponent implements ControlValueAccessor {
   @Input({ required: true })
   set defaultMatchDetection(value: UriMatchStrategySetting) {
     // The default selection has a value of `null` avoid showing "Default (Default)"
-    if (!value) {
+    if (value === null) {
       return;
     }