diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 57900d6e..f13fe443 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -36,7 +36,7 @@ jobs: with: node-version: 18.x - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 name: Install pnpm id: pnpm-install with: diff --git a/.github/workflows/android-prod.yml b/.github/workflows/android-prod.yml index 0af16fee..5aa57980 100644 --- a/.github/workflows/android-prod.yml +++ b/.github/workflows/android-prod.yml @@ -32,7 +32,7 @@ jobs: with: node-version: 18.x - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 name: Install pnpm id: pnpm-install with: diff --git a/.github/workflows/android-staging.yml b/.github/workflows/android-staging.yml index f2bc26d9..d3f77ec1 100644 --- a/.github/workflows/android-staging.yml +++ b/.github/workflows/android-staging.yml @@ -33,7 +33,7 @@ jobs: with: node-version: 18.x - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 name: Install pnpm id: pnpm-install with: diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 2d0256db..404cce26 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -21,7 +21,7 @@ jobs: with: node-version: 18.x - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 name: Install pnpm id: pnpm-install with: diff --git a/.github/workflows/ios-prod.yml b/.github/workflows/ios-prod.yml index 023f487c..934f5207 100644 --- a/.github/workflows/ios-prod.yml +++ b/.github/workflows/ios-prod.yml @@ -15,11 +15,10 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 name: Install pnpm id: pnpm-install with: - version: 8 run_install: false - name: Setup Node.js diff --git a/.github/workflows/ios-staging.yml b/.github/workflows/ios-staging.yml index bb455e78..a8475534 100644 --- a/.github/workflows/ios-staging.yml +++ b/.github/workflows/ios-staging.yml @@ -15,11 +15,10 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 name: Install pnpm id: pnpm-install with: - version: 8 run_install: false - name: Setup Node.js diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index a5a84927..ab0ff979 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -23,7 +23,7 @@ jobs: with: node-version: 18.x - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 name: Install pnpm id: pnpm-install with: diff --git a/android/app/build.gradle b/android/app/build.gradle index a82374e7..ad85ea3f 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 72 - versionName "1.7.11" + versionCode 73 + versionName "1.7.12" 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 7e60c9a9..c888c747 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.7.11; + MARKETING_VERSION = 1.7.12; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = "com.mutinywallet.mutiny-test"; 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.7.11; + MARKETING_VERSION = 1.7.12; PRODUCT_BUNDLE_IDENTIFIER = com.mutinywallet.mutiny; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/package.json b/package.json index 65dc6e8a..fe10e5da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mutiny-wallet", - "version": "1.7.11", + "version": "1.7.12", "license": "MIT", "packageManager": "pnpm@8.6.6", "scripts": { @@ -56,7 +56,7 @@ "@kobalte/core": "^0.12.6", "@kobalte/tailwindcss": "^0.9.0", "@modular-forms/solid": "^0.20.0", - "@mutinywallet/mutiny-wasm": "1.7.10", + "@mutinywallet/mutiny-wasm": "1.7.11", "@sentry/browser": "^8.7.0", "@sentry/vite-plugin": "^2.18.0", "@solid-primitives/upload": "^0.0.117", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fd959566..695f08ba 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,8 +54,8 @@ dependencies: specifier: ^0.20.0 version: 0.20.0(solid-js@1.8.16) '@mutinywallet/mutiny-wasm': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.7.11 + version: 1.7.11 '@sentry/browser': specifier: ^8.7.0 version: 8.7.0 @@ -2177,8 +2177,8 @@ packages: solid-js: 1.8.16 dev: false - /@mutinywallet/mutiny-wasm@1.7.10: - resolution: {integrity: sha512-jWL70psg50CrdSO4t78rNo5MkYW2W4dgXkbWqVJ8+PojojrN9m0wCfYELByEQuWWVaytfJXJZAR5yFzPZ/9eqw==} + /@mutinywallet/mutiny-wasm@1.7.11: + resolution: {integrity: sha512-fHVPUbwMGxmTWJVfyLmdEUsNAGzYD6bi6D8bgMuRLq6gvw8Uq/KNImiZnj3fU4Fb/siYRlLMJa+uyB5wJrvXkQ==} dev: false /@nodelib/fs.scandir@2.1.5: @@ -7854,7 +7854,6 @@ packages: /workbox-google-analytics@7.0.0: resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==} - deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained dependencies: workbox-background-sync: 7.0.0 workbox-core: 7.0.0 diff --git a/src/routes/settings/Servers.tsx b/src/routes/settings/Servers.tsx index 9600d9ff..75b3d4d9 100644 --- a/src/routes/settings/Servers.tsx +++ b/src/routes/settings/Servers.tsx @@ -9,6 +9,7 @@ import { ExternalLink, LargeHeader, LoadingShimmer, + MutinyWalletGuard, NavBar, NiceP, showToast, @@ -255,7 +256,19 @@ function SettingsStringsEditor(props: { } function AsyncSettingsEditor() { - const [settings] = createResource(getSettings); + const [_state, _actions, sw] = useMegaStore(); + + const [settings] = createResource(async () => { + const settings = await getSettings(); + + // set the lsp to what the node manager is using + const lsp = await sw.get_configured_lsp(); + settings.lsp = lsp.url; + settings.lsps_connection_string = lsp.connection_string; + settings.lsps_token = lsp.token; + + return settings; + }); return ( @@ -272,13 +285,15 @@ function AsyncSettingsEditor() { export function Servers() { const i18n = useI18n(); return ( - - - {i18n.t("settings.servers.title")} - }> - - - - + + + + {i18n.t("settings.servers.title")} + }> + + + + + ); } diff --git a/src/workers/walletWorker.ts b/src/workers/walletWorker.ts index 6ee55ee1..338b5102 100644 --- a/src/workers/walletWorker.ts +++ b/src/workers/walletWorker.ts @@ -612,6 +612,7 @@ export async function estimate_tx_fee( const fee = await wallet!.estimate_tx_fee(address, amount, feeRate); return fee; } + /** * Calls upon a LNURL to get the parameters for it. * This contains what kind of LNURL it is (pay, withdrawal, auth, etc). @@ -1245,6 +1246,21 @@ export async function change_lsp( await wallet!.change_lsp(lsp_url, lsp_connection_string, lsps_token); } +type LspConfig = { + url?: string; + connection_string?: string; + token?: string; +}; + +/** + * Returns the configured LSP for the node manager. + * + * @returns {Promise} + */ +export async function get_configured_lsp(): Promise { + return await wallet!.get_configured_lsp(); +} + /** * Resets BDK's keychain tracker. This will require a re-sync of the blockchain. *