Cleanup

packages/app/src/Element/Avatar.css

@@ -20,6 +20,7 @@
 }
 
 .avatar .overlay {
+  color: white;
   display: flex;
   align-items: center;
   justify-content: center;

packages/app/src/Element/SendSats.css

@@ -14,10 +14,6 @@
   }
 }
 
-.light .lnurl-modal {
-  background-color: var(--gray-superdark);
-}
-
 .lnurl-modal h2 {
   margin: 0;
   font-weight: 600;

packages/app/src/Element/SendSats.tsx

@@ -17,7 +17,7 @@ import { debounce } from "SnortUtils";
 import { LNWallet, useWallet } from "Wallet";
 import useLogin from "Hooks/useLogin";
 import AsyncButton from "Element/AsyncButton";
-import { ZapTarget, Zapper } from "Zapper";
+import { ZapTarget, ZapTargetResult, Zapper } from "Zapper";
 
 import messages from "./messages";
 
@@ -44,7 +44,7 @@ export default function SendSats(props: SendSatsProps) {
   const onClose = props.onClose || (() => undefined);
 
   const [zapper, setZapper] = useState<Zapper>();
-  const [invoice, setInvoice] = useState<string>();
+  const [invoice, setInvoice] = useState<Array<ZapTargetResult>>();
   const [error, setError] = useState<string>();
   const [success, setSuccess] = useState<LNURLSuccessAction>();
   const [amount, setAmount] = useState<SendSatsInputSelection>();
@@ -56,8 +56,20 @@ export default function SendSats(props: SendSatsProps) {
 
   useEffect(() => {
     if (props.show) {
+      const invoiceTarget = {
+        target: {
+          type: "lnurl",
+          value: "",
+          weight: 1,
+        },
+        pr: props.invoice,
+        paid: false,
+        sent: 0,
+        fee: 0,
+      } as ZapTargetResult;
+
       setError(undefined);
-      setInvoice(props.invoice);
+      setInvoice(props.invoice ? [invoiceTarget] : undefined);
       setSuccess(undefined);
     }
   }, [props.show]);
@@ -199,10 +211,10 @@ export default function SendSats(props: SendSatsProps) {
                 const sends = await zapper.send(wallet, targetsWithComments, p.amount);
                 if (sends[0].error) {
                   setError(sends[0].error.message);
-                } else if (sends.length === 1) {
+                } else if (sends.every(a => a.paid)) {
-                  setInvoice(sends[0].pr);
-                } else if (sends.every(a => a.sent)) {
                   setSuccess({});
+                } else {
+                  setInvoice(sends);
                 }
               }
             }}
@@ -369,57 +381,28 @@ function SendSatsZapTypeSelector({ zapType, setZapType }: { zapType: ZapType; se
   );
 }
 
-function SendSatsInvoice(props: { invoice: string; wallet?: LNWallet; notice?: ReactNode; onInvoicePaid: () => void }) {
+function SendSatsInvoice(props: {
-  const [paying, setPaying] = useState(false);
+  invoice: Array<ZapTargetResult>;
-  const [error, setError] = useState("");
+  wallet?: LNWallet;
-
+  notice?: ReactNode;
-  async function payWithWallet() {
+  onInvoicePaid: () => void;
-    try {
+}) {
-      if (props.wallet?.isReady()) {
-        setPaying(true);
-        const res = await props.wallet.payInvoice(props.invoice);
-        console.log(res);
-        props.onInvoicePaid();
-      }
-    } catch (e) {
-      if (e instanceof Error) {
-        setError(e.message);
-      }
-    } finally {
-      setPaying(false);
-    }
-  }
-
-  useEffect(() => {
-    if (props.wallet && !paying && !error) {
-      payWithWallet();
-    }
-  }, [props.wallet, props.invoice, paying]);
-
   return (
     <div className="flex-column g12 txt-center">
-      {error && <p className="error">{error}</p>}
       {props.notice && <b className="error">{props.notice}</b>}
-      {paying ? (
+      {props.invoice.map(v => (
-        <h4>
+        <>
-          <FormattedMessage defaultMessage="Paying with wallet" />
+          <QrCode data={v.pr} link={`lightning:${v.pr}`} />
-          ...
+          <div className="flex-column g12">
-        </h4>
+            <Copy text={v.pr} maxSize={26} className="f-center" />
-      ) : (
+            <a href={`lightning:${v.pr}`}>
-        <QrCode data={props.invoice} link={`lightning:${props.invoice}`} />
-      )}
-      <div className="flex-column g12">
-        {props.invoice && (
-          <>
-            <Copy text={props.invoice} maxSize={26} className="f-center" />
-            <a href={`lightning:${props.invoice}`}>
               <button type="button">
                 <FormattedMessage defaultMessage="Open Wallet" />
               </button>
             </a>
-          </>
+          </div>
-        )}
+        </>
-      </div>
+      ))}
     </div>
   );
 }

packages/app/src/Wallet/WebLN.ts

@@ -22,7 +22,9 @@ processWorkQueue(WebLNQueue);
  */
 export function setupWebLNWalletConfig(store: WalletStore) {
   const wallets = store.list();
-  if (window.webln && !wallets.some(a => a.kind === WalletKind.WebLN)) {
+
+  const existing = wallets.find(a => a.kind === WalletKind.WebLN);
+  if (window.webln && !existing) {
     const newConfig = {
       id: "webln",
       kind: WalletKind.WebLN,
@@ -32,6 +34,8 @@ export function setupWebLNWalletConfig(store: WalletStore) {
       },
     } as WalletConfig;
     store.add(newConfig);
+  } else if (existing) {
+    store.remove(existing.id);
   }
 }