From 7d1109f662d702f3f560622a7b578b0f2f24c1e4 Mon Sep 17 00:00:00 2001 From: benthecarman Date: Fri, 19 Jan 2024 12:18:35 +0000 Subject: [PATCH] Use NIP-07 extension --- src/logic/mutinyWalletSetup.ts | 9 ++++++++- src/routes/settings/SyncNostrContacts.tsx | 13 ------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/logic/mutinyWalletSetup.ts b/src/logic/mutinyWalletSetup.ts index c29039b07..6e43885c0 100644 --- a/src/logic/mutinyWalletSetup.ts +++ b/src/logic/mutinyWalletSetup.ts @@ -261,6 +261,12 @@ export async function setupMutinyWallet( console.log("No nsec stored"); } } + let extension_key; + try { + extension_key = await window.nostr.getPublicKey(); + } catch (_) { + console.log("No NIP-07 extension") + } console.log("Initializing Mutiny Manager"); console.log("Using network", network); @@ -304,7 +310,8 @@ export async function setupMutinyWallet( safeMode || undefined, // Skip hodl invoices? (defaults to true, so if shouldZapHodl is true that's when we pass false) shouldZapHodl ? false : undefined, - nsec + nsec, + extension_key ? extension_key : undefined ); sessionStorage.setItem("MUTINY_WALLET_INITIALIZED", Date.now().toString()); diff --git a/src/routes/settings/SyncNostrContacts.tsx b/src/routes/settings/SyncNostrContacts.tsx index 43470fed9..2c3c892e8 100644 --- a/src/routes/settings/SyncNostrContacts.tsx +++ b/src/routes/settings/SyncNostrContacts.tsx @@ -128,19 +128,6 @@ export function SyncNostrContacts() { } } - const [hasNsec] = createResource(async () => { - if (Capacitor.isNativePlatform()) { - try { - await SecureStoragePlugin.get({ key: "nsec" }); - return true; - } catch (_e) { - return false; - } - } else { - return false; - } - }); - async function resync() { setError(undefined); setLoading(true);