From c05f7cc7fadb07fc96f87e666f168bc3eaa3ef0b Mon Sep 17 00:00:00 2001
From: Michael Bumann <hello@michaelbumann.com>
Date: Fri, 26 Jul 2024 23:56:57 +0200
Subject: [PATCH 1/4] fix: button usage for links

Button tags in forms submit the form.
This means clicking the "Buy Bitcoin" link did not open the link but actually submit the form.
According to the HTML spec a button tag must also not be nested into a hyperlink.
---
 frontend/src/components/ui/button.tsx         |  26 +-
 .../channels/IncreaseIncomingCapacity.tsx     | 326 +++++++++--------
 .../channels/IncreaseOutgoingCapacity.tsx     | 340 +++++++++---------
 3 files changed, 367 insertions(+), 325 deletions(-)

diff --git a/frontend/src/components/ui/button.tsx b/frontend/src/components/ui/button.tsx
index 84922957..4e076e5a 100644
--- a/frontend/src/components/ui/button.tsx
+++ b/frontend/src/components/ui/button.tsx
@@ -1,7 +1,9 @@
 import { Slot } from "@radix-ui/react-slot";
 import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
+import { Link } from "react-router-dom";
 
+import ExternalLink from "src/components/ExternalLink";
 import { cn } from "src/lib/utils";
 
 const buttonVariants = cva(
@@ -56,5 +58,27 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 );
 Button.displayName = "Button";
 
+interface LinkProps extends ButtonProps {
+  to: string;
+}
+const ExternalLinkButton = React.forwardRef<HTMLAnchorElement, LinkProps>(
+  ({ className, variant, size, asChild = false, ...props }, ref) => {
+    const Comp = asChild ? Slot : ExternalLink;
+    const _className = cn(buttonVariants({ variant, size, className }));
+
+    return <Comp className={_className} ref={ref} {...props} />;
+  }
+);
+
+const LinkButton = React.forwardRef<HTMLAnchorElement, LinkProps>(
+  ({ className, variant, size, asChild = false, ...props }, ref) => {
+    const Comp = asChild ? Slot : Link;
+    const _className = cn(buttonVariants({ variant, size, className }));
+
+    return <Comp className={_className} ref={ref} {...props} />;
+  }
+);
+
+//const ExternalLinkButton = LinkButton
 // eslint-disable-next-line react-refresh/only-export-components
-export { Button, buttonVariants };
+export { Button, LinkButton, ExternalLinkButton, buttonVariants };
diff --git a/frontend/src/screens/channels/IncreaseIncomingCapacity.tsx b/frontend/src/screens/channels/IncreaseIncomingCapacity.tsx
index 3dc200e2..a38c5313 100644
--- a/frontend/src/screens/channels/IncreaseIncomingCapacity.tsx
+++ b/frontend/src/screens/channels/IncreaseIncomingCapacity.tsx
@@ -4,7 +4,11 @@ import { Link, useNavigate } from "react-router-dom";
 import AppHeader from "src/components/AppHeader";
 import ExternalLink from "src/components/ExternalLink";
 import Loading from "src/components/Loading";
-import { Button } from "src/components/ui/button";
+import {
+  Button,
+  ExternalLinkButton,
+  LinkButton,
+} from "src/components/ui/button";
 import { Checkbox } from "src/components/ui/checkbox";
 import { Input } from "src/components/ui/input";
 import { Label } from "src/components/ui/label";
@@ -198,177 +202,181 @@ function NewChannelInternal({
           </div>
         }
       />
-      <form
-        onSubmit={onSubmit}
-        className="md:max-w-md max-w-full flex flex-col gap-5 flex-1"
-      >
-        <div className="grid gap-1.5">
-          <Label htmlFor="amount">Channel size (sats)</Label>
-          {order.amount && +order.amount < 200_000 && (
-            <p className="text-muted-foreground text-xs">
-              For a smooth experience consider a opening a channel of 200k sats
-              in size or more.{" "}
-              <ExternalLink
-                to="https://guides.getalby.com/user-guide/v/alby-account-and-browser-extension/alby-hub/liquidity"
-                className="underline"
-              >
-                Learn more
-              </ExternalLink>
-            </p>
-          )}
-          <Input
-            id="amount"
-            type="number"
-            required
-            min={
-              showAdvanced
-                ? selectedPeer?.minimumChannelSize || 100000
-                : undefined
-            }
-            value={order.amount}
-            onChange={(e) => {
-              setAmount(e.target.value.trim());
-            }}
-          />
-          <div className="grid grid-cols-3 gap-1.5 text-muted-foreground text-xs">
-            {presetAmounts.map((amount) => (
-              <div
-                key={amount}
-                className={cn(
-                  "text-center border rounded p-2 cursor-pointer hover:border-muted-foreground",
-                  +(order.amount || "0") === amount &&
-                    "border-primary hover:border-primary"
-                )}
-                onClick={() => setAmount(amount.toString())}
-              >
-                {formatAmount(amount * 1000, 0)}
-              </div>
-            ))}
+      <div className="md:max-w-md max-w-full flex flex-col gap-5 flex-1">
+        <form onSubmit={onSubmit} className="flex flex-col gap-5 flex-1">
+          <div className="grid gap-1.5">
+            <Label htmlFor="amount">Channel size (sats)</Label>
+            {order.amount && +order.amount < 200_000 && (
+              <p className="text-muted-foreground text-xs">
+                For a smooth experience consider a opening a channel of 200k
+                sats in size or more.{" "}
+                <ExternalLink
+                  to="https://guides.getalby.com/user-guide/v/alby-account-and-browser-extension/alby-hub/liquidity"
+                  className="underline"
+                >
+                  Learn more
+                </ExternalLink>
+              </p>
+            )}
+            <Input
+              id="amount"
+              type="number"
+              required
+              min={
+                showAdvanced
+                  ? selectedPeer?.minimumChannelSize || 100000
+                  : undefined
+              }
+              value={order.amount}
+              onChange={(e) => {
+                setAmount(e.target.value.trim());
+              }}
+            />
+            <div className="grid grid-cols-3 gap-1.5 text-muted-foreground text-xs">
+              {presetAmounts.map((amount) => (
+                <div
+                  key={amount}
+                  className={cn(
+                    "text-center border rounded p-2 cursor-pointer hover:border-muted-foreground",
+                    +(order.amount || "0") === amount &&
+                      "border-primary hover:border-primary"
+                  )}
+                  onClick={() => setAmount(amount.toString())}
+                >
+                  {formatAmount(amount * 1000, 0)}
+                </div>
+              ))}
+            </div>
           </div>
-        </div>
-        {showAdvanced && (
-          <>
-            <div className="flex flex-col gap-3">
-              {selectedPeer && (
-                <div className="grid gap-1.5">
-                  <Label>Channel peer</Label>
-                  <Select
-                    value={getPeerKey(selectedPeer)}
-                    onValueChange={(value) =>
-                      setSelectedPeer(
-                        channelPeerSuggestions.find(
-                          (x) => getPeerKey(x) === value
-                        )
-                      )
-                    }
-                  >
-                    <SelectTrigger>
-                      <SelectValue placeholder="Select channel peer" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {channelPeerSuggestions
-                        .filter(
-                          (peer) =>
-                            peer.network === network &&
-                            peer.paymentMethod === order.paymentMethod
+          {showAdvanced && (
+            <>
+              <div className="flex flex-col gap-3">
+                {selectedPeer && (
+                  <div className="grid gap-1.5">
+                    <Label>Channel peer</Label>
+                    <Select
+                      value={getPeerKey(selectedPeer)}
+                      onValueChange={(value) =>
+                        setSelectedPeer(
+                          channelPeerSuggestions.find(
+                            (x) => getPeerKey(x) === value
+                          )
                         )
-                        .map((peer) => (
-                          <SelectItem
-                            value={getPeerKey(peer)}
-                            key={getPeerKey(peer)}
-                          >
-                            <div className="flex items-center gap-3">
+                      }
+                    >
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select channel peer" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {channelPeerSuggestions
+                          .filter(
+                            (peer) =>
+                              peer.network === network &&
+                              peer.paymentMethod === order.paymentMethod
+                          )
+                          .map((peer) => (
+                            <SelectItem
+                              value={getPeerKey(peer)}
+                              key={getPeerKey(peer)}
+                            >
                               <div className="flex items-center gap-3">
-                                {peer.name !== "Custom" && (
-                                  <img
-                                    src={peer.image}
-                                    className="w-8 h-8 object-contain"
-                                  />
-                                )}
-                                <div>
-                                  {peer.name}
-                                  <span className="ml-4 text-xs text-muted-foreground">
-                                    Min.{" "}
-                                    {new Intl.NumberFormat().format(
-                                      peer.minimumChannelSize
-                                    )}
-                                    sats
-                                    <span className="mr-10" />
-                                    Max.{" "}
-                                    {new Intl.NumberFormat().format(
-                                      peer.maximumChannelSize
-                                    )}{" "}
-                                    sats
-                                  </span>
+                                <div className="flex items-center gap-3">
+                                  {peer.name !== "Custom" && (
+                                    <img
+                                      src={peer.image}
+                                      className="w-8 h-8 object-contain"
+                                    />
+                                  )}
+                                  <div>
+                                    {peer.name}
+                                    <span className="ml-4 text-xs text-muted-foreground">
+                                      Min.{" "}
+                                      {new Intl.NumberFormat().format(
+                                        peer.minimumChannelSize
+                                      )}
+                                      sats
+                                      <span className="mr-10" />
+                                      Max.{" "}
+                                      {new Intl.NumberFormat().format(
+                                        peer.maximumChannelSize
+                                      )}{" "}
+                                      sats
+                                    </span>
+                                  </div>
                                 </div>
                               </div>
-                            </div>
-                          </SelectItem>
-                        ))}
-                    </SelectContent>
-                  </Select>
-                  {selectedPeer.name === "Custom" && (
-                    <>
-                      <div className="grid gap-1.5"></div>
-                    </>
-                  )}
-                </div>
+                            </SelectItem>
+                          ))}
+                      </SelectContent>
+                    </Select>
+                    {selectedPeer.name === "Custom" && (
+                      <>
+                        <div className="grid gap-1.5"></div>
+                      </>
+                    )}
+                  </div>
+                )}
+              </div>
+              {order.paymentMethod === "lightning" && (
+                <NewChannelLightning order={order} setOrder={setOrder} />
               )}
-            </div>
-            {order.paymentMethod === "lightning" && (
-              <NewChannelLightning order={order} setOrder={setOrder} />
-            )}
 
-            <div className="mt-2 flex items-top space-x-2">
-              <Checkbox
-                id="public-channel"
-                defaultChecked={order.isPublic}
-                onCheckedChange={() => setPublic(!order.isPublic)}
-                className="mr-2"
-              />
-              <div className="grid gap-1.5 leading-none">
-                <Label
-                  htmlFor="public-channel"
-                  className="flex items-center gap-2"
-                >
-                  Public Channel
-                </Label>
-                <p className="text-xs text-muted-foreground">
-                  Only enable if you want to receive keysend payments. (e.g.
-                  podcasting)
-                </p>
+              <div className="mt-2 flex items-top space-x-2">
+                <Checkbox
+                  id="public-channel"
+                  defaultChecked={order.isPublic}
+                  onCheckedChange={() => setPublic(!order.isPublic)}
+                  className="mr-2"
+                />
+                <div className="grid gap-1.5 leading-none">
+                  <Label
+                    htmlFor="public-channel"
+                    className="flex items-center gap-2"
+                  >
+                    Public Channel
+                  </Label>
+                  <p className="text-xs text-muted-foreground">
+                    Only enable if you want to receive keysend payments. (e.g.
+                    podcasting)
+                  </p>
+                </div>
               </div>
-            </div>
-          </>
-        )}
-        {!showAdvanced && (
-          <Button
-            type="button"
-            variant="link"
-            className="text-muted-foreground text-xs"
-            onClick={() => setShowAdvanced((current) => !current)}
-          >
-            <ChevronDown className="w-4 h-4 mr-2" />
-            Advanced Options
-          </Button>
-        )}
-        <Button size="lg">Next</Button>
+            </>
+          )}
+          {!showAdvanced && (
+            <Button
+              type="button"
+              variant="link"
+              className="text-muted-foreground text-xs"
+              onClick={() => setShowAdvanced((current) => !current)}
+            >
+              <ChevronDown className="w-4 h-4 mr-2" />
+              Advanced Options
+            </Button>
+          )}
+          <Button size="lg">Next</Button>
+        </form>
+
         <div className="flex-1 flex flex-col justify-end items-center gap-4">
           <p className="mt-32 text-sm text-muted-foreground text-center">
             Other options
           </p>
-          <Link to="/channels/outgoing" className="w-full">
-            <Button className="w-full" variant="secondary">
-              Increase spending balance
-            </Button>
-          </Link>
-          <ExternalLink to="https://www.getalby.com/topup" className="w-full">
-            <Button className="w-full" variant="secondary">
-              Buy Bitcoin
-            </Button>
-          </ExternalLink>
+          <LinkButton
+            to="/channels/outgoing"
+            className="w-full"
+            variant="secondary"
+          >
+            Increase spending balance
+          </LinkButton>
+          <ExternalLinkButton
+            to="https://www.getalby.com/topup"
+            className="w-full"
+            variant="secondary"
+          >
+            Buy Bitcoin
+          </ExternalLinkButton>
         </div>
-      </form>
+      </div>
     </>
   );
 }
diff --git a/frontend/src/screens/channels/IncreaseOutgoingCapacity.tsx b/frontend/src/screens/channels/IncreaseOutgoingCapacity.tsx
index 11360065..0bac2652 100644
--- a/frontend/src/screens/channels/IncreaseOutgoingCapacity.tsx
+++ b/frontend/src/screens/channels/IncreaseOutgoingCapacity.tsx
@@ -4,7 +4,11 @@ import { Link, useNavigate } from "react-router-dom";
 import AppHeader from "src/components/AppHeader";
 import ExternalLink from "src/components/ExternalLink";
 import Loading from "src/components/Loading";
-import { Button } from "src/components/ui/button";
+import {
+  Button,
+  ExternalLinkButton,
+  LinkButton,
+} from "src/components/ui/button";
 import { Checkbox } from "src/components/ui/checkbox";
 import { Input } from "src/components/ui/input";
 import { Label } from "src/components/ui/label";
@@ -208,184 +212,190 @@ function NewChannelInternal({ network }: { network: Network }) {
           </div>
         }
       />
-      <form
-        onSubmit={onSubmit}
-        className="md:max-w-md max-w-full flex flex-col gap-5 flex-1"
-      >
-        <div className="grid gap-1.5">
-          <Label htmlFor="amount">Channel size (sats)</Label>
-          {order.amount && +order.amount < 200_000 && (
-            <p className="text-muted-foreground text-xs">
-              For a smooth experience consider a opening a channel of 200k sats
-              in size or more.{" "}
-              <ExternalLink
-                to="https://guides.getalby.com/user-guide/v/alby-account-and-browser-extension/alby-hub/liquidity"
-                className="underline"
-              >
-                Learn more
-              </ExternalLink>
-            </p>
-          )}
-          <Input
-            id="amount"
-            type="number"
-            required
-            min={
-              showAdvanced
-                ? selectedPeer?.minimumChannelSize || 100000
-                : undefined
-            }
-            value={order.amount}
-            onChange={(e) => {
-              setAmount(e.target.value.trim());
-            }}
-          />
-          <div className="text-muted-foreground text-sm">
-            Current savings balance:{" "}
-            {new Intl.NumberFormat().format(balances.onchain.spendable)} sats
-          </div>
-          <div className="grid grid-cols-3 gap-1.5 text-muted-foreground text-xs">
-            {presetAmounts.map((amount) => (
-              <div
-                key={amount}
-                className={cn(
-                  "text-center border rounded p-2 cursor-pointer hover:border-muted-foreground",
-                  +(order.amount || "0") === amount &&
-                    "border-primary hover:border-primary"
-                )}
-                onClick={() => setAmount(amount.toString())}
-              >
-                {formatAmount(amount * 1000, 0)}
-              </div>
-            ))}
+      <div className="md:max-w-md max-w-full flex flex-col gap-5 flex-1">
+        <form
+          onSubmit={onSubmit}
+          className="md:max-w-md max-w-full flex flex-col gap-5 flex-1"
+        >
+          <div className="grid gap-1.5">
+            <Label htmlFor="amount">Channel size (sats)</Label>
+            {order.amount && +order.amount < 200_000 && (
+              <p className="text-muted-foreground text-xs">
+                For a smooth experience consider a opening a channel of 200k
+                sats in size or more.{" "}
+                <ExternalLink
+                  to="https://guides.getalby.com/user-guide/v/alby-account-and-browser-extension/alby-hub/liquidity"
+                  className="underline"
+                >
+                  Learn more
+                </ExternalLink>
+              </p>
+            )}
+            <Input
+              id="amount"
+              type="number"
+              required
+              min={
+                showAdvanced
+                  ? selectedPeer?.minimumChannelSize || 100000
+                  : undefined
+              }
+              value={order.amount}
+              onChange={(e) => {
+                setAmount(e.target.value.trim());
+              }}
+            />
+            <div className="text-muted-foreground text-sm">
+              Current savings balance:{" "}
+              {new Intl.NumberFormat().format(balances.onchain.spendable)} sats
+            </div>
+            <div className="grid grid-cols-3 gap-1.5 text-muted-foreground text-xs">
+              {presetAmounts.map((amount) => (
+                <div
+                  key={amount}
+                  className={cn(
+                    "text-center border rounded p-2 cursor-pointer hover:border-muted-foreground",
+                    +(order.amount || "0") === amount &&
+                      "border-primary hover:border-primary"
+                  )}
+                  onClick={() => setAmount(amount.toString())}
+                >
+                  {formatAmount(amount * 1000, 0)}
+                </div>
+              ))}
+            </div>
           </div>
-        </div>
-        {showAdvanced && (
-          <>
-            <div className="flex flex-col gap-3">
-              {selectedPeer &&
-                order.paymentMethod === "onchain" &&
-                selectedPeer.pubkey === order.pubkey && (
-                  <div className="grid gap-1.5">
-                    <Label>Channel peer</Label>
-                    <Select
-                      value={getPeerKey(selectedPeer)}
-                      onValueChange={(value) =>
-                        setSelectedPeer(
-                          channelPeerSuggestions.find(
-                            (x) => getPeerKey(x) === value
+          {showAdvanced && (
+            <>
+              <div className="flex flex-col gap-3">
+                {selectedPeer &&
+                  order.paymentMethod === "onchain" &&
+                  selectedPeer.pubkey === order.pubkey && (
+                    <div className="grid gap-1.5">
+                      <Label>Channel peer</Label>
+                      <Select
+                        value={getPeerKey(selectedPeer)}
+                        onValueChange={(value) =>
+                          setSelectedPeer(
+                            channelPeerSuggestions.find(
+                              (x) => getPeerKey(x) === value
+                            )
                           )
-                        )
-                      }
-                    >
-                      <SelectTrigger>
-                        <SelectValue placeholder="Select channel peer" />
-                      </SelectTrigger>
-                      <SelectContent>
-                        {channelPeerSuggestions
-                          .filter(
-                            (peer) =>
-                              peer.network === network &&
-                              peer.paymentMethod === order.paymentMethod
-                          )
-                          .map((peer) => (
-                            <SelectItem
-                              value={getPeerKey(peer)}
-                              key={getPeerKey(peer)}
-                            >
-                              <div className="flex items-center gap-3">
+                        }
+                      >
+                        <SelectTrigger>
+                          <SelectValue placeholder="Select channel peer" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {channelPeerSuggestions
+                            .filter(
+                              (peer) =>
+                                peer.network === network &&
+                                peer.paymentMethod === order.paymentMethod
+                            )
+                            .map((peer) => (
+                              <SelectItem
+                                value={getPeerKey(peer)}
+                                key={getPeerKey(peer)}
+                              >
                                 <div className="flex items-center gap-3">
-                                  {peer.name !== "Custom" && (
-                                    <img
-                                      src={peer.image}
-                                      className="w-8 h-8 object-contain"
-                                    />
-                                  )}
-                                  <div>
-                                    {peer.name}
-                                    {peer.minimumChannelSize > 0 && (
-                                      <span className="ml-4 text-xs text-muted-foreground">
-                                        Min.{" "}
-                                        {new Intl.NumberFormat().format(
-                                          peer.minimumChannelSize
-                                        )}{" "}
-                                        sats
-                                      </span>
+                                  <div className="flex items-center gap-3">
+                                    {peer.name !== "Custom" && (
+                                      <img
+                                        src={peer.image}
+                                        className="w-8 h-8 object-contain"
+                                      />
                                     )}
+                                    <div>
+                                      {peer.name}
+                                      {peer.minimumChannelSize > 0 && (
+                                        <span className="ml-4 text-xs text-muted-foreground">
+                                          Min.{" "}
+                                          {new Intl.NumberFormat().format(
+                                            peer.minimumChannelSize
+                                          )}{" "}
+                                          sats
+                                        </span>
+                                      )}
+                                    </div>
                                   </div>
                                 </div>
-                              </div>
-                            </SelectItem>
-                          ))}
-                      </SelectContent>
-                    </Select>
-                    {selectedPeer.name === "Custom" && (
-                      <>
-                        <div className="grid gap-1.5"></div>
-                      </>
-                    )}
-                  </div>
-                )}
-            </div>
-            {order.paymentMethod === "onchain" && (
-              <NewChannelOnchain
-                order={order}
-                setOrder={setOrder}
-                showCustomOptions={selectedPeer?.name === "Custom"}
-              />
-            )}
+                              </SelectItem>
+                            ))}
+                        </SelectContent>
+                      </Select>
+                      {selectedPeer.name === "Custom" && (
+                        <>
+                          <div className="grid gap-1.5"></div>
+                        </>
+                      )}
+                    </div>
+                  )}
+              </div>
+              {order.paymentMethod === "onchain" && (
+                <NewChannelOnchain
+                  order={order}
+                  setOrder={setOrder}
+                  showCustomOptions={selectedPeer?.name === "Custom"}
+                />
+              )}
 
-            <div className="mt-2 flex items-top space-x-2">
-              <Checkbox
-                id="public-channel"
-                defaultChecked={order.isPublic}
-                onCheckedChange={() => setPublic(!order.isPublic)}
-                className="mr-2"
-              />
-              <div className="grid gap-1.5 leading-none">
-                <Label
-                  htmlFor="public-channel"
-                  className="flex items-center gap-2"
-                >
-                  Public Channel
-                </Label>
-                <p className="text-xs text-muted-foreground">
-                  Enable if you want to receive keysend payments. (e.g.
-                  podcasting)
-                </p>
+              <div className="mt-2 flex items-top space-x-2">
+                <Checkbox
+                  id="public-channel"
+                  defaultChecked={order.isPublic}
+                  onCheckedChange={() => setPublic(!order.isPublic)}
+                  className="mr-2"
+                />
+                <div className="grid gap-1.5 leading-none">
+                  <Label
+                    htmlFor="public-channel"
+                    className="flex items-center gap-2"
+                  >
+                    Public Channel
+                  </Label>
+                  <p className="text-xs text-muted-foreground">
+                    Enable if you want to receive keysend payments. (e.g.
+                    podcasting)
+                  </p>
+                </div>
               </div>
-            </div>
-          </>
-        )}
-        {!showAdvanced && (
-          <Button
-            type="button"
-            variant="link"
-            className="text-muted-foreground text-xs"
-            onClick={() => setShowAdvanced((current) => !current)}
-          >
-            <ChevronDown className="w-4 h-4 mr-2" />
-            Advanced Options
-          </Button>
-        )}
-        <Button size="lg">{openImmediately ? "Open Channel" : "Next"}</Button>
+            </>
+          )}
+          {!showAdvanced && (
+            <Button
+              type="button"
+              variant="link"
+              className="text-muted-foreground text-xs"
+              onClick={() => setShowAdvanced((current) => !current)}
+            >
+              <ChevronDown className="w-4 h-4 mr-2" />
+              Advanced Options
+            </Button>
+          )}
+          <Button size="lg">{openImmediately ? "Open Channel" : "Next"}</Button>
+        </form>
 
         <div className="flex-1 flex flex-col justify-end items-center gap-4">
           <p className="mt-32 text-sm text-muted-foreground text-center">
             Other options
           </p>
-          <Link to="/channels/incoming" className="w-full">
-            <Button className="w-full" variant="secondary">
-              Increase receiving capacity
-            </Button>
-          </Link>
-          <ExternalLink to="https://www.getalby.com/topup" className="w-full">
-            <Button className="w-full" variant="secondary">
-              Buy Bitcoin
-            </Button>
-          </ExternalLink>
+          <LinkButton
+            to="/channels/incoming"
+            className="w-full"
+            variant="secondary"
+          >
+            Increase receiving capacity
+          </LinkButton>
+          <ExternalLinkButton
+            to="https://www.getalby.com/topup"
+            className="w-full"
+            variant="secondary"
+          >
+            Buy Bitcoin
+          </ExternalLinkButton>
         </div>
-      </form>
+      </div>
     </>
   );
 }

From b5e75903a5c3c1e30ac0a842f98c30469c1623df Mon Sep 17 00:00:00 2001
From: Roland Bewick <roland.bewick@gmail.com>
Date: Sat, 27 Jul 2024 13:07:06 +0700
Subject: [PATCH 2/4] fix: new button component linter errors

---
 frontend/src/components/ui/button.tsx | 29 ++++++++++++++++-----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/ui/button.tsx b/frontend/src/components/ui/button.tsx
index 4e076e5a..26f5dfd9 100644
--- a/frontend/src/components/ui/button.tsx
+++ b/frontend/src/components/ui/button.tsx
@@ -58,27 +58,32 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 );
 Button.displayName = "Button";
 
-interface LinkProps extends ButtonProps {
+interface LinkProps extends VariantProps<typeof buttonVariants> {
   to: string;
+  className?: string;
 }
 const ExternalLinkButton = React.forwardRef<HTMLAnchorElement, LinkProps>(
-  ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : ExternalLink;
-    const _className = cn(buttonVariants({ variant, size, className }));
-
-    return <Comp className={_className} ref={ref} {...props} />;
+  ({ className, variant, size, ...props }, _ref) => {
+    return (
+      <ExternalLink
+        className={cn(buttonVariants({ variant, size, className }))}
+        {...props}
+      />
+    );
   }
 );
 
 const LinkButton = React.forwardRef<HTMLAnchorElement, LinkProps>(
-  ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : Link;
-    const _className = cn(buttonVariants({ variant, size, className }));
-
-    return <Comp className={_className} ref={ref} {...props} />;
+  ({ className, variant, size, ...props }, _ref) => {
+    return (
+      <Link
+        className={cn(buttonVariants({ variant, size, className }))}
+        {...props}
+      />
+    );
   }
 );
 
 //const ExternalLinkButton = LinkButton
 // eslint-disable-next-line react-refresh/only-export-components
-export { Button, LinkButton, ExternalLinkButton, buttonVariants };
+export { Button, buttonVariants, ExternalLinkButton, LinkButton };

From 19a0c85072f19ced1d196c0f10eafe5c63b8dce2 Mon Sep 17 00:00:00 2001
From: Roland Bewick <roland.bewick@gmail.com>
Date: Sat, 27 Jul 2024 13:10:01 +0700
Subject: [PATCH 3/4] fix: prettier error

---
 frontend/src/screens/channels/first/FirstChannel.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/screens/channels/first/FirstChannel.tsx b/frontend/src/screens/channels/first/FirstChannel.tsx
index 9b757b97..297fe3c8 100644
--- a/frontend/src/screens/channels/first/FirstChannel.tsx
+++ b/frontend/src/screens/channels/first/FirstChannel.tsx
@@ -147,8 +147,8 @@ export function FirstChannel() {
                 </p>
                 <p>
                   After paying a lightning invoice to cover on-chain fees,
-                  you'll immediately be able to receive and send bitcoin with your
-                  Hub.
+                  you'll immediately be able to receive and send bitcoin with
+                  your Hub.
                 </p>
               </>
             )}

From f9eec24eaced1084117e541b8b5bdc512ebfa0a6 Mon Sep 17 00:00:00 2001
From: Roland Bewick <roland.bewick@gmail.com>
Date: Sat, 27 Jul 2024 13:12:44 +0700
Subject: [PATCH 4/4] fix: tsc error

---
 frontend/src/components/ui/button.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/ui/button.tsx b/frontend/src/components/ui/button.tsx
index 26f5dfd9..632ce617 100644
--- a/frontend/src/components/ui/button.tsx
+++ b/frontend/src/components/ui/button.tsx
@@ -58,10 +58,12 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 );
 Button.displayName = "Button";
 
-interface LinkProps extends VariantProps<typeof buttonVariants> {
-  to: string;
-  className?: string;
-}
+type LinkProps = React.PropsWithChildren<
+  VariantProps<typeof buttonVariants> & {
+    to: string;
+    className?: string;
+  }
+>;
 const ExternalLinkButton = React.forwardRef<HTMLAnchorElement, LinkProps>(
   ({ className, variant, size, ...props }, _ref) => {
     return (