PM-14445: Wrong formatting due to merge conflict

2026-02-25 17:13:24 +00:00 · 2024-11-05 12:25:33 +00:00
parent 6340bac6f2
commit 91fc1fa630
48 changed files with 69 additions and 69 deletions
--- a/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.html
+++ b/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.html
@@ -26,7 +26,7 @@
          title="{{ 'customColor' | i18n }}"
          [ngClass]="{
            '!tw-outline-[3px] tw-outline-primary-600 hover:tw-outline-[3px] hover:tw-outline-primary-600':
-              customColorSelected
+              customColorSelected,
          }"
          class="tw-relative tw-flex tw-h-24 tw-w-24 tw-cursor-pointer tw-place-content-center tw-content-center tw-justify-center tw-rounded-full tw-border tw-border-solid tw-border-secondary-600 tw-outline tw-outline-0 tw-outline-offset-1 hover:tw-outline-1 hover:tw-outline-primary-300 focus:tw-outline-2 focus:tw-outline-primary-600"
          [style.background-color]="customColor$ | async"
--- a/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html
+++ b/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html
@@ -34,7 +34,7 @@
        [organizationInfo]="{
          name: orgInfoFormGroup.value.name,
          email: orgInfoFormGroup.value.billingEmail,
-          type: trialOrganizationType
+          type: trialOrganizationType,
        }"
        [subscriptionProduct]="
          product === ProductType.SecretsManager
--- a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html
+++ b/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html
@@ -33,7 +33,7 @@
      [organizationInfo]="{
        name: formGroup.get('name').value,
        email: formGroup.get('email').value,
-        type: productType
+        type: productType,
      }"
      [subscriptionProduct]="SubscriptionProduct.SecretsManager"
      (steppedBack)="steppedBack()"
--- a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html
+++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html
@@ -102,7 +102,7 @@
                  [organizationInfo]="{
                    name: orgInfoFormGroup.get('name').value,
                    email: orgInfoFormGroup.get('email').value,
-                    type: trialOrganizationType
+                    type: trialOrganizationType,
                  }"
                  [subscriptionProduct]="SubscriptionProduct.PasswordManager"
                  (steppedBack)="previousStep()"
--- a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html
+++ b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html
@@ -6,7 +6,7 @@
    [disabled]="disabled"
    class="tw-flex tw-w-full tw-items-center tw-border-none tw-bg-transparent"
    [ngClass]="{
-      'hover:tw-bg-secondary-100': !disabled && step.editable
+      'hover:tw-bg-secondary-100': !disabled && step.editable,
    }"
    [attr.aria-expanded]="selected"
  >
@@ -16,7 +16,7 @@
      [ngClass]="{
        'tw-bg-primary-600 tw-text-contrast': selected,
        'tw-bg-secondary-300 tw-text-main': !selected && !disabled && step.editable,
-        'tw-bg-transparent tw-text-muted': disabled
+        'tw-bg-transparent tw-text-muted': disabled,
      }"
    >
      {{ stepNumber }}
@@ -30,13 +30,13 @@
    <div
      class="tw-txt-main tw-mt-3.5 tw-h-12 tw-text-left tw-leading-snug"
      [ngClass]="{
-        'tw-font-bold': selected
+        'tw-font-bold': selected,
      }"
    >
      <p
        class="main-label text tw-mb-1 tw-text-main"
        [ngClass]="{
-          'tw-mt-1': !step.subLabel
+          'tw-mt-1': !step.subLabel,
        }"
      >
        {{ step.label }}
--- a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html
+++ b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html
@@ -3,7 +3,7 @@
    class="tw-inline-block tw-w-11/12 tw-pl-7"
    [ngClass]="{
      'tw-border-0 tw-border-l tw-border-solid tw-border-secondary-300': applyBorder,
-      'tw-pt-6': addSubLabelSpacing
+      'tw-pt-6': addSubLabelSpacing,
    }"
  >
    <ng-content></ng-content>
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
@@ -73,7 +73,7 @@
                class="tw-bg-secondary-100 tw-text-center !tw-border-0 tw-text-sm tw-font-bold tw-py-1"
                [ngClass]="{
                  'tw-bg-primary-700 !tw-text-contrast': selectableProduct === selectedPlan,
-                  'tw-bg-secondary-100': !(selectableProduct === selectedPlan)
+                  'tw-bg-secondary-100': !(selectableProduct === selectedPlan),
                }"
              >
                {{ "recommended" | i18n }}
@@ -82,7 +82,7 @@
                class="tw-px-2 tw-pb-[4px]"
                [ngClass]="{
                  'tw-py-1': !(selectableProduct === selectedPlan),
-                  'tw-py-0': selectableProduct === selectedPlan
+                  'tw-py-0': selectableProduct === selectedPlan,
                }"
              >
                <h3
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -261,7 +261,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
    ];
    this.discountPercentageFromSub = this.isSecretsManagerTrial()
      ? 0
-      : this.sub?.customerDiscount?.percentOff ?? 0;
+      : (this.sub?.customerDiscount?.percentOff ?? 0);

    this.setInitialPlanSelection();
    this.loading = false;
--- a/apps/web/src/app/layouts/header/web-header.component.html
+++ b/apps/web/src/app/layouts/header/web-header.component.html
@@ -3,7 +3,7 @@
  class="-tw-m-6 tw-mb-3 tw-flex tw-flex-col tw-p-6"
  [ngClass]="{
    'tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300 tw-bg-background-alt tw-pb-0':
-      tabsContainer.childElementCount !== 0
+      tabsContainer.childElementCount !== 0,
  }"
 >
  <div class="tw-flex">
--- a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html
@@ -5,7 +5,7 @@
    <section
      [ngStyle]="{
        '--num-products': products.bento.length,
-        'grid-template-columns': 'repeat(min(var(--num-products,1),3),auto)'
+        'grid-template-columns': 'repeat(min(var(--num-products,1),3),auto)',
      }"
      class="tw-grid tw-gap-2"
    >
--- a/apps/web/src/app/shared/components/onboarding/onboarding-task.component.html
+++ b/apps/web/src/app/shared/components/onboarding/onboarding-task.component.html
@@ -2,7 +2,7 @@
  <i class="bwi bwi-fw !tw-mr-4" [ngClass]="completed ? 'bwi-check tw-text-success' : icon"></i
  ><span
    [ngClass]="{
-      'tw-text-primary-700 tw-line-through tw-decoration-primary-700 tw-opacity-50': completed
+      'tw-text-primary-700 tw-line-through tw-decoration-primary-700 tw-opacity-50': completed,
    }"
    >{{ title }}<i class="bwi bwi-angle-right tw-ml-1"></i
  ></span>
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.html
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.html
@@ -497,7 +497,7 @@
                      aria-hidden="true"
                      [ngClass]="{
                        'bwi-eye': !showCardNumber,
-                        'bwi-eye-slash': showCardNumber
+                        'bwi-eye-slash': showCardNumber,
                      }"
                    ></i>
                  </button>
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts
@@ -66,7 +66,7 @@ export class RoutedVaultFilterService implements OnDestroy {
        collectionId: filter.collectionId ?? null,
        folderId: filter.folderId ?? null,
        organizationId:
-          filter.organizationIdParamType === "path" ? null : filter.organizationId ?? null,
+          filter.organizationIdParamType === "path" ? null : (filter.organizationId ?? null),
        type: filter.type ?? null,
      },
      queryParamsHandling: "merge",
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html
@@ -25,7 +25,7 @@
    >
      <h3
        [ngClass]="{
-          active: isAllVaultsSelected || isNodeSelected(headerNode)
+          active: isAllVaultsSelected || isNodeSelected(headerNode),
        }"
      >
        &nbsp;{{ headerNode.node.name | i18n }}
@@ -44,7 +44,7 @@
      <li
        *ngFor="let f of filters"
        [ngClass]="{
-          active: isNodeSelected(f)
+          active: isNodeSelected(f),
        }"
        class="filter-option"
      >
@@ -62,7 +62,7 @@
              class="bwi bwi-fw"
              [ngClass]="{
                'bwi-angle-right': isCollapsed(f.node),
-                'bwi-angle-down': !isCollapsed(f.node)
+                'bwi-angle-down': !isCollapsed(f.node),
              }"
              aria-hidden="true"
            ></i>