From 15211c73fee74fdb9599bf3691998f12fa9a09bf Mon Sep 17 00:00:00 2001 From: Andre Rosado Date: Wed, 12 Jun 2024 17:50:28 +0100 Subject: [PATCH] Fixed validation on navigate back on browser send add edit --- apps/browser/src/tools/popup/send/send-add-edit.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/browser/src/tools/popup/send/send-add-edit.component.ts b/apps/browser/src/tools/popup/send/send-add-edit.component.ts index c20bf7cb8d..ca5b30a4be 100644 --- a/apps/browser/src/tools/popup/send/send-add-edit.component.ts +++ b/apps/browser/src/tools/popup/send/send-add-edit.component.ts @@ -124,7 +124,10 @@ export class SendAddEditComponent extends BaseAddEditComponent { cancel() { // If true, the window was pop'd out on the add-send page. location.back will not work - if ((window as any).previousPopupUrl.startsWith("/add-send")) { + if ( + (window as any).previousPopupUrl == null || + !(window as any).previousPopupUrl.startsWith("/add-send") + ) { // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. // eslint-disable-next-line @typescript-eslint/no-floating-promises this.router.navigate(["tabs/send"]);