Prod 1.7.11

.env.example

@@ -9,7 +9,7 @@
 VITE_NETWORK="signet"
 VITE_PROXY="wss://p.mutinywallet.com"
 VITE_ESPLORA="https://mutinynet.com/api"
-VITE_LSP="https://signet-lsp.mutinywallet.com"
+VITE_LSP="https://mutinynet-flow.lnolymp.us"
 VITE_RGS="https://rgs.mutinynet.com/snapshot/"
 # VITE_SELFHOSTED="true" // Removes Mutiny+
 VITE_AUTH="https://auth-staging.mutinywallet.com"

.env.mainnet

@@ -3,7 +3,7 @@
 VITE_NETWORK="bitcoin"
 VITE_PROXY="wss://p.mutinywallet.com"
 VITE_ESPLORA="https://mutiny.mempool.space/api"
-VITE_LSP="https://lsp.voltageapi.com"
+VITE_LSP="https://0conf.lnolymp.us"
 VITE_RGS="https://scorer.mutinywallet.com/v1/rgs/snapshot/"
 # VITE_SELFHOSTED="true" // Removes Mutiny+
 VITE_AUTH="https://auth.mutinywallet.com"

.env.signet

@@ -3,7 +3,7 @@
 VITE_NETWORK="signet"
 VITE_PROXY="wss://p.mutinywallet.com"
 VITE_ESPLORA="https://mutinynet.com/api"
-VITE_LSP="https://signet-lsp.mutinywallet.com"
+VITE_LSP="https://mutinynet-flow.lnolymp.us"
 VITE_RGS="https://rgs.mutinynet.com/snapshot/"
 # VITE_SELFHOSTED="true" // Removes Mutiny+
 VITE_AUTH="https://auth-staging.mutinywallet.com"

.github/workflows/android-build.yml

@@ -64,7 +64,7 @@ jobs:
           VITE_NETWORK: signet
           VITE_PROXY: wss://p.mutinywallet.com
           VITE_ESPLORA: https://mutinynet.com/api
-          VITE_LSP: https://signet-lsp.mutinywallet.com
+          VITE_LSP: https://mutinynet-flow.lnolymp.us
           VITE_RGS: https://rgs.mutinynet.com/snapshot/
           VITE_AUTH: https://auth-staging.mutinywallet.com
           VITE_SUBSCRIPTIONS: https://subscriptions-staging.mutinywallet.com

.github/workflows/android-prod.yml

@@ -60,7 +60,7 @@ jobs:
           VITE_NETWORK: bitcoin
           VITE_PROXY: wss://p.mutinywallet.com
           VITE_ESPLORA: https://mutiny.mempool.space/api
-          VITE_LSP: https://lsp.voltageapi.com
+          VITE_LSP: https://0conf.lnolymp.us
           VITE_RGS: https://scorer.mutinywallet.com/v1/rgs/snapshot/
           VITE_AUTH: https://auth.mutinywallet.com
           VITE_SUBSCRIPTIONS: https://subscriptions.mutinywallet.com

.github/workflows/android-staging.yml

@@ -61,7 +61,7 @@ jobs:
           VITE_NETWORK: signet
           VITE_PROXY: wss://p.mutinywallet.com
           VITE_ESPLORA: https://mutinynet.com/api
-          VITE_LSP: https://signet-lsp.mutinywallet.com
+          VITE_LSP: https://mutinynet-flow.lnolymp.us
           VITE_RGS: https://rgs.mutinynet.com/snapshot/
           VITE_AUTH: https://auth-staging.mutinywallet.com
           VITE_SUBSCRIPTIONS: https://subscriptions-staging.mutinywallet.com

.github/workflows/ios-prod.yml

@@ -37,7 +37,7 @@ jobs:
             VITE_NETWORK: bitcoin
             VITE_PROXY: wss://p.mutinywallet.com
             VITE_ESPLORA: https://mutiny.mempool.space/api
-            VITE_LSP: https://lsp.voltageapi.com
+            VITE_LSP: https://0conf.lnolymp.us
             VITE_RGS: https://scorer.mutinywallet.com/v1/rgs/snapshot/
             VITE_AUTH: https://auth.mutinywallet.com
             VITE_SUBSCRIPTIONS: https://subscriptions.mutinywallet.com

.github/workflows/ios-staging.yml

@@ -37,7 +37,7 @@ jobs:
             VITE_NETWORK: signet
             VITE_PROXY: wss://p.mutinywallet.com
             VITE_ESPLORA: https://mutinynet.com/api
-            VITE_LSP: https://signet-lsp.mutinywallet.com
+            VITE_LSP: https://mutinynet-flow.lnolymp.us
             VITE_RGS: https://rgs.mutinynet.com/snapshot/
             VITE_AUTH: https://auth-staging.mutinywallet.com
             VITE_SUBSCRIPTIONS: https://subscriptions-staging.mutinywallet.com

.github/workflows/playwright.yml

@@ -56,7 +56,7 @@ jobs:
           VITE_NETWORK: signet
           VITE_PROXY: wss://p.mutinywallet.com
           VITE_ESPLORA: https://mutinynet.com/api
-          VITE_LSP: https://signet-lsp.mutinywallet.com
+          VITE_LSP: https://mutinynet-flow.lnolymp.us
           VITE_RGS: https://rgs.mutinynet.com/snapshot/
           VITE_AUTH: https://auth-staging.mutinywallet.com
           VITE_SUBSCRIPTIONS: https://subscriptions-staging.mutinywallet.com

Dockerfile

@@ -17,7 +17,7 @@ ARG VITE_PROXY="/_services/proxy"
 ARG VITE_PRIMAL="https://primal-cache.mutinywallet.com/api"
 ARG VITE_ESPLORA
 ARG VITE_SCORER="https://scorer.mutinywallet.com"
-ARG VITE_LSP="https://lsp.voltageapi.com"
+ARG VITE_LSP="https://0conf.lnolymp.us"
 ARG VITE_RGS
 ARG VITE_AUTH
 ARG VITE_STORAGE="/_services/vss/v2"

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.mutinywallet.mutinywallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 71
-        versionName "1.7.10"
+        versionCode 72
+        versionName "1.7.11"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

e2e/fedimint.spec.ts

@@ -22,8 +22,6 @@ test("fedmint join, receive, send", async ({ page }) => {
     // Fill the input with the federation code
     await page.fill("input[name='federation_code']", SIGNET_INVITE_CODE);
 
-    await page.getByText("Mutinynet Signet Federation").waitFor();
-
     const addButton = await page.getByRole("button", { name: "Add" }).first();
 
     // Click the "Add" button

e2e/roundtrip.spec.ts

@@ -7,6 +7,8 @@ test.beforeEach(async ({ page }) => {
 });
 
 test("rountrip receive and send", async ({ page }) => {
+    test.slow(); // tell playwright that this test is slow
+
     await loadHome(page);
 
     await page.locator("#fab").click();
@@ -109,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);
 
@@ -133,6 +132,9 @@ test("rountrip receive and send", async ({ page }) => {
 
     await page.click("text=Confirm");
 
+    // wait for the channel to close
+    await page.waitForTimeout(5000);
+
     await page
         .getByText(
             "It looks like you don't have any channels yet. To get started, receive some sats over lightning, or swap some on-chain funds into a channel. Get your hands dirty!"

e2e/routes.spec.ts

@@ -19,7 +19,6 @@ const settingsRoutes = [
     "/connections",
     "/currency",
     "/emergencykit",
-    "/plus",
     "/restore",
     "/servers",
     "/nostrkeys"
@@ -62,10 +61,6 @@ test("visit each route", async ({ page }) => {
 
     checklist.set("/settings", true);
 
-    // Mutiny+
-    await checkRoute(page, "/settings/plus", "Mutiny+", checklist);
-    await page.goBack();
-
     // Lightning Channels
     await checkRoute(
         page,

ios/App/App.xcodeproj/project.pbxproj

@@ -360,7 +360,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.7.10;
+				MARKETING_VERSION = 1.7.11;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mutinywallet.mutiny-test";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -387,7 +387,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.7.10;
+				MARKETING_VERSION = 1.7.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mutinywallet.mutiny;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mutiny-wallet",
-    "version": "1.7.10",
+    "version": "1.7.11",
     "license": "MIT",
     "packageManager": "[email protected]",
     "scripts": {
@@ -56,7 +56,7 @@
         "@kobalte/core": "^0.12.6",
         "@kobalte/tailwindcss": "^0.9.0",
         "@modular-forms/solid": "^0.20.0",
-        "@mutinywallet/mutiny-wasm": "1.7.9",
+        "@mutinywallet/mutiny-wasm": "1.7.10",
         "@sentry/browser": "^8.7.0",
         "@sentry/vite-plugin": "^2.18.0",
         "@solid-primitives/upload": "^0.0.117",

public/i18n/en.json

@@ -40,7 +40,10 @@
       "just_me": "Just Me",
       "friends": "Friends",
       "requests": "Requests"
-    }
+    },
+    "federations_warn_generic": "Due to temporary issues with your current federation, we recommend you transfer your funds to a lightning channel or withdraw to another bitcoin wallet.",
+    "transfer_lightning": "Transfer to lightning",
+    "sent_to_another_wallet": "Send to another wallet"
   },
   "profile": {
     "profile": "Profile",
@@ -49,6 +52,7 @@
     "edit_profile": "Edit Profile",
     "join_federation": "Join a federation",
     "manage_federation": "Manage Federations",
+    "leave_federation": "Leave Federation",
     "federated_custody": "Federated Custody",
     "self_custody": "Self Custody",
     "social": "Social",
@@ -541,7 +545,8 @@
       "storage_caption": "Encrypted VSS backup service.",
       "error_lsp": "That doesn't look like a URL",
       "error_tor": "Tor URLs are not currently supported",
-      "save": "Save"
+      "save": "Save",
+      "error_lsp_change_failed": "Unable to change LSP. Maybe you have open channels?"
     },
     "nostr_contacts": {
       "title": "Sync Nostr Contacts",

src/components/Activity.tsx

@@ -1,6 +1,6 @@
 import { TagItem } from "@mutinywallet/mutiny-wasm";
 import { cache, createAsync, useNavigate } from "@solidjs/router";
-import { Plus, Save, Search, Shuffle, Users } from "lucide-solid";
+import { Plus, Save, Search, Shuffle } from "lucide-solid";
 import {
     createEffect,
     createMemo,

src/components/FederationPopup.tsx

@@ -1,8 +1,13 @@
 import { useNavigate } from "@solidjs/router";
-import { Users } from "lucide-solid";
-import { createSignal } from "solid-js";
+import { ArrowLeftRight, ArrowUpRight, Users } from "lucide-solid";
+import { createSignal, Show } from "solid-js";
 
-import { ButtonCard, NiceP, SimpleDialog } from "~/components/layout";
+import {
+    ButtonCard,
+    ExternalLink,
+    NiceP,
+    SimpleDialog
+} from "~/components/layout";
 import { useI18n } from "~/i18n/context";
 import { useMegaStore } from "~/state/megaStore";
 
@@ -16,9 +21,11 @@ export function FederationPopup() {
     const i18n = useI18n();
     const navigate = useNavigate();
 
+    const name = state.expiration_warning?.federationName;
+
     return (
         <SimpleDialog
-            title={`${i18n.t("activity.federation_message")}: ${state.expiration_warning?.federationName}`}
+            title={`${i18n.t("activity.federation_message")} ${name ? `: ${name}` : ""}`}
             open={showFederationExpirationWarning()}
             setOpen={(open: boolean) => {
                 if (!open) {
@@ -27,7 +34,41 @@ export function FederationPopup() {
                 }
             }}
         >
-            <NiceP>{state.expiration_warning?.expiresMessage}</NiceP>
+            <NiceP>
+                {state.expiration_warning?.expiresMessage ||
+                    i18n.t("home.federations_warn_generic")}
+            </NiceP>
+            <Show when={!name}>
+                <NiceP>
+                    <ExternalLink href="https://x.com/MutinyWallet/status/1805346636660429021">
+                        {i18n.t("settings.manage_federations.learn_more")}
+                    </ExternalLink>
+                </NiceP>
+            </Show>
+            <ButtonCard
+                onClick={() => {
+                    actions.clearExpirationWarning();
+                    setShowFederationExpirationWarning(false);
+                    navigate("/swaplightning");
+                }}
+            >
+                <div class="flex items-center gap-2">
+                    <ArrowLeftRight class="inline-block text-m-red" />
+                    <NiceP>{i18n.t("home.transfer_lightning")}</NiceP>
+                </div>
+            </ButtonCard>
+            <ButtonCard
+                onClick={() => {
+                    actions.clearExpirationWarning();
+                    setShowFederationExpirationWarning(false);
+                    navigate("/send");
+                }}
+            >
+                <div class="flex items-center gap-2">
+                    <ArrowUpRight class="inline-block text-m-red" />
+                    <NiceP>{i18n.t("home.sent_to_another_wallet")}</NiceP>
+                </div>
+            </ButtonCard>
             <ButtonCard
                 onClick={() => {
                     actions.clearExpirationWarning();
@@ -37,7 +78,7 @@ export function FederationPopup() {
             >
                 <div class="flex items-center gap-2">
                     <Users class="inline-block text-m-red" />
-                    <NiceP>{i18n.t("profile.manage_federation")}</NiceP>
+                    <NiceP>{i18n.t("profile.leave_federation")}</NiceP>
                 </div>
             </ButtonCard>
         </SimpleDialog>

src/routes/Profile.tsx

@@ -1,5 +1,5 @@
 import { createAsync, useNavigate } from "@solidjs/router";
-import { AtSign, Edit, Import } from "lucide-solid";
+import { Edit, Import } from "lucide-solid";
 import { createMemo, Show, Suspense } from "solid-js";
 
 import {
@@ -47,21 +47,6 @@ export function Profile() {
         return profile()?.deleted === true || profile()?.deleted === "true";
     });
 
-    const hasMutinyAddress = createMemo(() => {
-        if (profile()?.lud16) {
-            const hermes = import.meta.env.VITE_HERMES;
-            if (!hermes) {
-                return false;
-            }
-            const hermesDomain = new URL(hermes).hostname;
-            const afterAt = profile()?.lud16!.split("@")[1];
-            if (afterAt && afterAt.includes(hermesDomain)) {
-                return true;
-            }
-        }
-        return false;
-    });
-
     return (
         <MutinyWalletGuard>
             <DefaultMain>
@@ -89,26 +74,6 @@ export function Profile() {
                             <NiceP>{i18n.t("profile.edit_profile")}</NiceP>
                         </div>
                     </ButtonCard>
-                    <Show
-                        when={
-                            !hasMutinyAddress() && import.meta.env.VITE_HERMES
-                        }
-                    >
-                        <ButtonCard
-                            onClick={() =>
-                                navigate("/settings/lightningaddress")
-                            }
-                        >
-                            <div class="flex items-center gap-2">
-                                <AtSign class="inline-block text-m-red" />
-                                <NiceP>
-                                    {i18n.t(
-                                        "settings.lightning_address.create"
-                                    )}
-                                </NiceP>
-                            </div>
-                        </ButtonCard>
-                    </Show>
                 </Show>
                 <Show when={profile() && profile()?.deleted}>
                     <ButtonCard