Merge branch 'main' into ps/extension-refresh

apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.html

@@ -19,7 +19,7 @@
       *ngIf="config?.mode !== 'add'"
       type="button"
       buttonType="danger"
-      class="tw-ml-auto bwi-lg"
+      slot="end"
       bitIconButton="bwi-trash"
       [bitAction]="deleteSend"
       appA11yTitle="{{ 'delete' | i18n }}"

apps/web/src/app/billing/organizations/change-plan-dialog.component.ts

@@ -497,7 +497,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       return 0;
     }
 
-    const result = plan.PasswordManager.seatPrice * Math.abs(this.organization.seats || 0);
+    const result = plan.PasswordManager.seatPrice * Math.abs(this.sub?.seats || 0);
     return result;
   }
 

apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html

@@ -34,7 +34,9 @@
             <th bitCell bitSortable="organizationId" *ngIf="!isAdminConsoleActive">
               {{ "owner" | i18n }}
             </th>
-            <th bitCell class="tw-text-right" bitSortable="exposedXTimes"></th>
+            <th bitCell class="tw-text-right" bitSortable="exposedXTimes">
+              {{ "timesExposed" | i18n }}
+            </th>
           </tr>
         </ng-container>
         <ng-template body let-rows$>

apps/web/src/app/tools/reports/pages/reused-passwords-report.component.html

@@ -39,7 +39,7 @@
             <th bitCell></th>
             <th bitCell>{{ "name" | i18n }}</th>
             <th bitCell>{{ "owner" | i18n }}</th>
-            <th bitCell></th>
+            <th bitCell class="tw-text-right">{{ "timesReused" | i18n }}</th>
           </tr>
         </ng-container>
         <ng-template body let-rows$>

apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html

@@ -39,7 +39,9 @@
             <th bitCell bitSortable="organizationId" *ngIf="!isAdminConsoleActive">
               {{ "owner" | i18n }}
             </th>
-            <th bitCell class="tw-text-right" bitSortable="reportValue" default></th>
+            <th bitCell class="tw-text-right" bitSortable="reportValue" default>
+              {{ "weakness" | i18n }}
+            </th>
           </tr>
         </ng-container>
         <ng-template body let-rows$>

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

@@ -2199,6 +2199,9 @@
   "checkExposedPasswords": {
     "message": "Check exposed passwords"
   },
+  "timesExposed": {
+    "message": "Times exposed"
+  },
   "exposedXTimes": {
     "message": "Exposed $COUNT$ time(s)",
     "placeholders": {
@@ -2233,6 +2236,9 @@
   "noWeakPasswords": {
     "message": "No items in your vault have weak passwords."
   },
+  "weakness": {
+    "message": "Weakness"
+  },
   "reusedPasswordsReport": {
     "message": "Reused passwords"
   },
@@ -2258,6 +2264,9 @@
   "noReusedPasswords": {
     "message": "No logins in your vault have passwords that are being reused."
   },
+  "timesReused": {
+    "message": "Times reused"
+  },
   "reusedXTimes": {
     "message": "Reused $COUNT$ times",
     "placeholders": {

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

@@ -102,7 +102,7 @@ export class SendOptionsComponent implements OnInit {
 
   generatePassword = async () => {
     const generatedCredential = await firstValueFrom(
-      this.generatorService.generate$(Generators.Password),
+      this.generatorService.generate$(Generators.password),
     );
 
     this.sendOptionsForm.patchValue({