diff --git a/android/app/build.gradle b/android/app/build.gradle index 1cbb2076..ab771309 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.mutinywallet.mutinywallet" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 21 - versionName "0.4.23" + versionCode 22 + versionName "0.4.24" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/package.json b/package.json index 3251951f..8c6b8af3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mutiny-wallet", - "version": "0.4.23", + "version": "0.4.24", "license": "MIT", "packageManager": "pnpm@8.6.6", "scripts": { @@ -55,7 +55,7 @@ "@kobalte/tailwindcss": "^0.5.0", "@modular-forms/solid": "^0.18.1", "@mutinywallet/barcode-scanner": "5.0.0-beta.3", - "@mutinywallet/mutiny-wasm": "0.4.23", + "@mutinywallet/mutiny-wasm": "0.4.24", "@mutinywallet/waila-wasm": "^0.2.1", "@nostr-dev-kit/ndk": "^0.8.11", "@solid-primitives/upload": "^0.0.111", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 569fa8db..e8bcac4f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,8 +48,8 @@ importers: specifier: 5.0.0-beta.3 version: 5.0.0-beta.3(@capacitor/core@5.2.2) '@mutinywallet/mutiny-wasm': - specifier: 0.4.23 - version: 0.4.23 + specifier: 0.4.24 + version: 0.4.24 '@mutinywallet/waila-wasm': specifier: ^0.2.1 version: 0.2.1 @@ -2519,8 +2519,8 @@ packages: '@capacitor/core': 5.2.2 dev: false - /@mutinywallet/mutiny-wasm@0.4.23: - resolution: {integrity: sha512-k9+o8afi4qBotarznXX9MzZIja636fC7L1nAUpdCa3aA9v6CsxkfJyVn4Uiwe6nNd60f9B/g3uY4M2F0vb9rtA==} + /@mutinywallet/mutiny-wasm@0.4.24: + resolution: {integrity: sha512-k4lr2iiDJMclyHXI6X8kUL9XNG01hP3KxMve1R3OIeHTK+zDmzi8SuK+bUyEhqJYUmIE0UtwB3xrgGPH58KMHg==} dev: false /@mutinywallet/waila-wasm@0.2.1: diff --git a/src/components/PendingNwc.tsx b/src/components/PendingNwc.tsx index 326ff4be..ecd0b4f8 100644 --- a/src/components/PendingNwc.tsx +++ b/src/components/PendingNwc.tsx @@ -87,19 +87,6 @@ export function PendingNwc() { } } - async function denyItem(item: PendingItem) { - try { - setPaying(item.id); - await state.mutiny_wallet?.deny_invoice(item.id); - } catch (e) { - setError(eify(e)); - console.error(e); - } finally { - setPaying(""); - refetch(); - } - } - async function approveAll() { // clone the list so it doesn't update in place const toApprove = [...pendingRequests()!]; @@ -109,10 +96,13 @@ export function PendingNwc() { } async function denyAll() { - // clone the list so it doesn't update in place - const toDeny = [...pendingRequests()!]; - for (const item of toDeny) { - await denyItem(item); + try { + await state.mutiny_wallet?.deny_all_pending_nwc(); + } catch (e) { + setError(eify(e)); + console.error(e); + } finally { + refetch(); } } diff --git a/src/routes/settings/Plus.tsx b/src/routes/settings/Plus.tsx index 4f0e20f4..80e5cab5 100644 --- a/src/routes/settings/Plus.tsx +++ b/src/routes/settings/Plus.tsx @@ -87,7 +87,8 @@ function PlusCTA() { throw new Error(i18n.t("settings.plus.error_failure")); await state.mutiny_wallet?.pay_subscription_invoice( - invoice?.bolt11 + invoice?.bolt11, + false // todo add flag for auto-pay ); await vibrateSuccess();