1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-13 06:54:07 +00:00

Merge branch 'main' into ps/extension-refresh

This commit is contained in:
Victoria League
2024-09-20 16:17:51 -04:00
committed by GitHub

View File

@@ -33,6 +33,7 @@ import { PopOutComponent } from "../../../../../platform/popup/components/pop-ou
import { PopupFooterComponent } from "../../../../../platform/popup/layout/popup-footer.component";
import { PopupHeaderComponent } from "../../../../../platform/popup/layout/popup-header.component";
import { PopupPageComponent } from "../../../../../platform/popup/layout/popup-page.component";
import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
import { BrowserPremiumUpgradePromptService } from "../../../services/browser-premium-upgrade-prompt.service";
import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
@@ -77,6 +78,7 @@ export class ViewV2Component {
private vaultPopupAutofillService: VaultPopupAutofillService,
private accountService: AccountService,
private eventCollectionService: EventCollectionService,
private popupRouterCacheService: PopupRouterCacheService,
) {
this.subscribeToParams();
}
@@ -163,8 +165,8 @@ export class ViewV2Component {
return false;
}
const successRoute = this.cipher.isDeleted ? "/trash" : "/vault";
await this.router.navigate([successRoute]);
await this.popupRouterCacheService.back();
this.toastService.showToast({
variant: "success",
title: null,
@@ -181,7 +183,7 @@ export class ViewV2Component {
this.logService.error(e);
}
await this.router.navigate(["/trash"]);
await this.popupRouterCacheService.back();
this.toastService.showToast({
variant: "success",
title: null,