Prod 1.7.13

android/app/build.gradle

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

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.12;
+				MARKETING_VERSION = 1.7.13;
 				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.12;
+				MARKETING_VERSION = 1.7.13;
 				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.12",
+    "version": "1.7.13",
     "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.11",
+        "@mutinywallet/mutiny-wasm": "1.7.12",
         "@sentry/browser": "^8.7.0",
         "@sentry/vite-plugin": "^2.18.0",
         "@solid-primitives/upload": "^0.0.117",

public/i18n/en.json

@@ -40,10 +40,7 @@
       "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",
@@ -52,7 +49,6 @@
     "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",

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 } from "lucide-solid";
+import { Plus, Save, Search, Shuffle, Users } from "lucide-solid";
 import {
     createEffect,
     createMemo,

src/components/FederationPopup.tsx

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

src/routes/settings/ManageFederations.tsx

@@ -7,7 +7,7 @@ import {
 } from "@modular-forms/solid";
 import { FederationBalance, TagItem } from "@mutinywallet/mutiny-wasm";
 import { A, useNavigate, useSearchParams } from "@solidjs/router";
-import { BadgeCheck, LogOut, Scan, Trash } from "lucide-solid";
+import { ArrowLeftRight, BadgeCheck, LogOut, Scan, Trash } from "lucide-solid";
 import {
     createResource,
     createSignal,
@@ -152,8 +152,6 @@ export function AddFederationForm(props: {
             setSuccess(
                 i18n.t("settings.manage_federations.federation_added_success")
             );
-            // Reset the expiration warning seen state
-            actions.resetExpirationWarning();
             await actions.refreshFederations();
             if (props.refetch) {
                 await props.refetch();
@@ -305,7 +303,8 @@ function FederationListItem(props: {
     balance?: bigint;
 }) {
     const i18n = useI18n();
-    const [_state, actions, sw] = useMegaStore();
+    const [state, actions, sw] = useMegaStore();
+    const navigate = useNavigate();
 
     async function removeFederation() {
         setConfirmLoading(true);
@@ -324,6 +323,15 @@ function FederationListItem(props: {
 
     const [transferDialogOpen, setTransferDialogOpen] = createSignal(false);
 
+    async function transferFunds() {
+        // If there's only one federation we need to let them know to add another
+        if (state.federations?.length && state.federations.length < 2) {
+            setTransferDialogOpen(true);
+        } else {
+            navigate("/transfer?from=" + props.fed.federation_id);
+        }
+    }
+
     const [confirmOpen, setConfirmOpen] = createSignal(false);
     const [confirmLoading, setConfirmLoading] = createSignal(false);
 
@@ -385,6 +393,10 @@ function FederationListItem(props: {
                             inviteCode={props.fed.invite_code}
                         />
                     </KeyValue>
+                    <SubtleButton onClick={transferFunds}>
+                        <ArrowLeftRight class="h-4 w-4" />
+                        {i18n.t("settings.manage_federations.transfer_funds")}
+                    </SubtleButton>
                     <Suspense>
                         <RecommendButton fed={props.fed} />
                     </Suspense>

src/state/megaStore.tsx

@@ -28,7 +28,6 @@ import {
     BTC_OPTION,
     Currency,
     eify,
-    federationWarning,
     subscriptionValid,
     USD_OPTION
 } from "~/utils";
@@ -303,7 +302,23 @@ export const makeMegaStoreContext = () => {
                 // Get federations
                 const federations = await sw.list_federations();
 
-                const expiration_warning = federationWarning(federations);
+                let expiration_warning:
+                    | {
+                          expiresTimestamp: number;
+                          expiresMessage: string;
+                          federationName: string;
+                      }
+                    | undefined = undefined;
+
+                federations.forEach((f) => {
+                    if (f.popup_countdown_message && f.popup_end_timestamp) {
+                        expiration_warning = {
+                            expiresTimestamp: f.popup_end_timestamp,
+                            expiresMessage: f.popup_countdown_message,
+                            federationName: f.federation_name
+                        };
+                    }
+                });
 
                 setState({
                     wallet_loading: false,
@@ -561,7 +576,23 @@ export const makeMegaStoreContext = () => {
         async refreshFederations() {
             const federations = await sw.list_federations();
 
-            const expiration_warning = federationWarning(federations);
+            let expiration_warning:
+                | {
+                      expiresTimestamp: number;
+                      expiresMessage: string;
+                      federationName: string;
+                  }
+                | undefined = undefined;
+
+            federations.forEach((f) => {
+                if (f.popup_countdown_message && f.popup_end_timestamp) {
+                    expiration_warning = {
+                        expiresTimestamp: f.popup_end_timestamp,
+                        expiresMessage: f.popup_countdown_message,
+                        federationName: f.federation_name
+                    };
+                }
+            });
 
             setState({ federations, expiration_warning });
         },
@@ -607,9 +638,6 @@ export const makeMegaStoreContext = () => {
         // Only show the expiration warning once per session
         clearExpirationWarning() {
             setState({ expiration_warning_seen: true });
-        },
-        resetExpirationWarning() {
-            setState({ expiration_warning_seen: false });
         }
     };
 

src/utils/index.ts

@@ -21,4 +21,3 @@ export * from "./bech32";
 export * from "./keypad";
 export * from "./debounce";
 export * from "./blobToBase64";
-export * from "./federationWarning";