From e3f64396282e7726ca7f9e9fde160cb38b4f2919 Mon Sep 17 00:00:00 2001 From: Paul Miller Date: Mon, 3 Jul 2023 18:50:30 -0500 Subject: [PATCH] hotfix to 0.3.16 --- .env.example | 3 ++- e2e/load.spec.ts | 4 +++- package.json | 4 ++-- pnpm-lock.yaml | 8 ++++---- src/state/megaStore.tsx | 12 ------------ 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.env.example b/.env.example index 1ea9911..98ebb9b 100644 --- a/.env.example +++ b/.env.example @@ -11,4 +11,5 @@ 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" \ No newline at end of file +VITE_SELFHOSTED="true" +VITE_AUTH="https://auth-staging.mutinywallet.com" \ No newline at end of file diff --git a/e2e/load.spec.ts b/e2e/load.spec.ts index f0b1bc1..9510a79 100644 --- a/e2e/load.spec.ts +++ b/e2e/load.spec.ts @@ -52,7 +52,9 @@ test("first receive", async ({ page }) => { continueButton.click(); // Find a p with the text "Show or share this code with the sender." - await expect(page.locator("p")).toContainText(["Show or share this code with the sender."]); + await expect(page.locator("p")).toContainText([ + "Keep Mutiny open to receive the payment." + ]); // Locate an SVG inside a div with id "qr" const qrCode = await page.locator("#qr > svg"); diff --git a/package.json b/package.json index 424b22f..5b9703e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mutiny-wallet", - "version": "0.3.15", + "version": "0.3.16", "license": "MIT", "packageManager": "pnpm@8.3.1", "scripts": { @@ -38,7 +38,7 @@ "@kobalte/core": "^0.9.8", "@kobalte/tailwindcss": "^0.5.0", "@modular-forms/solid": "^0.13.2", - "@mutinywallet/mutiny-wasm": "0.3.15", + "@mutinywallet/mutiny-wasm": "0.3.16", "@mutinywallet/waila-wasm": "^0.2.1", "@solid-primitives/upload": "^0.0.111", "@solidjs/meta": "^0.28.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7346573..c66adc3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ dependencies: specifier: ^0.13.2 version: 0.13.2(solid-js@1.7.7) '@mutinywallet/mutiny-wasm': - specifier: 0.3.15 - version: 0.3.15 + specifier: 0.3.16 + version: 0.3.16 '@mutinywallet/waila-wasm': specifier: ^0.2.1 version: 0.2.1 @@ -1691,8 +1691,8 @@ packages: solid-js: 1.7.7 dev: false - /@mutinywallet/mutiny-wasm@0.3.15: - resolution: {integrity: sha512-i3M7Hc1JPmI2mukP3qfFLhjs+HXVUGIZUBSx4JbaYTnV7iD42qOPQQ2X6Ru0jxKKebqHCB1RF907j0kYa1dupw==} + /@mutinywallet/mutiny-wasm@0.3.16: + resolution: {integrity: sha512-x+u+1y5YTD9i1MJy0JbHhSQhB3y5Z52e7etSC09SIFOhIwWqCp1Px+jGj9pBjfZmFWE8sGR2Ro3LBHWs6tyldA==} dev: false /@mutinywallet/waila-wasm@0.2.1: diff --git a/src/state/megaStore.tsx b/src/state/megaStore.tsx index a588a03..15b5aab 100644 --- a/src/state/megaStore.tsx +++ b/src/state/megaStore.tsx @@ -41,7 +41,6 @@ export type MegaStore = [ has_backed_up: boolean; dismissed_restore_prompt: boolean; wallet_loading: boolean; - nwc_enabled: boolean; activity: ActivityItem[]; setup_error?: Error; is_pwa: boolean; @@ -81,7 +80,6 @@ export const Provider: ParentComponent = (props) => { dismissed_restore_prompt: localStorage.getItem("dismissed_restore_prompt") === "true", wallet_loading: true, - nwc_enabled: localStorage.getItem("nwc_enabled") === "true", activity: [] as ActivityItem[], setup_error: undefined as Error | undefined, is_pwa: window.matchMedia("(display-mode: standalone)").matches, @@ -142,12 +140,6 @@ export const Provider: ParentComponent = (props) => { const mutinyWallet = await setupMutinyWallet(settings); // Get balance optimistically const balance = await mutinyWallet.get_balance(); - // start nwc if enabled - if (state.nwc_enabled) { - const nodes = await mutinyWallet.list_nodes(); - const firstNode = (nodes[0] as string) || ""; - // await mutinyWallet.start_nostr_wallet_connect(firstNode); - } setState({ mutiny_wallet: mutinyWallet, wallet_loading: false, @@ -222,10 +214,6 @@ export const Provider: ParentComponent = (props) => { return []; } }, - setNwc(enabled: boolean) { - localStorage.setItem("nwc_enabled", enabled.toString()); - setState({ nwc_enabled: enabled }); - }, async checkBrowserCompat(): Promise { try { return await checkBrowserCompatibility();