Correctly display the currently in use LSP

.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:

.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:

.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:

.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:

.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

.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

.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:

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.

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 = "";

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mutiny-wallet",
-    "version": "1.7.11",
+    "version": "1.7.12",
     "license": "MIT",
     "packageManager": "[email protected]",
     "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",

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<MutinyWalletSettingStrings>(getSettings);
+    const [_state, _actions, sw] = useMegaStore();
+
+    const [settings] = createResource<MutinyWalletSettingStrings>(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 (
         <Switch>
@@ -272,13 +285,15 @@ function AsyncSettingsEditor() {
 export function Servers() {
     const i18n = useI18n();
     return (
-        <DefaultMain>
-            <BackLink href="/settings" title={i18n.t("settings.header")} />
-            <LargeHeader>{i18n.t("settings.servers.title")}</LargeHeader>
-            <Suspense fallback={<LoadingShimmer />}>
-                <AsyncSettingsEditor />
-            </Suspense>
-            <NavBar activeTab="settings" />
-        </DefaultMain>
+        <MutinyWalletGuard>
+            <DefaultMain>
+                <BackLink href="/settings" title={i18n.t("settings.header")} />
+                <LargeHeader>{i18n.t("settings.servers.title")}</LargeHeader>
+                <Suspense fallback={<LoadingShimmer />}>
+                    <AsyncSettingsEditor />
+                </Suspense>
+                <NavBar activeTab="settings" />
+            </DefaultMain>
+        </MutinyWalletGuard>
     );
 }

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<LspConfig>}
+ */
+export async function get_configured_lsp(): Promise<LspConfig> {
+    return await wallet!.get_configured_lsp();
+}
+
 /**
  * Resets BDK's keychain tracker. This will require a re-sync of the blockchain.
  *