only go back after send if it's a chat

MutinyWallet · Jul 1, 2024 · 5bcfb55 · 5bcfb55
1 parent 3bcb3f6
commit 5bcfb55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/e2e/roundtrip.spec.ts b/e2e/roundtrip.spec.ts
@@ -111,12 +111,9 @@ test("rountrip receive and send", async ({ page }) => {
     // Wait for an h1 to appear in the dom that says "Payment Sent"
     await page.waitForSelector("text=Payment Sent", { timeout: 30000 });
 
-    // Click the "Nice" button
+    // Click the "Nice" button to go home
     await page.click("text=Nice");
 
-    // Go home
-    await page.click("text=Home");
-
     // Click settings
     await visitSettings(page);
 

diff --git a/src/routes/Send.tsx b/src/routes/Send.tsx
@@ -708,7 +708,12 @@ export function Send() {
                     onConfirm={() => {
                         setSentDetails(undefined);
                         const state = location.state as { previous?: string };
-                        if (state?.previous) {
+                        // If we're coming from a chat, we want to go back to the chat
+                        // Otherwise we want to go home
+                        if (
+                            state?.previous &&
+                            state?.previous.includes("chat/")
+                        ) {
                             navigate(state?.previous);
                         } else {
                             navigate("/");