bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-15 07:54:55 +00:00
Code Issues Releases Wiki Activity

[PM-31738] update archive toasts (#18923)

Browse Source 
* update archive toast for all clients and trash archive restore toast, update archive cipher utilities spec
This commit is contained in:
Jason Ng
2026-02-13 13:53:11 -05:00
committed by GitHub
parent f46511b3e8
commit 10a20a43a3
10 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/browser/src/_locales/en/messages.json
View File

@@ -573,14 +573,11 @@
"noItemsInArchiveDesc": {
"message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
},
"itemWasSentToArchive": {
"message": "Item was sent to archive"
"itemArchiveToast": {
"message": "Item archived"
},
"itemWasUnarchived": {
"message": "Item was unarchived"
},
"itemUnarchived": {
"message": "Item was unarchived"
"itemUnarchivedToast": {
"message": "Item unarchived"
},
"archiveItem": {
"message": "Archive item"

2
apps/browser/src/vault/popup/components/vault/item-more-options/item-more-options.component.ts
View File

@@ -383,7 +383,7 @@ export class ItemMoreOptionsComponent {
await this.cipherArchiveService.archiveWithServer(this.cipher.id as CipherId, activeUserId);
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("itemWasSentToArchive"),
message: this.i18nService.t("itemArchiveToast"),
});
}
}

9
apps/browser/src/vault/popup/components/vault/view/view.component.ts
View File

@@ -277,17 +277,24 @@ export class ViewComponent {
};
restore = async (): Promise<void> => {
let toastMessage;
try {
await this.cipherService.restoreWithServer(this.cipher.id, this.activeUserId);
} catch (e) {
this.logService.error(e);
}
if (this.cipher.archivedDate) {
toastMessage = this.i18nService.t("archivedItemRestored");
} else {
toastMessage = this.i18nService.t("restoredItem");
}
await this.popupRouterCacheService.back();
this.toastService.showToast({
variant: "success",
title: null,
message: this.i18nService.t("restoredItem"),
message: toastMessage,
});
};

2
apps/browser/src/vault/popup/settings/archive.component.ts
View File

@@ -213,7 +213,7 @@ export class ArchiveComponent {
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("itemUnarchived"),
message: this.i18nService.t("itemUnarchivedToast"),
});
}

8
apps/desktop/src/locales/en/messages.json
View File

@@ -4387,11 +4387,11 @@
"noItemsInArchiveDesc": {
"message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
},
"itemWasSentToArchive": {
"message": "Item was sent to archive"
"itemArchiveToast": {
"message": "Item archived"
},
"itemWasUnarchived": {
"message": "Item was unarchived"
"itemUnarchivedToast": {
"message": "Item unarchived"
},
"archiveItem": {
"message": "Archive item"

4
apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
View File

@@ -616,7 +616,7 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("itemWasSentToArchive"),
message: this.i18nService.t("itemArchiveToast"),
});
} catch {
this.toastService.showToast({
@@ -638,7 +638,7 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("itemWasUnarchived"),
message: this.i18nService.t("itemUnarchivedToast"),
});
} catch {
this.toastService.showToast({

4
apps/web/src/app/vault/individual-vault/vault.component.ts
View File

@@ -744,7 +744,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
await this.cipherArchiveService.archiveWithServer(cipher.id as CipherId, activeUserId);
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("itemWasSentToArchive"),
message: this.i18nService.t("itemArchiveToast"),
});
this.refresh();
} catch (e) {
@@ -801,7 +801,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("itemUnarchived"),
message: this.i18nService.t("itemUnarchivedToast"),
});
this.refresh();

11
apps/web/src/locales/en/messages.json
View File

@@ -11905,14 +11905,11 @@
"noItemsInArchiveDesc": {
"message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
},
"itemWasSentToArchive": {
"message": "Item was sent to archive"
"itemArchiveToast": {
"message": "Item archived"
},
"itemWasUnarchived": {
"message": "Item was unarchived"
},
"itemUnarchived": {
"message": "Item was unarchived"
"itemUnarchivedToast": {
"message": "Item unarchived"
},
"bulkArchiveItems": {
"message": "Items archived"

4
libs/vault/src/services/archive-cipher-utilities.service.spec.ts
View File

@@ -80,7 +80,7 @@ describe("ArchiveCipherUtilitiesService", () => {
);
expect(toastService.showToast).toHaveBeenCalledWith({
variant: "success",
message: "itemWasSentToArchive",
message: "itemArchiveToast",
});
});
@@ -106,7 +106,7 @@ describe("ArchiveCipherUtilitiesService", () => {
);
expect(toastService.showToast).toHaveBeenCalledWith({
variant: "success",
message: "itemWasUnarchived",
message: "itemUnarchivedToast",
});
});

4
libs/vault/src/services/archive-cipher-utilities.service.ts
View File

@@ -58,7 +58,7 @@ export class ArchiveCipherUtilitiesService {
);
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("itemWasSentToArchive"),
message: this.i18nService.t("itemArchiveToast"),
});
return cipherResponse;
} catch {
@@ -90,7 +90,7 @@ export class ArchiveCipherUtilitiesService {
);
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("itemWasUnarchived"),
message: this.i18nService.t("itemUnarchivedToast"),
});
return cipherResponse;
} catch {