From 4b9fbfc8326d7f1c714a7f4a0738484df06f2bad Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Mon, 21 Oct 2024 10:45:07 -0700
Subject: [PATCH] [PM-13769] - fix routing for send created page (#11629)

* fix routing for send created page

* fix test

---------

Co-authored-by: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
---
 .../popup/send-v2/add-edit/send-add-edit.component.ts  |  4 ++--
 .../send-v2/send-created/send-created.component.html   |  4 ++--
 .../send-created/send-created.component.spec.ts        | 10 +++++++---
 .../send-v2/send-created/send-created.component.ts     |  8 +++++++-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts
index 407a4d414a..585f6067e3 100644
--- a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts
@@ -114,8 +114,8 @@ export class SendAddEditComponent {
   /**
    * Handles the event when the send is updated.
    */
-  onSendUpdated(send: SendView) {
-    this.location.back();
+  async onSendUpdated(_: SendView) {
+    await this.router.navigate(["/tabs/send"]);
   }
 
   deleteSend = async () => {
diff --git a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html
index 7c65cbeb17..cdb514b804 100644
--- a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html
+++ b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html
@@ -4,7 +4,7 @@
       slot="header"
       [pageTitle]="'createdSend' | i18n"
       showBackButton
-      [backAction]="close.bind(this)"
+      [backAction]="goToEditSend.bind(this)"
     >
       <ng-container slot="end">
         <app-pop-out></app-pop-out>
@@ -27,7 +27,7 @@
       <button bitButton type="button" buttonType="primary" (click)="copyLink()">
         <b>{{ "copyLink" | i18n }}</b>
       </button>
-      <button bitButton type="button" buttonType="secondary" (click)="close()">
+      <button bitButton type="button" buttonType="secondary" (click)="goBack()">
         {{ "close" | i18n }}
       </button>
     </popup-footer>
diff --git a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.spec.ts b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.spec.ts
index 24186ad427..fdf147b360 100644
--- a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.spec.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.spec.ts
@@ -11,6 +11,7 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SelfHostedEnvironment } from "@bitwarden/common/platform/services/default-environment.service";
+import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { ButtonModule, I18nMockService, IconModule, ToastService } from "@bitwarden/components";
@@ -50,6 +51,7 @@ describe("SendCreatedComponent", () => {
     sendView = {
       id: sendId,
       deletionDate: new Date(),
+      type: SendType.Text,
       accessId: "abc",
       urlB64Key: "123",
     } as SendView;
@@ -129,9 +131,11 @@ describe("SendCreatedComponent", () => {
     expect(component["hoursAvailable"]).toBe(0);
   });
 
-  it("should navigate back to send list on close", async () => {
-    await component.close();
-    expect(router.navigate).toHaveBeenCalledWith(["/tabs/send"]);
+  it("should navigate back to the edit send form on close", async () => {
+    await component.goToEditSend();
+    expect(router.navigate).toHaveBeenCalledWith(["/edit-send"], {
+      queryParams: { sendId: "test-send-id", type: SendType.Text },
+    });
   });
 
   describe("getHoursAvailable", () => {
diff --git a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
index 88475d7dad..98b09d380e 100644
--- a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
@@ -77,7 +77,13 @@ export class SendCreatedComponent {
     return Math.max(0, Math.ceil((send.deletionDate.getTime() - now) / (1000 * 60 * 60)));
   }
 
-  async close() {
+  async goToEditSend() {
+    await this.router.navigate([`/edit-send`], {
+      queryParams: { sendId: this.send.id, type: this.send.type },
+    });
+  }
+
+  async goBack() {
     await this.router.navigate(["/tabs/send"]);
   }