diff --git a/src/routes/Receive.tsx b/src/routes/Receive.tsx index 6e48b48..0c69b01 100644 --- a/src/routes/Receive.tsx +++ b/src/routes/Receive.tsx @@ -16,6 +16,7 @@ import { BackButton } from "~/components/layout/BackButton"; import { TagEditor, TagItem } from "~/components/TagEditor"; import { StyledRadioGroup } from "~/components/layout/Radio"; import { showToast } from "~/components/Toaster"; +import { useNavigate } from "solid-start"; type OnChainTx = { transaction: { @@ -81,6 +82,7 @@ type PaidState = "lightning_paid" | "onchain_paid"; export default function Receive() { const [state, _] = useMegaStore() + const navigate = useNavigate(); const [amount, setAmount] = createSignal("") const [receiveState, setReceiveState] = createSignal("edit") @@ -263,7 +265,12 @@ export default function Receive() { - { if (!open) clearAll() }}> + { if (!open) clearAll() }} + onConfirm={() => { clearAll(); navigate("/"); }} + >
party @@ -271,7 +278,12 @@ export default function Receive() { - { if (!open) clearAll() }}> + { if (!open) clearAll() }} + onConfirm={() => { clearAll(); navigate("/"); }} + >
party diff --git a/src/routes/Send.tsx b/src/routes/Send.tsx index 9705e65..5aaef0f 100644 --- a/src/routes/Send.tsx +++ b/src/routes/Send.tsx @@ -16,6 +16,7 @@ import handshake from "~/assets/hands/handshake.png"; import thumbsdown from "~/assets/hands/thumbsdown.png"; import mempoolTxUrl from "~/utils/mempoolTxUrl"; import { BackButton } from "~/components/layout/BackButton"; +import { useNavigate } from "solid-start"; type SendSource = "lightning" | "onchain"; @@ -29,6 +30,7 @@ type SentDetails = { amount?: bigint, destination?: string, txid?: string, failu export default function Send() { const [state, actions] = useMegaStore(); + const navigate = useNavigate() // These can only be set by the user const [fieldDestination, setFieldDestination] = createSignal(""); @@ -204,7 +206,7 @@ export default function Send() { confirmText={sentDetails()?.amount ? "Nice" : "Too Bad"} open={!!sentDetails()} setOpen={(open: boolean) => { if (!open) setSentDetails(undefined) }} - onConfirm={() => setSentDetails(undefined)} + onConfirm={() => { setSentDetails(undefined); navigate("/"); }} >