Prod 0.6.6

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.mutinywallet.mutinywallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 57
-        versionName "0.6.5"
+        versionCode 58
+        versionName "0.6.6"
         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.6.5;
+				MARKETING_VERSION = 1.6.6;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mutinywallet.mutiny;
 				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.6.5;
+				MARKETING_VERSION = 1.6.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mutinywallet.mutiny;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mutiny-wallet",
-    "version": "0.6.5",
+    "version": "0.6.6",
     "license": "MIT",
     "packageManager": "[email protected]",
     "scripts": {
@@ -54,7 +54,7 @@
         "@capacitor/toast": "^5.0.6",
         "@kobalte/core": "^0.12.6",
         "@kobalte/tailwindcss": "^0.9.0",
-        "@mutinywallet/mutiny-wasm": "0.6.5",
+        "@mutinywallet/mutiny-wasm": "0.6.6",
         "@modular-forms/solid": "^0.20.0",
         "@solid-primitives/upload": "^0.0.117",
         "@solidjs/meta": "^0.29.3",

src/components/Activity.tsx

@@ -35,6 +35,9 @@ import {
 
 import { GenericItem } from "./GenericItem";
 
+const ZAPPLE_PAY_NPUB =
+    "npub1wxl6njlcgygduct7jkgzrvyvd9fylj4pqvll6p32h59wyetm5fxqjchcan";
+
 export type HackActivityType =
     | "Lightning"
     | "OnChain"
@@ -85,7 +88,12 @@ export function UnifiedActivityItem(props: {
         if (props.item.contacts.length === 0) {
             return undefined;
         }
-        return props.item.contacts[0];
+        // if it's a zapple pay, don't show the contact, parse the label
+        const contact = props.item.contacts[0];
+        if (contact.npub && contact.npub === ZAPPLE_PAY_NPUB) {
+            return undefined;
+        }
+        return contact;
     });
 
     const getContact = cache(async (npub) => {
@@ -108,6 +116,25 @@ export function UnifiedActivityItem(props: {
                     }
                 }
             }
+        } else if (
+            // if zapple pay, handle it specially
+            props.item.contacts[0].npub === ZAPPLE_PAY_NPUB
+        ) {
+            if (props.item.labels) {
+                const label = props.item.labels.find((l) =>
+                    l.startsWith("From: nostr:npub")
+                );
+                if (label) {
+                    // get the npub from the label
+                    const npub = label.split("From: nostr:")[1];
+                    await new Promise((r) => setTimeout(r, 1000));
+                    try {
+                        return await getContact(npub.trim());
+                    } catch (e) {
+                        console.error(e);
+                    }
+                }
+            }
         }
         return undefined;
     });
@@ -118,7 +145,8 @@ export function UnifiedActivityItem(props: {
             (l) =>
                 l !== "SWAP" &&
                 !l.startsWith("LN Channel:") &&
-                !l.startsWith("npub")
+                !l.startsWith("npub") &&
+                !l.startsWith("From: nostr:npub")
         );
         if (filtered.length === 0) {
             return undefined;

src/components/BalanceBox.tsx

@@ -1,5 +1,5 @@
-import { A, useNavigate } from "@solidjs/router";
-import { Shuffle, Users } from "lucide-solid";
+import { useNavigate } from "@solidjs/router";
+import { Users } from "lucide-solid";
 import { Match, Show, Switch } from "solid-js";
 
 import {
@@ -43,9 +43,6 @@ export function LoadingShimmer(props: { center?: boolean; small?: boolean }) {
     );
 }
 
-const STYLE =
-    "px-2 py-1 rounded-xl text-sm flex gap-2 items-center font-semibold";
-
 export function BalanceBox(props: { loading?: boolean; small?: boolean }) {
     const [state, _actions] = useMegaStore();
     const navigate = useNavigate();
@@ -56,9 +53,6 @@ export function BalanceBox(props: { loading?: boolean; small?: boolean }) {
         (state.balance?.unconfirmed || 0n) +
         (state.balance?.force_close || 0n);
 
-    const usableOnchain = () =>
-        (state.balance?.confirmed || 0n) + (state.balance?.unconfirmed || 0n);
-
     return (
         <VStack>
             <Switch>
@@ -90,16 +84,6 @@ export function BalanceBox(props: { loading?: boolean; small?: boolean }) {
                                         />
                                     </div>
                                 </div>
-
-                                <Show
-                                    when={state.balance?.federation || 0n > 0n}
-                                >
-                                    <div class="self-end justify-self-end">
-                                        <A href="/swaplightning" class={STYLE}>
-                                            <Shuffle class="h-6 w-6" />
-                                        </A>
-                                    </div>
-                                </Show>
                             </div>
                         </Show>
                     </FancyCard>
@@ -184,13 +168,6 @@ export function BalanceBox(props: { loading?: boolean; small?: boolean }) {
                             <Show when={state.balance?.unconfirmed === 0n}>
                                 <div />
                             </Show>
-                            <Show when={usableOnchain() > 0n}>
-                                <div class="self-end justify-self-end">
-                                    <A href="/swap" class={STYLE}>
-                                        <Shuffle class="h-6 w-6" />
-                                    </A>
-                                </div>
-                            </Show>
                         </div>
                     </div>
                 </Show>

src/components/KitchenSink.tsx

@@ -64,7 +64,7 @@ function PeerItem(props: { peer: MutinyPeer; refetchPeers: RefetchPeersType }) {
             </Collapsible.Trigger>
             <Collapsible.Content>
                 <VStack>
-                    <pre class="overflow-x-auto whitespace-pre-wrap break-all">
+                    <pre class="!select-text overflow-x-auto whitespace-pre-wrap break-all">
                         {JSON.stringify(props.peer, null, 2)}
                     </pre>
                     <Button
@@ -209,7 +209,7 @@ function ChannelItem(props: { channel: MutinyChannel; network?: Network }) {
             </Collapsible.Trigger>
             <Collapsible.Content>
                 <VStack>
-                    <pre class="overflow-x-auto whitespace-pre-wrap break-all">
+                    <pre class="!select-text overflow-x-auto whitespace-pre-wrap break-all">
                         {JSON.stringify(props.channel, null, 2)}
                     </pre>
                     <ExternalLink
@@ -399,7 +399,7 @@ function OpenChannel(props: { refetchChannels: RefetchChannelsListType }) {
                 </form>
             </InnerCard>
             <Show when={newChannel()}>
-                <pre class="overflow-x-auto whitespace-pre-wrap break-all">
+                <pre class="!select-text overflow-x-auto whitespace-pre-wrap break-all">
                     {JSON.stringify(newChannel()?.outpoint, null, 2)}
                 </pre>
                 <pre>{newChannel()?.outpoint}</pre>

src/logic/mutinyWalletSetup.ts

@@ -233,7 +233,7 @@ export async function setupMutinyWallet(
     password?: string,
     safeMode?: boolean,
     shouldZapHodl?: boolean
-): Promise<MutinyWallet> {
+): Promise<MutinyWallet | undefined> {
     console.log("Starting setup...");
 
     // https://developer.mozilla.org/en-US/docs/Web/API/Storage_API
@@ -350,5 +350,9 @@ export async function setupMutinyWallet(
 
     sessionStorage.setItem("MUTINY_WALLET_INITIALIZED", Date.now().toString());
 
-    return mutinyWallet;
+    if (mutinyWallet) {
+        return mutinyWallet;
+    } else {
+        return undefined;
+    }
 }

src/state/megaStore.tsx

@@ -204,13 +204,43 @@ export const Provider: ParentComponent = (props) => {
                     await setSettings(settings);
                 }
 
+                // 60 seconds to load or we bail
+                const start = Date.now();
+                const MAX_LOAD_TIME = 60000;
+                const interval = setInterval(() => {
+                    console.log("Running setup", Date.now() - start);
+                    if (Date.now() - start > MAX_LOAD_TIME) {
+                        clearInterval(interval);
+                        // Have to set state error here because throwing doesn't work if WASM panics
+                        setState({
+                            setup_error: new Error(
+                                "Load timed out, please try again"
+                            )
+                        });
+                        return;
+                    }
+                }, 1000);
+
                 const mutinyWallet = await setupMutinyWallet(
                     settings,
                     password,
                     state.safe_mode,
                     state.should_zap_hodl
                 );
 
+                // Done with the timeout shenanigans
+                clearInterval(interval);
+
+                // I've never managed to trigger this but it's just some extra safety I guess
+                if (!mutinyWallet) {
+                    setState({
+                        setup_error: new Error(
+                            "Failed to initialize Mutiny Wallet"
+                        )
+                    });
+                    return;
+                }
+
                 // Give other components access to settings via the store
                 setState({ settings: settings });