diff --git a/android/app/build.gradle b/android/app/build.gradle index 718777d3..c66ada0e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -8,7 +8,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 50 - versionName "0.5.9" + versionName "0.6.0" 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/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index d9398078..18c32357 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/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.9; + MARKETING_VERSION = 1.6.0; 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.9; + MARKETING_VERSION = 1.6.0; PRODUCT_BUNDLE_IDENTIFIER = com.mutinywallet.mutiny; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/package.json b/package.json index 3f9510c8..2027e986 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mutiny-wallet", - "version": "0.5.9", + "version": "0.6.0-rc2", "license": "MIT", "packageManager": "pnpm@8.6.6", "scripts": { @@ -55,8 +55,7 @@ "@kobalte/core": "^0.9.8", "@kobalte/tailwindcss": "^0.5.0", "@modular-forms/solid": "^0.18.1", - "@mutinywallet/mutiny-wasm": "0.5.9", - "@mutinywallet/waila-wasm": "^0.2.6", + "@mutinywallet/mutiny-wasm": "0.6.0-rc2", "@solid-primitives/upload": "^0.0.111", "@solidjs/meta": "^0.29.1", "@solidjs/router": "^0.9.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 14598a6b..b9a05ae9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,11 +54,8 @@ importers: specifier: ^0.18.1 version: 0.18.1(solid-js@1.8.5) '@mutinywallet/mutiny-wasm': - specifier: 0.5.9 - version: 0.5.9 - '@mutinywallet/waila-wasm': - specifier: ^0.2.6 - version: 0.2.6 + specifier: 0.6.0-rc2 + version: 0.6.0-rc2 '@solid-primitives/upload': specifier: ^0.0.111 version: 0.0.111(solid-js@1.8.5) @@ -2570,12 +2567,8 @@ packages: solid-js: 1.8.5 dev: false - /@mutinywallet/mutiny-wasm@0.5.9: - resolution: {integrity: sha512-skSSpMprn/iA6Zsk092S1UVCkgjaCfXZXdvzVahFLDDS/89GtxyHtSsY64Oy3KFCULB6X+UfFp9nRFHtWA7sIw==} - dev: false - - /@mutinywallet/waila-wasm@0.2.6: - resolution: {integrity: sha512-qiyhaWX/zDKuh23VXIzeWGlmXne9IdRIx+ldGdse15JwEiC97OjATXMECX3Xo0tc3RTOo50cKyMlouKKRbLYpQ==} + /@mutinywallet/mutiny-wasm@0.6.0-rc2: + resolution: {integrity: sha512-6Dw2kJac3F7/26BjXmNSUAguStinEqdR9vwgQDQeJVEPu3sJkl4y7+aPhfuBYhMijO4avL/vkwKVcA4ISXPFkA==} dev: false /@ndelangen/get-tarball@3.0.9: diff --git a/src/logic/waila.ts b/src/logic/waila.ts index d2a29b72..caf059e5 100644 --- a/src/logic/waila.ts +++ b/src/logic/waila.ts @@ -1,10 +1,7 @@ -import initWaila, { PaymentParams } from "@mutinywallet/waila-wasm"; +import { PaymentParams } from "@mutinywallet/mutiny-wasm"; import { Result } from "~/utils"; -// Make sure we've initialzied waila before we try to use it -await initWaila(); - export type ParsedParams = { original: string; address?: string; diff --git a/src/routes/Activity.tsx b/src/routes/Activity.tsx index 04ae3da0..8f1a631a 100644 --- a/src/routes/Activity.tsx +++ b/src/routes/Activity.tsx @@ -40,7 +40,7 @@ function ContactRow() { const [contacts, { refetch }] = createResource(async () => { try { const contacts: TagItem[] = - state.mutiny_wallet?.get_contacts_sorted(); + await state.mutiny_wallet?.get_contacts_sorted(); return contacts || []; } catch (e) { console.error(e); diff --git a/src/routes/Search.tsx b/src/routes/Search.tsx index 7ed77def..ddf9cf2a 100644 --- a/src/routes/Search.tsx +++ b/src/routes/Search.tsx @@ -87,7 +87,7 @@ function ActualSearch() { async function contactsFetcher() { try { const contacts: TagItem[] = - state.mutiny_wallet?.get_contacts_sorted(); + await state.mutiny_wallet?.get_contacts_sorted(); return contacts || []; } catch (e) { console.error(e); diff --git a/vite.config.ts b/vite.config.ts index bbb93b00..ffa5b84f 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -71,7 +71,7 @@ export default defineConfig({ "@capacitor/toast" ], // This is necessary because otherwise `vite dev` can't find the wasm - exclude: ["@mutinywallet/mutiny-wasm", "@mutinywallet/waila-wasm"] + exclude: ["@mutinywallet/mutiny-wasm"] }, css: { postcss: {