From fd0fcefe02b869732ce6b3ae969ba82181d7dba3 Mon Sep 17 00:00:00 2001
From: Tony Giorgio <tonygiorgio@protonmail.com>
Date: Thu, 2 May 2024 16:54:43 -0500
Subject: [PATCH 1/3] Consider fedimint balance for on chain sends

---
 src/routes/Send.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/routes/Send.tsx b/src/routes/Send.tsx
index 39f24ab4..7dd22b14 100644
--- a/src/routes/Send.tsx
+++ b/src/routes/Send.tsx
@@ -248,10 +248,15 @@ export function Send() {
     });
 
     const maxOnchain = createMemo(() => {
-        return (
-            (state.balance?.confirmed ?? 0n) +
-            (state.balance?.unconfirmed ?? 0n)
-        );
+        const conf = state.balance?.confirmed ?? 0n;
+        const unc = state.balance?.unconfirmed ?? 0n;
+        const fed = state.balance?.federation ?? 0n;
+
+        if (fed > conf + unc) {
+            return fed;
+        } else {
+            return conf + unc;
+        }
     });
 
     const maxLightning = createMemo(() => {

From 2504e57194b851763fdef9b9229a6d7474c4e6eb Mon Sep 17 00:00:00 2001
From: Tony Giorgio <tonygiorgio@protonmail.com>
Date: Mon, 6 May 2024 14:43:16 -0500
Subject: [PATCH 2/3] Change tx id to internal for fedimint onchain

---
 src/components/ActivityDetailsModal.tsx | 85 +++++++++++++------------
 src/routes/Receive.tsx                  |  3 +-
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/src/components/ActivityDetailsModal.tsx b/src/components/ActivityDetailsModal.tsx
index a64e5164..dfda31ef 100644
--- a/src/components/ActivityDetailsModal.tsx
+++ b/src/components/ActivityDetailsModal.tsx
@@ -408,48 +408,53 @@ function OnchainDetails(props: {
                         "Pending"
                     )}
                 </KeyValue>
-                <KeyValue key={i18n.t("activity.transaction_details.txid")}>
-                    <div class="flex gap-1">
-                        {/* Have to do all these shenanigans because css / html is hard */}
-                        <div class="grid w-full grid-cols-[minmax(0,_1fr)_auto] gap-1">
-                            <a
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                href={mempoolTxUrl(props.info.txid, network)}
+                <Show when={props.info.txid}>
+                    <KeyValue key={i18n.t("activity.transaction_details.txid")}>
+                        <div class="flex gap-1">
+                            {/* Have to do all these shenanigans because css / html is hard */}
+                            <div class="grid w-full grid-cols-[minmax(0,_1fr)_auto] gap-1">
+                                <a
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                    href={mempoolTxUrl(
+                                        props.info.txid,
+                                        network
+                                    )}
+                                >
+                                    <div class="flex flex-nowrap items-center font-mono text-white">
+                                        <span class="truncate">
+                                            {props.info.txid}
+                                        </span>
+                                        <span>
+                                            {props.info.txid.length > 32
+                                                ? props.info.txid.slice(-8)
+                                                : ""}
+                                        </span>
+                                        <svg
+                                            class="inline-block w-[16px] overflow-visible pl-0.5 text-white"
+                                            width="16"
+                                            height="16"
+                                            fill="none"
+                                            xmlns="http://www.w3.org/2000/svg"
+                                        >
+                                            <path
+                                                d="M6.00002 3.33337v1.33334H10.39L2.66669 12.39l.94333.9434 7.72338-7.72336V10h1.3333V3.33337H6.00002Z"
+                                                fill="currentColor"
+                                            />
+                                        </svg>
+                                    </div>
+                                </a>
+                            </div>
+                            <button
+                                class="min-w-[1.5rem] p-1"
+                                classList={{ "bg-m-green rounded": copied() }}
+                                onClick={() => copy(props.info.txid)}
                             >
-                                <div class="flex flex-nowrap items-center font-mono text-white">
-                                    <span class="truncate">
-                                        {props.info.txid}
-                                    </span>
-                                    <span>
-                                        {props.info.txid.length > 32
-                                            ? props.info.txid.slice(-8)
-                                            : ""}
-                                    </span>
-                                    <svg
-                                        class="inline-block w-[16px] overflow-visible pl-0.5 text-white"
-                                        width="16"
-                                        height="16"
-                                        fill="none"
-                                        xmlns="http://www.w3.org/2000/svg"
-                                    >
-                                        <path
-                                            d="M6.00002 3.33337v1.33334H10.39L2.66669 12.39l.94333.9434 7.72338-7.72336V10h1.3333V3.33337H6.00002Z"
-                                            fill="currentColor"
-                                        />
-                                    </svg>
-                                </div>
-                            </a>
+                                <Copy class="h-4 w-4" />
+                            </button>
                         </div>
-                        <button
-                            class="min-w-[1.5rem] p-1"
-                            classList={{ "bg-m-green rounded": copied() }}
-                            onClick={() => copy(props.info.txid)}
-                        >
-                            <Copy class="h-4 w-4" />
-                        </button>
-                    </div>
-                </KeyValue>
+                    </KeyValue>
+                </Show>
             </ul>
         </VStack>
     );
diff --git a/src/routes/Receive.tsx b/src/routes/Receive.tsx
index 2116a2f4..b93f64cb 100644
--- a/src/routes/Receive.tsx
+++ b/src/routes/Receive.tsx
@@ -60,6 +60,7 @@ export type OnChainTx = {
         }>;
     };
     txid: string;
+    internal_id: string;
     received: number;
     sent: number;
     confirmation_time: {
@@ -213,7 +214,7 @@ export function Receive() {
         const paymentTxId =
             paidState() === "onchain_paid"
                 ? paymentTx()
-                    ? paymentTx()?.txid
+                    ? paymentTx()?.internal_id
                     : undefined
                 : paymentInvoice()
                   ? paymentInvoice()?.payment_hash

From 2c840933947b6d816b56efa9e883e145186a6c41 Mon Sep 17 00:00:00 2001
From: Paul Miller <paul@paul.lol>
Date: Thu, 9 May 2024 11:56:20 -0500
Subject: [PATCH 3/3] on-chain warnings and hide zero amounts

---
 public/i18n/en.json                     |  4 +++-
 src/components/ActivityDetailsModal.tsx |  2 +-
 src/components/ReceiveWarnings.tsx      | 13 ++++++++++++-
 src/routes/Receive.tsx                  |  5 +++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/public/i18n/en.json b/public/i18n/en.json
index 888852d5..908ffeb2 100644
--- a/public/i18n/en.json
+++ b/public/i18n/en.json
@@ -148,7 +148,9 @@
       "body": "Lightning receives will automatically go into your chosen federation. You can swap to self-custodial later if you want."
     },
     "receive_strings_error": "Something went wrong generating an invoice or on-chain address.",
-    "error_under_min_onchain": "That's under the dust limit! On-chain transactions should be much bigger."
+    "error_under_min_onchain": "That's under the dust limit! On-chain transactions should be much bigger.",
+    "warning_on_chain_fedi": "On-chain fedimint deposits require 10 confirmations.",
+    "warning_address_reuse": "Only send to this address once!"
   },
   "send": {
     "search": {
diff --git a/src/components/ActivityDetailsModal.tsx b/src/components/ActivityDetailsModal.tsx
index dfda31ef..a9e3c455 100644
--- a/src/components/ActivityDetailsModal.tsx
+++ b/src/components/ActivityDetailsModal.tsx
@@ -168,7 +168,7 @@ function OnchainHeader(props: { info: OnChainTx; kind?: HackActivityType }) {
                     </Match>
                 </Switch>
             </div>
-            <Show when={props.kind !== "ChannelClose"}>
+            <Show when={props.kind !== "ChannelClose" && Number(amount()) > 0}>
                 <div class="flex flex-col items-center">
                     <div
                         class="text-2xl"
diff --git a/src/components/ReceiveWarnings.tsx b/src/components/ReceiveWarnings.tsx
index c7895afc..216678b4 100644
--- a/src/components/ReceiveWarnings.tsx
+++ b/src/components/ReceiveWarnings.tsx
@@ -1,4 +1,4 @@
-import { createResource, Match, Switch } from "solid-js";
+import { createMemo, createResource, Match, Switch } from "solid-js";
 
 import { InfoBox } from "~/components/InfoBox";
 import { FeesModal } from "~/components/MoreInfoModal";
@@ -79,6 +79,12 @@ export function ReceiveWarnings(props: {
         }
     };
 
+    const onChainFedi = createMemo(() => {
+        if (props.flavor === "onchain" && state.federations?.length) {
+            return true;
+        }
+    });
+
     return (
         <Switch>
             <Match when={tooSmallWarning()}>
@@ -92,6 +98,11 @@ export function ReceiveWarnings(props: {
                     {warningText()} <FeesModal />
                 </InfoBox>
             </Match>
+            <Match when={onChainFedi()}>
+                <InfoBox accent="blue">
+                    {i18n.t("receive.warning_on_chain_fedi")}
+                </InfoBox>
+            </Match>
         </Switch>
     );
 }
diff --git a/src/routes/Receive.tsx b/src/routes/Receive.tsx
index b93f64cb..69872be6 100644
--- a/src/routes/Receive.tsx
+++ b/src/routes/Receive.tsx
@@ -460,6 +460,11 @@ export function Receive() {
                                 <p>{error()}</p>
                             </InfoBox>
                         </Show>
+                        <Show when={flavor() === "onchain"}>
+                            <InfoBox accent="blue">
+                                {i18n.t("receive.warning_address_reuse")}
+                            </InfoBox>
+                        </Show>
                         <IntegratedQr
                             value={qrString() ?? ""}
                             amountSats={amount() ? amount().toString() : "0"}