diff --git a/src/components/Activity.tsx b/src/components/Activity.tsx index 394afea..b843f56 100644 --- a/src/components/Activity.tsx +++ b/src/components/Activity.tsx @@ -223,7 +223,7 @@ export function CombinedActivity(props: { limit?: number }) { const txs = await state.node_manager?.list_onchain() as OnChainTx[]; const invoices = await state.node_manager?.list_invoices() as MutinyInvoice[]; - let activity: ActivityItem[] = []; + const activity: ActivityItem[] = []; txs.forEach((tx) => { activity.push({ type: "onchain", item: tx, time: tx.confirmation_time?.Confirmed?.time || Date.now() }) diff --git a/src/components/AmountCard.tsx b/src/components/AmountCard.tsx index 7c375a0..350b3fa 100644 --- a/src/components/AmountCard.tsx +++ b/src/components/AmountCard.tsx @@ -4,6 +4,10 @@ import { useMegaStore } from "~/state/megaStore"; import { satsToUsd } from "~/utils/conversions"; import { AmountEditable } from "./AmountEditable"; +const noop = () => { + // do nothing +} + const KeyValue: ParentComponent<{ key: string, gray?: boolean }> = (props) => { return (
@@ -54,7 +58,7 @@ export function AmountCard(props: { amountSats: string, fee?: string, initialOpe }> - { }} /> + @@ -74,7 +78,7 @@ export function AmountCard(props: { amountSats: string, fee?: string, initialOpe }> - { }} /> + diff --git a/src/components/ContactViewer.tsx b/src/components/ContactViewer.tsx index 993cc55..5b7cbe9 100644 --- a/src/components/ContactViewer.tsx +++ b/src/components/ContactViewer.tsx @@ -5,6 +5,7 @@ import close from "~/assets/icons/close.svg"; import { SubmitHandler } from '@modular-forms/solid'; import { ContactItem } from '~/state/contacts'; import { ContactForm } from './ContactForm'; +import { showToast } from './Toaster'; export function ContactViewer(props: { contact: ContactItem, gradient: string, saveContact: (contact: ContactItem) => void }) { const [isOpen, setIsOpen] = createSignal(false); @@ -58,7 +59,7 @@ export function ContactViewer(props: { contact: ContactItem, gradient: string, s
- +
diff --git a/src/components/ImportExport.tsx b/src/components/ImportExport.tsx index 6550e32..5b4d375 100644 --- a/src/components/ImportExport.tsx +++ b/src/components/ImportExport.tsx @@ -12,7 +12,7 @@ export function ImportExport() { const [state, _] = useMegaStore() async function handleSave() { - let json = await state.node_manager?.export_json() + const json = await state.node_manager?.export_json() downloadTextFile(json || "", "mutiny-state.json") } diff --git a/src/components/OnboardWarning.tsx b/src/components/OnboardWarning.tsx index 9a70c8d..a8b45ed 100644 --- a/src/components/OnboardWarning.tsx +++ b/src/components/OnboardWarning.tsx @@ -1,6 +1,7 @@ import { Show, createSignal, onMount } from "solid-js"; import { Button, ButtonLink, SmallHeader, VStack } from "./layout"; import { useMegaStore } from "~/state/megaStore"; +import { showToast } from "./Toaster"; export function OnboardWarning() { const [state, actions] = useMegaStore(); @@ -25,7 +26,7 @@ export function OnboardWarning() { Do you want to restore an existing Mutiny Wallet?

- +
diff --git a/src/components/layout/BackButton.tsx b/src/components/layout/BackButton.tsx index 37c959a..b6caf20 100644 --- a/src/components/layout/BackButton.tsx +++ b/src/components/layout/BackButton.tsx @@ -1,5 +1,5 @@ import { Back } from "~/assets/svg/Back"; export function BackButton(props: { onClick: () => void, title?: string }) { - return () + return () } \ No newline at end of file diff --git a/src/components/layout/index.tsx b/src/components/layout/index.tsx index fb122b2..5d8bb18 100644 --- a/src/components/layout/index.tsx +++ b/src/components/layout/index.tsx @@ -123,7 +123,7 @@ export const NiceP: ParentComponent = (props) => { export const TinyButton: ParentComponent<{ onClick: () => void }> = (props) => { return ( - ) diff --git a/src/routes/Activity.tsx b/src/routes/Activity.tsx index d5818f8..3123b41 100644 --- a/src/routes/Activity.tsx +++ b/src/routes/Activity.tsx @@ -1,8 +1,8 @@ import { For, Show, createResource } from "solid-js"; import NavBar from "~/components/NavBar"; -import { Button, Card, DefaultMain, LargeHeader, NiceP, NodeManagerGuard, SafeArea, SmallHeader, VStack } from "~/components/layout"; +import { Button, Card, DefaultMain, LargeHeader, NiceP, NodeManagerGuard, SafeArea, VStack } from "~/components/layout"; import { BackLink } from "~/components/layout/BackLink"; -import { CombinedActivity, Activity as MutinyActivity } from "~/components/Activity"; +import { CombinedActivity } from "~/components/Activity"; import { A } from "solid-start"; import settings from '~/assets/icons/settings.svg'; import { ContactItem, addContact, editContact, listContacts } from "~/state/contacts"; diff --git a/src/routes/Receive.tsx b/src/routes/Receive.tsx index d45b2fa..0e819d6 100644 --- a/src/routes/Receive.tsx +++ b/src/routes/Receive.tsx @@ -1,7 +1,7 @@ import { MutinyBip21RawMaterials, MutinyInvoice } from "@mutinywallet/mutiny-wasm"; -import { createEffect, createMemo, createResource, createSignal, For, Match, onCleanup, onMount, Show, Switch } from "solid-js"; +import { createEffect, createMemo, createResource, createSignal, Match, onCleanup, onMount, Show, Switch } from "solid-js"; import { QRCodeSVG } from "solid-qr-code"; -import { Button, Card, Indicator, LargeHeader, NodeManagerGuard, SafeArea, SmallHeader } from "~/components/layout"; +import { Button, Card, Indicator, LargeHeader, NodeManagerGuard, SafeArea } from "~/components/layout"; import NavBar from "~/components/NavBar"; import { useMegaStore } from "~/state/megaStore"; import { objectToSearchParams } from "~/utils/objectToSearchParams"; @@ -185,7 +185,7 @@ export default function Receive() {
- +
diff --git a/src/routes/Scanner.tsx b/src/routes/Scanner.tsx index dc6f730..c8efdcd 100644 --- a/src/routes/Scanner.tsx +++ b/src/routes/Scanner.tsx @@ -1,5 +1,5 @@ import Reader from "~/components/Reader"; -import { createEffect, createSignal, onMount, Show } from "solid-js"; +import { createEffect, createSignal, onMount } from "solid-js"; import { useNavigate } from "solid-start"; import { Button } from "~/components/layout"; import init, { PaymentParams } from "@mutinywallet/waila-wasm"; @@ -76,12 +76,8 @@ export default function Scanner() { }); } - let waila; - - onMount(() => { - init().then((w) => { - waila = w; - }); + onMount(async () => { + await init() }) // When we have a nice result we can head over to the send screen diff --git a/src/utils/download.ts b/src/utils/download.ts index 5f4db7f..4fa9f5b 100644 --- a/src/utils/download.ts +++ b/src/utils/download.ts @@ -2,8 +2,8 @@ export function downloadTextFile(content: string, fileName: string) { const contentType = "application/json"; - var a = document.createElement("a"); - var file = new Blob([content], { type: contentType }); + const a = document.createElement("a"); + const file = new Blob([content], { type: contentType }); a.href = URL.createObjectURL(file); a.download = fileName; a.click(); diff --git a/src/utils/gradientHash.ts b/src/utils/gradientHash.ts index 43a6e1b..4d85234 100644 --- a/src/utils/gradientHash.ts +++ b/src/utils/gradientHash.ts @@ -14,9 +14,7 @@ async function generateGradientFromHashedString(str: string) { } export async function gradientsPerContact(contacts: ContactItem[]) { - // - // let gradients: { [key: string]: string } = {}; - let gradients = new Map(); + const gradients = new Map(); for (const contact of contacts) { const gradient = await generateGradientFromHashedString(contact.name); gradients.set(contact.id, gradient);