diff --git a/src/routes/Activity.tsx b/src/routes/Activity.tsx
index eba264a..cafc490 100644
--- a/src/routes/Activity.tsx
+++ b/src/routes/Activity.tsx
@@ -19,9 +19,10 @@ function ContactRow() {
const contacts = state.mutiny_wallet?.get_contacts();
console.log(contacts)
- let c: Contact[] = []
+ // FIXME: this is just types shenanigans I believe
+ const c: Contact[] = []
if (contacts) {
- for (let contact in contacts) {
+ for (const contact in contacts) {
c.push(contacts[contact])
}
}
@@ -37,7 +38,7 @@ function ContactRow() {
}
//
- async function saveContact(contact: ContactFormValues) {
+ async function saveContact(_contact: ContactFormValues) {
showToast(new Error("Unimplemented"))
// await editContact(contact)
refetch();
diff --git a/src/routes/Receive.tsx b/src/routes/Receive.tsx
index 110c062..17129c6 100644
--- a/src/routes/Receive.tsx
+++ b/src/routes/Receive.tsx
@@ -1,5 +1,5 @@
import { Contact, MutinyBip21RawMaterials, MutinyInvoice } from "@mutinywallet/mutiny-wasm";
-import { createEffect, createMemo, createResource, createSignal, Match, onCleanup, onMount, Show, Switch } from "solid-js";
+import { createEffect, createMemo, createResource, createSignal, Match, onCleanup, Show, Switch } from "solid-js";
import { QRCodeSVG } from "solid-qr-code";
import { Button, Card, DefaultMain, Indicator, LargeHeader, MutinyWalletGuard, SafeArea } from "~/components/layout";
import NavBar from "~/components/NavBar";
@@ -51,7 +51,7 @@ type ReceiveState = "edit" | "show" | "paid"
type PaidState = "lightning_paid" | "onchain_paid";
export default function Receive() {
- const [state, actions] = useMegaStore()
+ const [state, _actions] = useMegaStore()
const navigate = useNavigate();
const [amount, setAmount] = createSignal("")
diff --git a/src/routes/Redshift.tsx b/src/routes/Redshift.tsx
index 9968e7c..2175983 100644
--- a/src/routes/Redshift.tsx
+++ b/src/routes/Redshift.tsx
@@ -1,12 +1,10 @@
import {
- Component,
createEffect,
createMemo,
createResource,
createSignal,
For,
Match,
- onCleanup,
onMount,
ParentComponent,
Show,
@@ -53,8 +51,8 @@ type ShiftStage = "choose" | "observe" | "success" | "failure"
type OutPoint = string // Replace with the actual TypeScript type for OutPoint
type RedshiftStatus = string // Replace with the actual TypeScript type for RedshiftStatus
-type RedshiftRecipient = any // Replace with the actual TypeScript type for RedshiftRecipient
-type PublicKey = any // Replace with the actual TypeScript type for PublicKey
+type RedshiftRecipient = unknown // Replace with the actual TypeScript type for RedshiftRecipient
+type PublicKey = unknown // Replace with the actual TypeScript type for PublicKey
interface RedshiftResult {
id: string
@@ -96,52 +94,50 @@ function RedshiftReport(props: { redshift: RedshiftResult; utxo: UtxoItem }) {
return (await state.mutiny_wallet?.list_utxos()) as UtxoItem[]
}
- function findUtxoByOutpoint(
- outpoint?: string,
- utxos: UtxoItem[] = []
- ): UtxoItem | undefined {
- if (!outpoint) return undefined
- return utxos.find((utxo) => utxo.outpoint === outpoint)
- }
+ // function findUtxoByOutpoint(
+ // outpoint?: string,
+ // utxos: UtxoItem[] = []
+ // ): UtxoItem | undefined {
+ // if (!outpoint) return undefined
+ // return utxos.find((utxo) => utxo.outpoint === outpoint)
+ // }
- const [utxos, { refetch: _refetchUtxos }] = createResource(getUtXos)
+ const [_utxos, { refetch: _refetchUtxos }] = createResource(getUtXos)
- const inputUtxo = createMemo(() => {
- console.log(utxos())
- const foundUtxo = findUtxoByOutpoint(props.redshift.input_utxo, utxos())
- console.log("Found utxo:", foundUtxo)
- return foundUtxo
- })
+ // const inputUtxo = createMemo(() => {
+ // console.log(utxos())
+ // const foundUtxo = findUtxoByOutpoint(props.redshift.input_utxo, utxos())
+ // console.log("Found utxo:", foundUtxo)
+ // return foundUtxo
+ // })
- async function checkRedshift(id: string) {
- // const rs = redshiftItems[0] as RedshiftResult;
- console.log("Checking redshift", id)
- const redshift = await state.mutiny_wallet?.get_redshift(id)
- console.log(redshift)
- return redshift
- }
+ const [redshiftResource, { refetch: _refetchRedshift }] = createResource(
- const [redshiftResource, { refetch }] = createResource(
- props.redshift.id,
- checkRedshift
+ async () => {
+ console.log("Checking redshift", props.redshift.id)
+ const redshift = await state.mutiny_wallet?.get_redshift(props.redshift.id)
+ console.log(redshift)
+ return redshift
+ }
)
onMount(() => {
- const interval = setInterval(() => {
- if (redshiftResource()) refetch()
- // if (sentAmount() === 200000) {
- // clearInterval(interval)
- // props.setShiftStage("success");
- // // setSentAmount((0))
+ // const interval = setInterval(() => {
+ // if (redshiftResource()) refetch()
+ // // if (sentAmount() === 200000) {
+ // // clearInterval(interval)
+ // // props.setShiftStage("success");
+ // // // setSentAmount((0))
- // } else {
- // setSentAmount((sentAmount() + 50000))
- // }
- }, 1000)
+ // // } else {
+ // // setSentAmount((sentAmount() + 50000))
+ // // }
+ // }, 1000)
})
- const outputUtxo = createMemo(() => {
- return findUtxoByOutpoint(redshiftResource()?.output_utxo, utxos())
- })
+
+ // const outputUtxo = createMemo(() => {
+ // return findUtxoByOutpoint(redshiftResource()?.output_utxo, utxos())
+ // })
createEffect(() => {
setRedshifted(true, redshiftResource()?.output_utxo)
@@ -170,23 +166,23 @@ function RedshiftReport(props: { redshift: RedshiftResult; utxo: UtxoItem }) {
*/}
-
+
-
+
-
+
- {redshiftResource().introduction_channel}
+ {redshiftResource()!.introduction_channel}
-
+
- {redshiftResource().output_channel}
+ {redshiftResource()!.output_channel}
-
)
@@ -238,7 +233,7 @@ export function Utxo(props: { item: UtxoItem; onClick?: () => void }) {
const redshifted = createMemo(() => getRedshifted(props.item.outpoint))
return (
<>
-
+
props.onClick && props.onClick()}>
@@ -275,11 +270,11 @@ const FAKE_STATES = [
function ShiftObserver(props: {
setShiftStage: (stage: ShiftStage) => void
- redshiftId: String
+ redshiftId: string
}) {
- const [state, _actions] = useMegaStore()
+ const [_state, _actions] = useMegaStore()
- const [fakeStage, setFakeStage] = createSignal(2)
+ const [fakeStage, _setFakeStage] = createSignal(2)
const [sentAmount, setSentAmount] = createSignal(0)
@@ -295,17 +290,17 @@ function ShiftObserver(props: {
}, 1000)
})
- async function checkRedshift(id: string) {
- console.log("Checking redshift", id)
- const redshift = await state.mutiny_wallet?.get_redshift(id)
- console.log(redshift)
- return redshift
- }
+ // async function checkRedshift(id: string) {
+ // console.log("Checking redshift", id)
+ // const redshift = await state.mutiny_wallet?.get_redshift(id)
+ // console.log(redshift)
+ // return redshift
+ // }
- const [redshiftResource, { refetch }] = createResource(
- props.redshiftId,
- checkRedshift
- )
+ // const [redshiftResource, { refetch }] = createResource(
+ // props.redshiftId,
+ // checkRedshift
+ // )
// onMount(() => {
// const interval = setInterval(() => {
@@ -377,7 +372,7 @@ export default function Redshift() {
}
const [utxos, { refetch: _refetchUtxos }] = createResource(getUtXos)
- const [channels, { refetch: _refetchChannels }] = createResource(getChannels)
+ const [_channels, { refetch: _refetchChannels }] = createResource(getChannels)
const redshiftedUtxos = createMemo(() => {
return utxos()?.filter((utxo) => getRedshifted(utxo.outpoint))
@@ -515,7 +510,7 @@ export default function Redshift() {
diff --git a/src/routes/Send.tsx b/src/routes/Send.tsx
index 473f41d..36c06f2 100644
--- a/src/routes/Send.tsx
+++ b/src/routes/Send.tsx
@@ -32,6 +32,7 @@ import { StringShower } from "~/components/ShareCard";
import { AmountCard } from "~/components/AmountCard";
import { MutinyTagItem } from "~/utils/tags";
import { BackButton } from "~/components/layout/BackButton";
+import { Network } from "~/logic/mutinyWalletSetup";
export type SendSource = "lightning" | "onchain";
@@ -407,6 +408,8 @@ export default function Send() {
const sendButtonDisabled = createMemo(() => {
return !destination() || sending() || amountSats() === 0n;
});
+
+ const network = state.mutiny_wallet?.get_network() as Network
return (
@@ -441,7 +444,7 @@ export default function Send() {
diff --git a/src/routes/Storybook.tsx b/src/routes/Storybook.tsx
index 7839414..51faa61 100644
--- a/src/routes/Storybook.tsx
+++ b/src/routes/Storybook.tsx
@@ -1,32 +1,12 @@
-import { Match, Show, Switch } from "solid-js";
-import { ActivityItem } from "~/components/ActivityItem";
-import { Amount } from "~/components/Amount";
import { AmountCard } from "~/components/AmountCard";
import NavBar from "~/components/NavBar";
import { OnboardWarning } from "~/components/OnboardWarning";
import { ShareCard } from "~/components/ShareCard";
-import { Card, DefaultMain, LargeHeader, SafeArea, SmallHeader, VStack } from "~/components/layout";
-import { FullscreenModal } from "~/components/layout/FullscreenModal";
-import mempoolTxUrl from "~/utils/mempoolTxUrl";
-import megaex from "~/assets/icons/megaex.png";
-import megacheck from "~/assets/icons/megacheck.png";
+import { DefaultMain, LargeHeader, SafeArea, VStack } from "~/components/layout";
const SAMPLE =
"bitcoin:tb1prqm8xtlgme0vmw5s30lgf0a4f5g4mkgsqundwmpu6thrg8zr6uvq2qrhzq?amount=0.001&lightning=lntbs1m1pj9n9xjsp5xgdrmvprtm67p7nq4neparalexlhlmtxx87zx6xeqthsplu842zspp546d6zd2seyaxpapaxx62m88yz3xueqtjmn9v6wj8y56np8weqsxqdqqnp4qdn2hj8tfknpuvdg6tz9yrf3e27ltrx9y58c24jh89lnm43yjwfc5xqrpwjcqpj9qrsgq5sdgh0m3ur5mu5hrmmag4mx9yvy86f83pd0x9ww80kgck6tac3thuzkj0mrtltaxwnlfea95h2re7tj4qsnwzxlvrdmyq2h9mgapnycpppz6k6";
export default function Admin() {
- const channelOpenResult = () => {
- return {
- channel: {
- balance: 100000n,
- reserve: 1000n,
- outpoint: "123:0"
- },
- failure_reason: undefined
- };
- };
-
- const setChannelOpenResult = (result: any) => {};
-
return (
@@ -35,64 +15,9 @@ export default function Admin() {
- {/*
-
-
-
-
- */}
- {
- if (!open) setChannelOpenResult(undefined);
- }}
- onConfirm={() => {
- setChannelOpenResult(undefined);
- // navigate("/");
- }}
- >
-
-
-
- 
-
-
- {channelOpenResult()?.failure_reason?.message}
-
-
-
- 
-
-
-
- Mempool Link
-
-
- {/* {JSON.stringify(channelOpenResult()?.channel?.value, null, 2)} */}
-
-
-