fix routes test

Author: futurepaul

e2e/routes.spec.ts

@@ -2,11 +2,11 @@ import { expect, Page, test } from "@playwright/test";
 
 const routes = [
     "/",
-    "/activity",
     "/feedback",
     "/gift",
     "/receive",
     "/scanner",
+    "/search",
     "/send",
     "/swap",
     "/settings"
@@ -58,24 +58,29 @@ test.beforeEach(async ({ page }) => {
 
 test("visit each route", async ({ page }) => {
     // Start on the home page
-    // Expect a title "to contain" a substring.
     await expect(page).toHaveTitle(/Mutiny Wallet/);
-
-    // Wait for an element matching the selector to appear in DOM.
-    await page.waitForSelector("text=0 SATS");
-
-    console.log("Page loaded.");
+    await page.waitForSelector("text=Welcome to the Mutiny!");
 
     // Wait for a while just to make sure we can load everything
     await page.waitForTimeout(1000);
 
+    console.log("Waiting for new wallet to be created...");
+
+    await page.locator(`button:has-text('New Wallet')`).click();
+
+    await page.locator("text=Create your profile").first();
+
+    await page.locator("button:has-text('Skip for now')").click();
+
     checklist.set("/", true);
 
-    await checkRoute(page, "/activity", "Activity", checklist);
-    await page.goBack();
+    // Should have a balance up top now
+    await page.locator(`text=0 sats`).first();
 
-    // Navigate to settings
-    await checkRoute(page, "/settings", "Settings", checklist);
+    // Find an image with an alt text of "mutiny" and click it
+    await page.locator("img[alt='mutiny']").first().click();
+    await expect(page.locator("h1").first()).toHaveText("Settings");
+    checklist.set("/settings", true);
 
     // Mutiny+
     await checkRoute(page, "/settings/plus", "Mutiny+", checklist);
@@ -146,22 +151,43 @@ test("visit each route", async ({ page }) => {
     await checkRoute(page, "/settings/admin", "Secret Debug Tools", checklist);
     await page.goBack();
 
-    // Go back home
-    await page.goBack();
-
     // Feedback
     await checkRoute(page, "/feedback", "Give us feedback!", checklist);
     await page.goBack();
 
-    // Receive is covered in another test
-    checklist.set("/receive", true);
+    // Go back home
+    await page.goBack();
+
+    // Try the fab button
+    await page.locator("#fab").click();
+    await page.locator("text=Send").click();
+    await expect(page.locator("input").first()).toBeFocused();
 
     // Send is covered in another test
     checklist.set("/send", true);
 
+    await page.goBack();
+
+    // Try the fab button again
+    await page.locator("#fab").click();
+    // (There are actually two buttons with the "Receive text on first run)
+    await page.locator("text=Receive").last().click();
+
+    await expect(page.locator("h1").first()).toHaveText("Receive Bitcoin");
+
+    // Actual receive is covered in another test
+    checklist.set("/receive", true);
+
+    await page.goBack();
+
+    // Try the fab button again
+    await page.locator("#fab").click();
+    await page.locator("text=Scan").click();
+
     // Scanner
-    await page.locator(`a[href='/scanner']`).first().click();
-    await expect(page.locator("button").first()).toHaveText("Paste Something");
+    await expect(
+        page.locator("button:has-text('Paste Something')")
+    ).toBeVisible();
     checklist.set("/scanner", true);
 
     // Now we have to check routes that aren't linked to directly for whatever reason

src/components/Fab.tsx

@@ -3,6 +3,7 @@ import { ArrowDownLeft, ArrowUpRight, Plus, Scan } from "lucide-solid";
 import { createSignal, JSX, onCleanup, onMount, Show } from "solid-js";
 
 import { Circle } from "~/components";
+import { useI18n } from "~/i18n/context";
 
 function FabMenuItem(props: {
     onClick: () => void;
@@ -60,6 +61,7 @@ export function FabMenu(props: {
 export function Fab(props: { onSearch: () => void; onScan: () => void }) {
     const [open, setOpen] = createSignal(false);
     const navigate = useNavigate();
+    const i18n = useI18n();
 
     return (
         <>
@@ -74,13 +76,13 @@ export function Fab(props: { onSearch: () => void; onScan: () => void }) {
                                 }}
                             >
                                 <ArrowUpRight />
-                                Send
+                                {i18n.t("common.send")}
                             </FabMenuItem>
                         </li>
                         <li>
                             <FabMenuItem onClick={() => navigate("/receive")}>
                                 <ArrowDownLeft />
-                                Recieve
+                                {i18n.t("common.receive")}
                             </FabMenuItem>
                         </li>
 
@@ -92,14 +94,14 @@ export function Fab(props: { onSearch: () => void; onScan: () => void }) {
                                 }}
                             >
                                 <Scan />
-                                Scan
+                                {i18n.t("common.scan")}
                             </FabMenuItem>
                         </li>
                     </ul>
                 </FabMenu>
             </Show>
             <div class="fixed bottom-8 right-8 text-m-red">
-                <button onClick={() => setOpen(!open())}>
+                <button id="fab" onClick={() => setOpen(!open())}>
                     <Circle size="large">
                         <Plus class="h-8 w-8" />
                     </Circle>
@@ -116,6 +118,8 @@ export function MiniFab(props: {
     sendDisabled?: boolean | undefined;
 }) {
     const [open, setOpen] = createSignal(false);
+    const i18n = useI18n();
+
     return (
         <>
             <Show when={open()}>
@@ -130,7 +134,7 @@ export function MiniFab(props: {
                                 }}
                             >
                                 <ArrowUpRight />
-                                Send
+                                {i18n.t("common.send")}
                             </FabMenuItem>
                         </li>
                         <li>
@@ -141,7 +145,7 @@ export function MiniFab(props: {
                                 }}
                             >
                                 <ArrowDownLeft />
-                                Request
+                                {i18n.t("common.request")}
                             </FabMenuItem>
                         </li>
 
@@ -153,13 +157,13 @@ export function MiniFab(props: {
                                 }}
                             >
                                 <Scan />
-                                Scan
+                                {i18n.t("common.scan")}
                             </FabMenuItem>
                         </li>
                     </ul>
                 </FabMenu>
             </Show>
-            <button onClick={() => setOpen(true)}>
+            <button id="fab" onClick={() => setOpen(true)}>
                 <Plus class="h-8 w-8 text-m-red" />
             </button>
         </>

src/i18n/en/translations.ts

@@ -8,9 +8,11 @@ export default {
         e_sat: "eSAT",
         sats: "SATS",
         sat: "SAT",
+        scan: "Scan",
         fee: "Fee",
         send: "Send",
         receive: "Receive",
+        request: "Request",
         dangit: "Dangit",
         back: "Back",
         coming_soon: "(coming soon)",