Merge branch 'main' into billing/pm-29600/update-tax-client

apps/web/src/app/admin-console/organizations/members/members.component.html

@@ -25,7 +25,7 @@
         (click)="invite(organization)"
         [disabled]="!firstLoaded()"
       >
-        <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+        <i class="bwi bwi-plus bwi-fw tw-me-2" aria-hidden="true"></i>
         {{ "inviteMember" | i18n }}
       </button>
     }

apps/web/src/app/core/init.service.ts

@@ -8,7 +8,6 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DefaultVaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { IpcService } from "@bitwarden/common/platform/ipc";
@@ -40,7 +39,6 @@ export class InitService {
     private ipcService: IpcService,
     private sdkLoadService: SdkLoadService,
     private taskService: TaskService,
-    private configService: ConfigService,
     private readonly migrationRunner: MigrationRunner,
     @Inject(DOCUMENT) private document: Document,
   ) {}
@@ -49,7 +47,6 @@ export class InitService {
     return async () => {
       await this.sdkLoadService.loadAndInit();
       await this.migrationRunner.run();
-      this.encryptService.init(this.configService);
 
       const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
       if (activeAccount) {

apps/web/src/app/tools/send/new-send/new-send-dropdown.component.html

@@ -1,5 +1,5 @@
 <button bitButton [bitMenuTriggerFor]="itemOptions" buttonType="primary" type="button">
-  <i *ngIf="!hideIcon" class="bwi bwi-plus" aria-hidden="true"></i>
+  <i *ngIf="!hideIcon" class="bwi bwi-plus tw-me-2" aria-hidden="true"></i>
   {{ (hideIcon ? "createSend" : "new") | i18n }}
 </button>
 <bit-menu #itemOptions>

apps/web/src/app/tools/send/shared/send-success-drawer-dialog.component.html

@@ -17,7 +17,7 @@
       </h3>
 
       <p bitTypography="body1" class="tw-mb-6 tw-max-w-sm">
-        {{ "sendCreatedDescription" | i18n: formattedExpirationTime }}
+        {{ "sendCreatedDescriptionV2" | i18n: formattedExpirationTime }}
       </p>
 
       <bit-form-field class="tw-w-full tw-max-w-sm tw-mb-4">

apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html

@@ -87,7 +87,7 @@
     @if (showActionButtons) {
       <div class="tw-ml-auto">
         @if ((userCanArchive$ | async) && !params.isAdminConsoleAction) {
-          @if (isCipherArchived) {
+          @if (isCipherArchived && !cipher?.isDeleted) {
             <button
               type="button"
               class="tw-mr-1"

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

@@ -5626,13 +5626,13 @@
     "message": "Send created successfully!",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
-  "sendCreatedDescription": {
-    "message": "Copy and share this Send link. It can be viewed by the people you specified for the next $TIME$.",
+  "sendCreatedDescriptionV2": {
+    "message": "Copy and share this Send link. The Send will be available to anyone with the link for the next $TIME$.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "time": {
         "content": "$1",
-        "example": "7 days"
+        "example": "7 days, 1 hour, 1 day"
       }
     }
   },