Deploy to prod

.env.mainnet

@@ -0,0 +1,14 @@
+# Mainnet
+
+VITE_NETWORK="bitcoin"
+VITE_PROXY="wss://p.mutinywallet.com"
+VITE_ESPLORA="https://mutiny.mempool.space/api"
+VITE_LSP="https://lsp.voltageapi.com"
+VITE_RGS="https://scorer.mutinywallet.com/v1/rgs/snapshot/"
+# VITE_SELFHOSTED="true" // Removes Mutiny+
+VITE_AUTH="https://auth.mutinywallet.com"
+VITE_SUBSCRIPTIONS="https://subscriptions.mutinywallet.com"
+VITE_STORAGE="https://storage.mutinywallet.com/v2"
+VITE_FEEDBACK="https://feedback.mutinywallet.com"
+VITE_SCORER="https://scorer.mutinywallet.com"
+VITE_PRIMAL="https://primal-cache.mutinywallet.com/api"

.env.signet

@@ -0,0 +1,14 @@
+#SIGNET
+
+VITE_NETWORK="signet"
+VITE_PROXY="wss://p.mutinywallet.com"
+VITE_ESPLORA="https://mutinynet.com/api"
+VITE_LSP="https://signet-lsp.mutinywallet.com"
+VITE_RGS="https://rgs.mutinynet.com/snapshot/"
+# VITE_SELFHOSTED="true" // Removes Mutiny+
+VITE_AUTH="https://auth-staging.mutinywallet.com"
+VITE_SUBSCRIPTIONS="https://subscriptions-staging.mutinywallet.com"
+VITE_STORAGE="https://storage-staging.mutinywallet.com/v2"
+VITE_FEEDBACK="https://feedback-staging.mutinywallet.com"
+VITE_SCORER="https://scorer-staging.mutinywallet.com"
+VITE_PRIMAL="https://primal-cache.mutinywallet.com/api"

.github/workflows/android-prod.yml

@@ -85,6 +85,8 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "30.0.3"
 
       - name: Build APK
         working-directory: android
@@ -98,6 +100,8 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "30.0.3"
 
       - name: Create Release
         id: create_release

.github/workflows/android-staging.yml

@@ -86,6 +86,8 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "30.0.3"
 
       - name: Build APK
         working-directory: android
@@ -99,6 +101,8 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "30.0.3"
 
       # F-Droid APK
       - name: Upload F-Droid APK Universal Asset

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.mutinywallet.mutinywallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 43
-        versionName "0.5.1"
+        versionCode 44
+        versionName "0.5.2"
         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.5.0;
+				MARKETING_VERSION = 1.5.2;
 				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.0;
+				MARKETING_VERSION = 1.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mutinywallet.mutiny;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

ios/App/Podfile.lock

@@ -155,4 +155,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0a4556c3ff620e7baf2e9aeba1f6e9f4fe406a0f
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.14.2

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mutiny-wallet",
-    "version": "0.5.1",
+    "version": "0.5.2",
     "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.1",
+        "@mutinywallet/mutiny-wasm": "0.5.2",
         "@mutinywallet/waila-wasm": "^0.2.6",
         "@solid-primitives/upload": "^0.0.111",
         "@solid-primitives/websocket": "^1.2.0",

src/components/ActivityItem.tsx

@@ -183,7 +183,12 @@ export function ActivityItem(props: {
                 </Switch>
                 <Switch>
                     <Match when={props.date && props.date > 2147483647}>
-                        <time class="text-sm text-neutral-500">
+                        <time class="text-sm text-m-yellow">
+                            {i18n.t("common.pending")}
+                        </time>
+                    </Match>
+                    <Match when={timeAgo(props.date) === "Pending"}>
+                        <time class="text-sm text-m-yellow">
                             {i18n.t("common.pending")}
                         </time>
                     </Match>

src/components/PendingNwc.tsx

@@ -78,8 +78,20 @@ export function PendingNwc() {
             await state.mutiny_wallet?.approve_invoice(item.id);
             await vibrateSuccess();
         } catch (e) {
-            setError(eify(e));
-            console.error(e);
+            const err = eify(e);
+            // If we've already paid this invoice, just ignore the error
+            // we just want to remove it from the list and continue
+            if (err.message === "An invoice must not get payed twice.") {
+                // wrap in try/catch so we don't crash if the invoice is already gone
+                try {
+                    await state.mutiny_wallet?.deny_invoice(item.id);
+                } catch (_e) {
+                    // do nothing
+                }
+            } else {
+                setError(err);
+                console.error(e);
+            }
         } finally {
             setPaying("");
             refetch();