Merge branch 'autofill/pm-8833-implement-on-page-autofill-menu-for-pa…

…ssword-generation' into autofill/pm-4415-detect-password-submissions-on-forms-that-do-not-emit-submit

apps/cli/package.json

@@ -80,7 +80,7 @@
     "papaparse": "5.4.1",
     "proper-lockfile": "4.1.2",
     "rxjs": "7.8.1",
-    "tldts": "6.1.48",
+    "tldts": "6.1.51",
     "zxcvbn": "4.4.2"
   }
 }

apps/desktop/desktop_native/proxy/Cargo.toml

@@ -10,7 +10,7 @@ publish = false
 anyhow = "=1.0.86"
 desktop_core = { path = "../core", default-features = false }
 futures = "0.3.30"
-log = "0.4.21"
+log = "0.4.22"
 simplelog = "0.12.2"
 tokio = { version = "1.38.0", features = ["io-std", "io-util", "macros", "rt"] }
 tokio-util = { version = "0.7.11", features = ["codec"] }

apps/desktop/native-messaging-test-runner/package.json

@@ -23,7 +23,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@types/node": "20.16.10",
+    "@types/node": "20.16.11",
     "@types/node-ipc": "9.2.3",
     "typescript": "4.7.4"
   },

bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html

@@ -22,7 +22,7 @@
         <bit-table>
           <ng-template body>
             <ng-container *ngIf="subscription">
-              <tr bitRow *ngFor="let i of subscription.plans">
+              <tr bitRow *ngFor="let i of activePlans">
                 <td bitCell class="tw-pl-0 tw-py-3">
                   {{ getFormattedPlanName(i.planName) }} {{ "orgSeats" | i18n }} ({{
                     i.cadence.toLowerCase()

bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.ts

@@ -101,4 +101,14 @@ export class ProviderSubscriptionComponent implements OnInit, OnDestroy {
     this.destroy$.next();
     this.destroy$.complete();
   }
+
+  get activePlans(): ProviderPlanResponse[] {
+    return this.subscription.plans.filter((plan) => {
+      if (plan.purchasedSeats === 0) {
+        return plan.seatMinimum > 0;
+      } else {
+        return plan.purchasedSeats > 0;
+      }
+    });
+  }
 }

libs/tools/generator/components/src/password-settings.component.html

@@ -55,7 +55,7 @@ <h6 bitTypography="h6">{{ "options" | i18n }}</h6>
           </bit-form-control>
         </div>
         <div class="tw-flex">
-          <bit-form-field class="tw-basis-1/2 tw-mr-4">
+          <bit-form-field class="tw-w-full tw-basis-1/2 tw-mr-4">
             <bit-label>{{ "minNumbers" | i18n }}</bit-label>
             <input
               bitInput
@@ -65,7 +65,7 @@ <h6 bitTypography="h6">{{ "options" | i18n }}</h6>
               formControlName="minNumber"
             />
           </bit-form-field>
-          <bit-form-field class="tw-basis-1/2">
+          <bit-form-field class="tw-w-full tw-basis-1/2">
             <bit-label>{{ "minSpecial" | i18n }}</bit-label>
             <input
               bitInput

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

@@ -12,8 +12,8 @@ <h2 class="tw-mt-4" bitTypography="h6">{{ "additionalOptions" | i18n }}</h2>
       >
     </bit-form-field>
     <bit-form-field>
-      <bit-label *ngIf="!originalSendView || !hasPassword">{{ "password" | i18n }}</bit-label>
-      <bit-label *ngIf="originalSendView && hasPassword">{{ "newPassword" | i18n }}</bit-label>
+      <bit-label *ngIf="!shouldShowNewPassword">{{ "password" | i18n }}</bit-label>
+      <bit-label *ngIf="shouldShowNewPassword">{{ "newPassword" | i18n }}</bit-label>
       <input bitInput type="password" formControlName="password" />
       <button
         data-testid="toggle-visibility-for-password"

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

@@ -53,10 +53,8 @@ export class SendOptionsComponent implements OnInit {
     hideEmail: [false as boolean],
   });
 
-  get hasPassword(): boolean {
-    return (
-      this.sendOptionsForm.value.password !== null && this.sendOptionsForm.value.password !== ""
-    );
+  get shouldShowNewPassword(): boolean {
+    return this.originalSendView && this.originalSendView.password !== null;
   }
 
   get shouldShowCount(): boolean {

package.json

@@ -71,7 +71,7 @@
     "@types/koa-json": "2.0.23",
     "@types/lowdb": "1.0.15",
     "@types/lunr": "2.3.7",
-    "@types/node": "20.16.10",
+    "@types/node": "20.16.11",
     "@types/node-fetch": "2.6.4",
     "@types/node-forge": "1.3.11",
     "@types/node-ipc": "9.2.3",
@@ -202,7 +202,7 @@
     "qrious": "4.0.2",
     "rxjs": "7.8.1",
     "tabbable": "6.2.0",
-    "tldts": "6.1.48",
+    "tldts": "6.1.51",
     "utf-8-validate": "6.0.4",
     "zone.js": "0.13.3",
     "zxcvbn": "4.4.2"