V0.5.6

android/app/build.gradle

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

e2e/routes.spec.ts

@@ -166,7 +166,7 @@ test("visit each route", async ({ page }) => {
 
     // Now we have to check routes that aren't linked to directly for whatever reason
     await page.goto(
-        "http://localhost:3420/gift?amount=50000&nwc_uri=nostr%2Bwalletconnect%3A%2F%2Ff6d55dff6da0f23e0d609121905aaa8da5d2bad7759459402e2bee1162912556%3Frelay%3Dwss%253A%252F%252Fnostr.mutinywallet.com%252F%26secret%3D8a2d579a182e9091d36d5668eb1c3b301d98bc792d94e866526123df79568355"
+        "http://localhost:3420/gift?amount=50000&nwc_uri=nostr%2Bwalletconnect%3A%2F%2Ff6d55dff6da0f23e0d609121905aaa8da5d2bad7759459402e2bee1162912556%3Frelay%3Dwss%253A%252F%252Frelay.mutinywallet.com%252F%26secret%3D8a2d579a182e9091d36d5668eb1c3b301d98bc792d94e866526123df79568355"
     );
     await expect(page.locator("h2").nth(1)).toHaveText(
         "You've been gifted some sats!"

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.5.5;
+				MARKETING_VERSION = 1.5.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.5.5;
+				MARKETING_VERSION = 1.5.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.5.5",
+    "version": "0.5.6",
     "license": "MIT",
     "packageManager": "[email protected]",
     "scripts": {
@@ -55,7 +55,7 @@
         "@kobalte/core": "^0.9.8",
         "@kobalte/tailwindcss": "^0.5.0",
         "@modular-forms/solid": "^0.18.1",
-        "@mutinywallet/mutiny-wasm": "0.5.5",
+        "@mutinywallet/mutiny-wasm": "0.5.6",
         "@mutinywallet/waila-wasm": "^0.2.6",
         "@solid-primitives/upload": "^0.0.111",
         "@solidjs/meta": "^0.29.1",

src/components/SyncContactsForm.tsx

@@ -12,8 +12,6 @@ type NostrContactsForm = {
     npub: string;
 };
 
-const PRIMAL_API = import.meta.env.VITE_PRIMAL;
-
 export function SyncContactsForm() {
     const i18n = useI18n();
     const [state, actions] = useMegaStore();
@@ -30,8 +28,7 @@ export function SyncContactsForm() {
     ) => {
         try {
             const npub = f.npub.trim();
-            if (!PRIMAL_API) throw new Error("PRIMAL_API not set");
-            await state.mutiny_wallet?.sync_nostr_contacts(PRIMAL_API, npub);
+            await state.mutiny_wallet?.sync_nostr_contacts(npub);
             actions.saveNpub(npub);
         } catch (e) {
             console.error(e);

src/logic/mutinyWalletSetup.ts

@@ -17,6 +17,7 @@ export type MutinyWalletSettingStrings = {
     storage?: string;
     scorer?: string;
     selfhosted?: string;
+    primal_api?: string;
 };
 
 const SETTINGS_KEYS = [
@@ -79,6 +80,11 @@ const SETTINGS_KEYS = [
         name: "selfhosted",
         storageKey: "USER_SETTINGS_selfhosted",
         default: import.meta.env.VITE_SELFHOSTED
+    },
+    {
+        name: "primal_api",
+        storageKey: "USER_SETTINGS_primal_api",
+        default: import.meta.env.VITE_PRIMAL
     }
 ];
 
@@ -246,7 +252,8 @@ export async function setupMutinyWallet(
         auth,
         subscriptions,
         storage,
-        scorer
+        scorer,
+        primal_api
     } = settings;
 
     console.log("Initializing Mutiny Manager");
@@ -261,6 +268,7 @@ export async function setupMutinyWallet(
     console.log("Using subscriptions address", subscriptions);
     console.log("Using storage address", storage);
     console.log("Using scorer address", scorer);
+    console.log("Using primal api", primal_api);
     console.log(safeMode ? "Safe mode enabled" : "Safe mode disabled");
     console.log(shouldZapHodl ? "Hodl zaps enabled" : "Hodl zaps disabled");
 
@@ -290,7 +298,13 @@ export async function setupMutinyWallet(
         // Safe mode
         safeMode || undefined,
         // Skip hodl invoices? (defaults to true, so if shouldZapHodl is true that's when we pass false)
-        shouldZapHodl ? false : undefined
+        shouldZapHodl ? false : undefined,
+        // Nsec override
+        undefined,
+        // Nip7
+        undefined,
+        // primal URL
+        primal_api || "https://primal-cache.mutinywallet.com/api"
     );
 
     sessionStorage.setItem("MUTINY_WALLET_INITIALIZED", Date.now().toString());

src/routes/settings/SyncNostrContacts.tsx

@@ -24,8 +24,6 @@ type NostrContactsForm = {
     npub: string;
 };
 
-const PRIMAL_API = import.meta.env.VITE_PRIMAL;
-
 function SyncContactsForm() {
     const i18n = useI18n();
     const [state, actions] = useMegaStore();
@@ -42,8 +40,7 @@ function SyncContactsForm() {
     ) => {
         try {
             const npub = f.npub.trim();
-            if (!PRIMAL_API) throw new Error("PRIMAL_API not set");
-            await state.mutiny_wallet?.sync_nostr_contacts(PRIMAL_API, npub);
+            await state.mutiny_wallet?.sync_nostr_contacts(npub);
             actions.saveNpub(npub);
         } catch (e) {
             console.error(e);
@@ -105,12 +102,7 @@ export function SyncNostrContacts() {
         setError(undefined);
         setLoading(true);
         try {
-            if (!PRIMAL_API) throw new Error("PRIMAL_API not set");
-            await state.mutiny_wallet?.sync_nostr_contacts(
-                PRIMAL_API,
-                // We can only see the resync button if there's an npub set
-                state.npub!
-            );
+            await state.mutiny_wallet?.sync_nostr_contacts(state.npub!);
         } catch (e) {
             console.error(e);
         }