diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Nostr.svelte | 2 | ||||
| -rw-r--r-- | src/lib/nostr.ts | 10 | ||||
| -rw-r--r-- | src/routes/(app)/settings/+layout.svelte | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/components/Nostr.svelte b/src/components/Nostr.svelte index a616194b..f6c870f9 100644 --- a/src/components/Nostr.svelte +++ b/src/components/Nostr.svelte @@ -25,8 +25,8 @@ let cancel = () => { eventToSign.set(); showNsec = false; - pubkey = undefined; connectUrl = undefined; + $signer = "cancel"; }; let signerAvailable = $derived( diff --git a/src/lib/nostr.ts b/src/lib/nostr.ts index bfaa14c1..a22882bc 100644 --- a/src/lib/nostr.ts +++ b/src/lib/nostr.ts @@ -117,8 +117,14 @@ export const sign = async (event, user) => { eventToSign.set(event); let unsubscribe; - const { method, params } = await new Promise((r) => { - unsubscribe = $signer.subscribe((v) => v?.ready && r(v)); + const { method, params } = await new Promise((r, j) => { + unsubscribe = $signer.subscribe((v) => { + if (v === "cancel") { + j("cancelled"); + $signer.set(undefined); + } + v?.ready && r(v); + }); }); await unsubscribe(); const signedEvent = await signingMethods[method](event, params); diff --git a/src/routes/(app)/settings/+layout.svelte b/src/routes/(app)/settings/+layout.svelte index 3c2ebd88..d0d1a256 100644 --- a/src/routes/(app)/settings/+layout.svelte +++ b/src/routes/(app)/settings/+layout.svelte @@ -133,8 +133,7 @@ event = await sign(event, user); send(event); } catch (e) { - console.log(e); - warning("Nostr profile could not be updated"); + warning("Nostr profile not updated"); } } @@ -209,9 +208,7 @@ {$t("user.settings.header")} </h1> - <div - class="flex flex-wrap justify-around items-center border-b pb-3" - > + <div class="flex flex-wrap justify-around items-center border-b pb-3"> {#each tabs as { name, key }} <a href={`/settings/${name}`} |