aljaz/mutiny-web
1
0
Fork 0
mirror of https://github.com/aljazceru/mutiny-web.git synced 2026-01-08 08:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

navigate home after send / receive

Browse Source
This commit is contained in:
Paul Miller
2023-05-04 15:29:24 -05:00
parent 67abe57ef1
commit bc54ab2762
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/routes/Receive.tsx
View File

@@ -16,6 +16,7 @@ import { BackLink } from "~/components/layout/BackLink";
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<ReceiveState>("edit")
@@ -263,7 +265,12 @@ export default function Receive() {
</Card>
</Match>
<Match when={receiveState() === "paid" && paidState() === "lightning_paid"}>
<FullscreenModal title="Payment Received" open={!!paidState()} setOpen={(open: boolean) => { if (!open) clearAll() }}>
<FullscreenModal
title="Payment Received"
open={!!paidState()}
setOpen={(open: boolean) => { if (!open) clearAll() }}
onConfirm={() => { clearAll(); navigate("/"); }}
>
<div class="flex flex-col items-center gap-8">
<img src={party} alt="party" class="w-1/2 mx-auto max-w-[50vh]" />
<Amount amountSats={paymentInvoice()?.amount_sats} showFiat />
@@ -271,7 +278,12 @@ export default function Receive() {
</FullscreenModal>
</Match>
<Match when={receiveState() === "paid" && paidState() === "onchain_paid"}>
<FullscreenModal title="Payment Received" open={!!paidState()} setOpen={(open: boolean) => { if (!open) clearAll() }}>
<FullscreenModal
title="Payment Received"
open={!!paidState()}
setOpen={(open: boolean) => { if (!open) clearAll() }}
onConfirm={() => { clearAll(); navigate("/"); }}
>
<div class="flex flex-col items-center gap-8">
<img src={party} alt="party" class="w-1/2 mx-auto max-w-[50vh] aspect-square" />
<Amount amountSats={paymentTx()?.received} showFiat />

9
src/routes/Send.tsx
View File

@@ -1,4 +1,4 @@
import { Match, Show, Switch, createEffect, createMemo, createResource, createSignal, onCleanup, onMount } from "solid-js";
import { Match, Show, Switch, createEffect, createMemo, createSignal, onMount } from "solid-js";
import { Amount } from "~/components/Amount";
import NavBar from "~/components/NavBar";
import { Button, ButtonLink, DefaultMain, HStack, LargeHeader, MutinyWalletGuard, SafeArea, SmallHeader, VStack } from "~/components/layout";
@@ -16,6 +16,7 @@ import handshake from "~/assets/hands/handshake.png";
import thumbsdown from "~/assets/hands/thumbsdown.png";
import mempoolTxUrl from "~/utils/mempoolTxUrl";
import { BackLink } from "~/components/layout/BackLink";
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("");
@@ -168,8 +170,9 @@ export default function Send() {
sentDetails.amount = amountSats();
}
} else if (source() === "onchain" && address()) {
// FIXME: actual labels
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const txid = await state.mutiny_wallet?.send_to_address(address()!, amountSats());
const txid = await state.mutiny_wallet?.send_to_address(address()!, amountSats(), []);
sentDetails.amount = amountSats();
sentDetails.destination = address();
// TODO: figure out if this is necessary, it takes forever
@@ -204,7 +207,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("/"); }}
>
<div class="flex flex-col items-center gap-8 h-full">
<Switch>