From 432b2ae18565f3c5d43269e9a6ea249c56688576 Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Tue, 12 Sep 2023 16:00:41 +0700
Subject: [PATCH] polish nwc connection flow

---
 .gitignore                       |   1 +
 .husky/pre-commit                |   2 +-
 README.md                        |  24 ++++-----
 bun.lockb                        | Bin 351739 -> 351739 bytes
 package.json                     |   2 +-
 src-tauri/tauri.conf.json        |   4 +-
 src/app/auth/unlock.tsx          |   2 +-
 src/app/nwc/components/alby.tsx  |   6 +--
 src/app/nwc/components/other.tsx |  12 +++--
 src/app/nwc/index.tsx            |  84 +++++++++++++++++++++++++++++--
 src/shared/notes/actions/zap.tsx |  36 +++++++------
 11 files changed, 129 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07e529b0..ae2f9459 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ out
 pnpm-lock.yaml
 *.db
 *.db-journal
+bun.lockb
 
 # Editor directories and files
 .vscode/*
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 58b1861c..375d2a1d 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-pnpm exec lint-staged
+bun run lint-staged
diff --git a/README.md b/README.md
index 1ef037a5..03daf97c 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,12 @@ Download Lume for your platform here: [https://github.com/luminous-devs/lume/rel
 
 Supported platform: macOS, Windows and Linux
 
+### Prerequisites
+
+- Bun: https://bun.sh/docs/installation
+
+- Tauri: https://tauri.app/v1/guides/getting-started/prerequisites#setting-up-macos
+
 ### Develop
 
 Clone project
@@ -19,23 +25,17 @@ git clone https://github.com/luminous-devs/lume.git && cd lume
 Install packages
 
 ```
-pnpm install
+bun install
 ```
 
-Run dev
+Run dev build
 
 ```
-pnpm tauri dev
+bun tauri dev
 ```
 
-Build
+Generate production build
 
 ```
-pnpm tauri build
-```
-
-(Advance) - Generate SQLite migration
-
-```
-pnpm add-migrate <migrate_name>
-```
+bun tauri build
+```
\ No newline at end of file
diff --git a/bun.lockb b/bun.lockb
index eff90d904432f06afa047262f22b1ebe815830c8..3d96f4db65c3ab581fc2f63d6c02b70b7188208c 100755
GIT binary patch
delta 10296
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
Njxb;5SjWpD{{nCU_^to|

delta 10193
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

diff --git a/package.json b/package.json
index 4eb4bd2e..30586057 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "prepare": "husky install",
     "lint": "eslint ./src --fix",
     "format": "prettier ./src --write",
-    "dep-update": "pnpm update && cd src-tauri/ && cargo update"
+    "dep-update": "bun update && cd src-tauri/ && cargo update"
   },
   "lint-staged": {
     "**/*.{ts, tsx}": "eslint --fix",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index bcb2bb11..920a9237 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,8 +1,8 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "build": {
-    "beforeBuildCommand": "pnpm build",
-    "beforeDevCommand": "pnpm dev",
+    "beforeBuildCommand": "bun run build",
+    "beforeDevCommand": "bun run dev",
     "devPath": "http://localhost:3000",
     "distDir": "../dist",
     "withGlobalTauri": true
diff --git a/src/app/auth/unlock.tsx b/src/app/auth/unlock.tsx
index 2a235dfd..95609c5a 100644
--- a/src/app/auth/unlock.tsx
+++ b/src/app/auth/unlock.tsx
@@ -56,7 +56,7 @@ export function UnlockScreen() {
       if (!db.secureDB) db.secureDB = stronghold;
 
       const privkey = await db.secureLoad(db.account.pubkey);
-      const uri = await db.secureLoad('walletConnectURL', 'alby');
+      const uri = await db.secureLoad('walletConnectURL', 'nwc');
 
       if (privkey) setPrivkey(privkey);
       if (uri) setWalletConnectURL(uri);
diff --git a/src/app/nwc/components/alby.tsx b/src/app/nwc/components/alby.tsx
index 5dc9299b..a141cbf5 100644
--- a/src/app/nwc/components/alby.tsx
+++ b/src/app/nwc/components/alby.tsx
@@ -45,7 +45,7 @@ export function NWCAlby() {
       });
 
       webview.listen('tauri://close-requested', async () => {
-        await db.secureSave('walletConnectURL', walletConnectURL, 'alby');
+        await db.secureSave('walletConnectURL', walletConnectURL, 'nwc');
         setWalletConnectURL(walletConnectURL);
         setIsConnected(true);
         setIsloading(false);
@@ -59,7 +59,7 @@ export function NWCAlby() {
   return (
     <Dialog.Root open={isOpen} onOpenChange={setIsOpen}>
       <div className="flex items-center justify-between">
-        <div className="inline-flex items-center gap-2">
+        <div className="inline-flex items-center gap-2.5">
           <div className="inline-flex h-11 w-11 items-center justify-center rounded-md bg-orange-200">
             <AlbyIcon className="h-8 w-8" />
           </div>
@@ -71,7 +71,7 @@ export function NWCAlby() {
         <Dialog.Trigger asChild>
           <button
             type="button"
-            className="inline-flex h-8 w-min items-center justify-center rounded-md bg-white/10 px-2.5 text-sm font-medium text-white hover:bg-white/20"
+            className="inline-flex h-8 w-min items-center justify-center rounded-md bg-white/10 px-2.5 text-sm font-medium text-white hover:bg-green-500"
           >
             Connect
           </button>
diff --git a/src/app/nwc/components/other.tsx b/src/app/nwc/components/other.tsx
index a775940b..49266b06 100644
--- a/src/app/nwc/components/other.tsx
+++ b/src/app/nwc/components/other.tsx
@@ -57,9 +57,10 @@ export function NWCOther() {
       const params = new URLSearchParams(uriObj.search);
 
       if (params.has('relay') && params.has('secret')) {
-        await db.secureSave('walletConnectURL', data.uri, 'alby');
+        await db.secureSave('walletConnectURL', data.uri, 'nwc');
         setWalletConnectURL(data.uri);
         setIsloading(false);
+        setIsOpen(false);
       }
     } catch (e) {
       setIsloading(false);
@@ -73,22 +74,22 @@ export function NWCOther() {
 
   return (
     <Dialog.Root open={isOpen} onOpenChange={setIsOpen}>
-      <div className="flex items-center justify-between pt-3">
-        <div className="inline-flex items-center gap-2">
+      <div className="flex items-center justify-between pt-4">
+        <div className="inline-flex items-center gap-2.5">
           <div className="inline-flex h-11 w-11 items-center justify-center rounded-md bg-white/10">
             <WorldIcon className="h-5 w-5" />
           </div>
           <div>
             <h5 className="font-semibold leading-tight text-white">URI String</h5>
             <p className="text-sm leading-tight text-white/50">
-              Using format nostr+walletconnect://
+              Using format nostr+walletconnect:
             </p>
           </div>
         </div>
         <Dialog.Trigger asChild>
           <button
             type="button"
-            className="inline-flex h-8 w-min items-center justify-center rounded-md bg-white/10 px-2.5 text-sm font-medium text-white hover:bg-white/20"
+            className="inline-flex h-8 w-min items-center justify-center rounded-md bg-white/10 px-2.5 text-sm font-medium text-white hover:bg-green-500"
           >
             Connect
           </button>
@@ -123,6 +124,7 @@ export function NWCOther() {
                 </label>
                 <input
                   {...register('uri', { required: true })}
+                  placeholder="nostr+walletconnect:"
                   spellCheck={false}
                   autoComplete="off"
                   autoCorrect="off"
diff --git a/src/app/nwc/index.tsx b/src/app/nwc/index.tsx
index 90955791..fefb636e 100644
--- a/src/app/nwc/index.tsx
+++ b/src/app/nwc/index.tsx
@@ -1,19 +1,95 @@
 import { NWCAlby } from '@app/nwc/components/alby';
 import { NWCOther } from '@app/nwc/components/other';
 
+import { useStorage } from '@libs/storage/provider';
+
+import { CheckCircleIcon } from '@shared/icons';
+
+import { useStronghold } from '@stores/stronghold';
+
 export function NWCScreen() {
+  const { db } = useStorage();
+
+  const [walletConnectURL, setWalletConnectURL] = useStronghold((state) => [
+    state.walletConnectURL,
+    state.setWalletConnectURL,
+  ]);
+
+  const remove = async () => {
+    setWalletConnectURL('');
+    await db.secureSave('walletConnectURL', '', 'nwc');
+  };
+
   return (
     <div className="flex h-full w-full items-center justify-center">
       <div className="flex w-full flex-col gap-5">
         <div className="text-center">
-          <h3 className="text-2xl font-bold leading-tight">Nostr Wallet Connect</h3>
+          <h3 className="text-2xl font-bold leading-tight">
+            Nostr Wallet Connect (Beta)
+          </h3>
           <p className="leading-tight text-white/50">
             Sending tips easily via Bitcoin Lightning.
           </p>
         </div>
-        <div className="mx-auto flex w-full max-w-lg flex-col gap-3 divide-y divide-white/5 rounded-xl bg-white/10 p-3">
-          <NWCAlby />
-          <NWCOther />
+        <div className="mx-auto max-w-lg">
+          {!walletConnectURL ? (
+            <div className="flex w-full flex-col gap-4 divide-y divide-white/5 rounded-xl bg-white/10 p-3">
+              <NWCAlby />
+              <NWCOther />
+            </div>
+          ) : (
+            <div className="flex w-full flex-col rounded-xl bg-white/10 p-3">
+              <div className="mb-1 inline-flex items-center gap-1.5 text-sm text-green-500">
+                <CheckCircleIcon className="h-4 w-4" />
+                <p>You&apos;re using nostr wallet connect</p>
+              </div>
+              <div className="flex flex-col gap-2">
+                <textarea
+                  readOnly
+                  value={walletConnectURL}
+                  className="relative h-40 w-full resize-none rounded-lg bg-white/10 px-3 py-1 text-white !outline-none backdrop-blur-xl placeholder:text-white/50"
+                />
+                <button
+                  type="button"
+                  onClick={() => remove()}
+                  className="inline-flex h-11 w-full items-center justify-center gap-2 rounded-lg bg-white/5 px-6 font-medium leading-none text-red-500 hover:bg-white/10 focus:outline-none disabled:opacity-50"
+                >
+                  Remove connection
+                </button>
+              </div>
+            </div>
+          )}
+          <div className="mt-5 flex flex-col gap-4">
+            <div className="flex flex-col gap-1.5">
+              <h5 className="text-sm font-bold text-white/80">Introduction</h5>
+              <p className="text-sm text-white/50">
+                Nostr Wallet Connect (NWC) is a way for applications like Nostr clients to
+                access a remote Lightning wallet through a standardized protocol.
+              </p>
+              <p className="text-sm text-white/50">
+                To learn more about the details have a look at{' '}
+                <a
+                  href="https://github.com/getAlby/nips/blob/7-wallet-connect-patch/47.md"
+                  target="_blank"
+                  className="text-fuchsia-200"
+                  rel="noreferrer"
+                >
+                  the specs (NIP47)
+                </a>
+              </p>
+            </div>
+            <div className="flex flex-col gap-1.5">
+              <h5 className="text-sm font-bold text-white/80">About tipping</h5>
+              <p className="text-sm text-white/50">
+                Also known as Zap in other Nostr client.
+              </p>
+              <p className="text-sm text-white/50">
+                Lume doesn&apos;t take any commission or platform fees when you tip
+                someone.
+              </p>
+              <p className="text-sm text-white/50">Lume doesn&apos;t hold your Bitcoin</p>
+            </div>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/shared/notes/actions/zap.tsx b/src/shared/notes/actions/zap.tsx
index 44822174..a1a025f9 100644
--- a/src/shared/notes/actions/zap.tsx
+++ b/src/shared/notes/actions/zap.tsx
@@ -3,11 +3,11 @@ import { SendPaymentResponse } from '@getalby/sdk/dist/types';
 import * as Dialog from '@radix-ui/react-dialog';
 import { message } from '@tauri-apps/api/dialog';
 import { QRCodeSVG } from 'qrcode.react';
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import CurrencyInput from 'react-currency-input-field';
 import TextareaAutosize from 'react-textarea-autosize';
 
-import { AlbyIcon, CancelIcon, ZapIcon } from '@shared/icons';
+import { CancelIcon, ZapIcon } from '@shared/icons';
 
 import { useStronghold } from '@stores/stronghold';
 
@@ -29,6 +29,7 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
   const [isCompleted, setIsCompleted] = useState(false);
 
   const walletConnectURL = useStronghold((state) => state.walletConnectURL);
+  const nwc = useRef(null);
 
   const createZapRequest = async () => {
     try {
@@ -41,16 +42,16 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
           type: 'error',
         });
 
-      // user don't connect Alby, create QR Code for invoice
+      // user don't connect nwc, create QR Code for invoice
       if (!walletConnectURL) return setInvoice(res);
 
-      // user connect Alby
-      const nwc = new webln.NostrWebLNProvider({
+      // user connect nwc
+      nwc.current = new webln.NostrWebLNProvider({
         nostrWalletConnectUrl: walletConnectURL,
       });
-      await nwc.enable();
+      await nwc.current.enable();
 
-      const send: SendPaymentResponse = await nwc.sendPayment(res);
+      const send: SendPaymentResponse = await nwc.current.sendPayment(res);
       if (send) {
         await sendNativeNotification(
           `You've tipped ${compactNumber.format(send.amount)} sats to ${
@@ -59,7 +60,7 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
         );
 
         // eose
-        nwc.close();
+        nwc.current.close();
         setIsCompleted(true);
 
         // reset after 3 secs
@@ -67,6 +68,7 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
         clearTimeout(timeout);
       }
     } catch (e) {
+      nwc.current.close();
       await message(JSON.stringify(e), { title: 'Zap', type: 'error' });
     }
   };
@@ -177,10 +179,18 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
                         <button
                           type="button"
                           onClick={() => createZapRequest()}
-                          className="inline-flex h-11 w-full items-center justify-center rounded-lg bg-orange-100 px-4 font-medium text-black hover:bg-orange-200"
+                          className="inline-flex h-11 w-full items-center justify-center rounded-lg bg-fuchsia-500 px-4 font-medium text-white hover:bg-fuchsia-600"
                         >
-                          <p>{isCompleted ? 'Successfully tipped' : 'Tip with Alby'}</p>
-                          <AlbyIcon className="h-6 w-6" />
+                          {isCompleted ? (
+                            <p>Successfully tipped</p>
+                          ) : (
+                            <span className="flex flex-col">
+                              <p className="mb-px leading-none">Send tip</p>
+                              <p className="text-xs leading-none text-white/70">
+                                You&apos;re using nostr wallet connect
+                              </p>
+                            </span>
+                          )}
                         </button>
                       ) : (
                         <button
@@ -191,10 +201,6 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
                           <p>Create Lightning invoice</p>
                         </button>
                       )}
-                      <span className="text-center text-sm leading-tight text-white/50">
-                        The recipient receives 100% of the amount that you send. Lume does
-                        not take any commission, and you cannot get refund
-                      </span>
                     </div>
                   </div>
                 </>