From 3269a4376ff29273291f892c2b9c003397782d6e Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Mon, 24 Jun 2024 14:30:33 -0500
Subject: [PATCH 1/2] Skip federation selector on startup

---
 src/components/Activity.tsx     | 24 ++++++++++++------------
 src/routes/setup/NewProfile.tsx |  6 ++++--
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/components/Activity.tsx b/src/components/Activity.tsx
index a86d7cf2..e9781991 100644
--- a/src/components/Activity.tsx
+++ b/src/components/Activity.tsx
@@ -441,18 +441,18 @@ export function CombinedActivity() {
                 </Show>
                 <Switch>
                     <Match when={activity.latest?.length === 0}>
-                        <Show when={state.federations?.length === 0}>
-                            <ButtonCard
-                                onClick={() =>
-                                    navigate("/settings/federations")
-                                }
-                            >
-                                <div class="flex items-center gap-2">
-                                    <Users class="inline-block text-m-red" />
-                                    <NiceP>{i18n.t("home.federation")}</NiceP>
-                                </div>
-                            </ButtonCard>
-                        </Show>
+                        {/*<Show when={state.federations?.length === 0}>*/}
+                        {/*    <ButtonCard*/}
+                        {/*        onClick={() =>*/}
+                        {/*            navigate("/settings/federations")*/}
+                        {/*        }*/}
+                        {/*    >*/}
+                        {/*        <div class="flex items-center gap-2">*/}
+                        {/*            <Users class="inline-block text-m-red" />*/}
+                        {/*            <NiceP>{i18n.t("home.federation")}</NiceP>*/}
+                        {/*        </div>*/}
+                        {/*    </ButtonCard>*/}
+                        {/*</Show>*/}
                         <ButtonCard onClick={() => navigate("/receive")}>
                             <div class="flex items-center gap-2">
                                 <Plus class="inline-block text-m-red" />
diff --git a/src/routes/setup/NewProfile.tsx b/src/routes/setup/NewProfile.tsx
index 091d5333..312bd4b7 100644
--- a/src/routes/setup/NewProfile.tsx
+++ b/src/routes/setup/NewProfile.tsx
@@ -31,7 +31,8 @@ export function NewProfile() {
         );
         console.log("profile", profile);
         localStorage.setItem("profile_setup_stage", "skipped");
-        navigate("/addfederation");
+        // navigate("/addfederation");
+        navigate("/");
         setSkipping(false);
     }
 
@@ -46,7 +47,8 @@ export function NewProfile() {
             );
             console.log("profile", profile);
             localStorage.setItem("profile_setup_stage", "saved");
-            navigate("/addfederation");
+            // navigate("/addfederation");
+            navigate("/");
         } catch (e) {
             console.error(e);
         }

From 9831a38a5c4ffcdc5b779a7e490b91374286086e Mon Sep 17 00:00:00 2001
From: Paul Miller <paul@paul.lol>
Date: Mon, 24 Jun 2024 15:00:38 -0500
Subject: [PATCH 2/2] fix tests for new fedimint flow

---
 e2e/fedimint.spec.ts | 7 +++++++
 e2e/utils.ts         | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/e2e/fedimint.spec.ts b/e2e/fedimint.spec.ts
index e51e47dd..453f448f 100644
--- a/e2e/fedimint.spec.ts
+++ b/e2e/fedimint.spec.ts
@@ -12,6 +12,10 @@ test.beforeEach(async ({ page }) => {
 test("fedmint join, receive, send", async ({ page }) => {
     await loadHome(page);
 
+    // Click the top left button (it's the profile button), a child of header
+    // TODO: better ARIA stuff
+    await page.locator(`header button`).first().click();
+
     // Click "Join a federation" cta
     await page.click("text=Join a federation");
 
@@ -28,6 +32,9 @@ test("fedmint join, receive, send", async ({ page }) => {
     // Wait for a header to appear with the text "MutinySignetFederation"
     await page.getByText("MutinySignetFederation").waitFor();
 
+    // Navigate back to profile
+    await page.goBack();
+
     // Navigate back home
     await page.goBack();
 
diff --git a/e2e/utils.ts b/e2e/utils.ts
index 603fd2d6..da7603e9 100644
--- a/e2e/utils.ts
+++ b/e2e/utils.ts
@@ -13,11 +13,11 @@ export async function loadHome(page: Page) {
 
     await page.locator("button:has-text('Skip for now')").click();
 
-    await page.getByText("Pick a Federation").waitFor();
+    // await page.getByText("Pick a Federation").waitFor();
 
-    await page.locator("button:has-text('Skip for now')").click();
+    // await page.locator("button:has-text('Skip for now')").click();
 
-    await page.locator(`button:has-text('Confirm')`).click();
+    // await page.locator(`button:has-text('Confirm')`).click();
 
     // Should have a balance up top now
     await page.locator(`text=0 sats`).first().waitFor();