diff --git a/src/components/Activity.tsx b/src/components/Activity.tsx index 736ac1a..d090d59 100644 --- a/src/components/Activity.tsx +++ b/src/components/Activity.tsx @@ -1,24 +1,25 @@ +import { Contact } from "@mutinywallet/mutiny-wasm"; import { + createEffect, + createResource, + createSignal, For, Match, Show, - Switch, - createEffect, - createResource, - createSignal + Switch } from "solid-js"; -import { useMegaStore } from "~/state/megaStore"; -import { useI18n } from "~/i18n/context"; -import { Contact } from "@mutinywallet/mutiny-wasm"; import { A } from "solid-start"; -import { createDeepSignal } from "~/utils/deepSignal"; + import { - NiceP, - DetailsIdModal, - LoadingShimmer, ActivityItem, - HackActivityType + DetailsIdModal, + HackActivityType, + LoadingShimmer, + NiceP } from "~/components"; +import { useI18n } from "~/i18n/context"; +import { useMegaStore } from "~/state/megaStore"; +import { createDeepSignal } from "~/utils/deepSignal"; export const THREE_COLUMNS = "grid grid-cols-[auto,1fr,auto] gap-4 py-2 px-2 border-b border-neutral-800 last:border-b-0"; @@ -117,7 +118,7 @@ export function CombinedActivity(props: { limit?: number }) { -
+
{i18n.t( "activity.receive_some_sats_to_get_started" @@ -151,7 +152,7 @@ export function CombinedActivity(props: { limit?: number }) { 0}> {i18n.t("activity.view_all")} diff --git a/src/components/ActivityItem.tsx b/src/components/ActivityItem.tsx index 29a1219..c24b259 100644 --- a/src/components/ActivityItem.tsx +++ b/src/components/ActivityItem.tsx @@ -1,16 +1,16 @@ -import { Match, ParentComponent, Switch, createResource } from "solid-js"; +import { Contact } from "@mutinywallet/mutiny-wasm"; +import { createResource, Match, ParentComponent, Switch } from "solid-js"; + import bolt from "~/assets/icons/bolt.svg"; import chain from "~/assets/icons/chain.svg"; +import off from "~/assets/icons/download-channel.svg"; import shuffle from "~/assets/icons/shuffle.svg"; import on from "~/assets/icons/upload-channel.svg"; -import off from "~/assets/icons/download-channel.svg"; -import { timeAgo } from "~/utils/prettyPrintTime"; - -import { generateGradient } from "~/utils/gradientHash"; -import { useMegaStore } from "~/state/megaStore"; -import { Contact } from "@mutinywallet/mutiny-wasm"; -import { useI18n } from "~/i18n/context"; import { AmountFiat, AmountSats } from "~/components"; +import { useI18n } from "~/i18n/context"; +import { useMegaStore } from "~/state/megaStore"; +import { generateGradient } from "~/utils/gradientHash"; +import { timeAgo } from "~/utils/prettyPrintTime"; export const ActivityAmount: ParentComponent<{ amount: string; @@ -69,7 +69,7 @@ function LabelCircle(props: { return (
@@ -110,10 +110,10 @@ export function ActivityItem(props: { return (
props.onClick && props.onClick()} - class="grid grid-cols-[auto_minmax(0,_1fr)_minmax(0,_max-content)] pb-4 gap-4 border-b border-neutral-800 last:border-b-0" + class="grid grid-cols-[auto_minmax(0,_1fr)_minmax(0,_max-content)] gap-4 border-b border-neutral-800 pb-4 last:border-b-0" classList={{ "cursor-pointer": !!props.onClick }} > -
+
@@ -154,12 +154,12 @@ export function ActivityItem(props: { {" "} - + {firstContact()?.name} 0}> - + {props.labels[0]} diff --git a/src/components/Amount.tsx b/src/components/Amount.tsx index bccd95e..171c26b 100644 --- a/src/components/Amount.tsx +++ b/src/components/Amount.tsx @@ -1,9 +1,10 @@ import { Show } from "solid-js"; -import { useMegaStore } from "~/state/megaStore"; -import { satsToUsd } from "~/utils/conversions"; + import bolt from "~/assets/icons/bolt.svg"; import chain from "~/assets/icons/chain.svg"; import { useI18n } from "~/i18n/context"; +import { useMegaStore } from "~/state/megaStore"; +import { satsToUsd } from "~/utils/conversions"; function prettyPrintAmount(n?: number | bigint): string { if (!n || n.valueOf() === 0) { @@ -20,14 +21,14 @@ export function AmountSats(props: { }) { const i18n = useI18n(); return ( -
+
lightning chain -

+

+ @@ -37,7 +38,7 @@ export function AmountSats(props: { {props.loading ? "..." : prettyPrintAmount(props.amountSats)}   { // do nothing @@ -11,7 +12,7 @@ const noop = () => { const KeyValue: ParentComponent<{ key: string; gray?: boolean }> = (props) => { return (
{props.key}
diff --git a/src/components/AmountEditable.tsx b/src/components/AmountEditable.tsx index 6f71383..8aca934 100644 --- a/src/components/AmountEditable.tsx +++ b/src/components/AmountEditable.tsx @@ -1,26 +1,27 @@ +import { Dialog } from "@kobalte/core"; import { - For, - ParentComponent, - Show, createResource, createSignal, - onMount, + For, + Match, onCleanup, - Switch, - Match + onMount, + ParentComponent, + Show, + Switch } from "solid-js"; -import { Button, InlineAmount, InfoBox, FeesModal } from "~/components"; -import { useMegaStore } from "~/state/megaStore"; -import { satsToUsd, usdToSats } from "~/utils/conversions"; -import { Dialog } from "@kobalte/core"; -import close from "~/assets/icons/close.svg"; -import pencil from "~/assets/icons/pencil.svg"; -import currencySwap from "~/assets/icons/currency-swap.svg"; -import { DIALOG_CONTENT, DIALOG_POSITIONER } from "~/styles/dialogs"; -import { Network } from "~/logic/mutinyWalletSetup"; -import { useI18n } from "~/i18n/context"; import { useNavigate } from "solid-start"; +import close from "~/assets/icons/close.svg"; +import currencySwap from "~/assets/icons/currency-swap.svg"; +import pencil from "~/assets/icons/pencil.svg"; +import { Button, FeesModal, InfoBox, InlineAmount } from "~/components"; +import { useI18n } from "~/i18n/context"; +import { Network } from "~/logic/mutinyWalletSetup"; +import { useMegaStore } from "~/state/megaStore"; +import { DIALOG_CONTENT, DIALOG_POSITIONER } from "~/styles/dialogs"; +import { satsToUsd, usdToSats } from "~/utils/conversions"; + function fiatInputSanitizer(input: string): string { // Make sure only numbers and a single decimal point are allowed const numeric = input.replace(/[^0-9.]/g, "").replace(/(\..*)\./g, "$1"); @@ -90,7 +91,7 @@ function SingleDigitButton(props: { fallback={
} > @@ -472,7 +473,7 @@ export const AmountEditable: ParentComponent<{ {/*
*/} (satsInputRef = el)} @@ -492,10 +493,10 @@ export const AmountEditable: ParentComponent<{ />
-
+
-
+
{amount.label} @@ -558,13 +559,13 @@ export const AmountEditable: ParentComponent<{ ); focus(); }} - class="py-2 px-4 rounded-lg bg-white/10" + class="rounded-lg bg-white/10 px-4 py-2" > {i18n.t("receive.amount_editable.max")}
-
+
{(character) => ( -
+
@@ -57,13 +58,13 @@ export function App() { state.mutiny_wallet?.get_network() !== "bitcoin" } > -
+
{state.mutiny_wallet?.get_network()}
Settings @@ -92,7 +93,7 @@ export function App() { -
+
diff --git a/src/components/BalanceBox.tsx b/src/components/BalanceBox.tsx index e1850ce..86511da 100644 --- a/src/components/BalanceBox.tsx +++ b/src/components/BalanceBox.tsx @@ -1,25 +1,26 @@ import { Match, Show, Switch } from "solid-js"; +import { A, useNavigate } from "solid-start"; + +import shuffle from "~/assets/icons/shuffle.svg"; import { + AmountFiat, + AmountSats, Button, FancyCard, Indicator, - AmountSats, - AmountFiat, InfoBox } from "~/components"; -import { useMegaStore } from "~/state/megaStore"; -import { A, useNavigate } from "solid-start"; -import shuffle from "~/assets/icons/shuffle.svg"; import { useI18n } from "~/i18n/context"; +import { useMegaStore } from "~/state/megaStore"; export function LoadingShimmer() { return ( -
+

-
+

-
+

); @@ -99,7 +100,7 @@ export function BalanceBox(props: { loading?: boolean }) { />
-
+
{i18n.t("common.pending")} diff --git a/src/components/BetaWarningModal.tsx b/src/components/BetaWarningModal.tsx index 9a42cd6..32e7a84 100644 --- a/src/components/BetaWarningModal.tsx +++ b/src/components/BetaWarningModal.tsx @@ -1,15 +1,16 @@ import { Dialog } from "@kobalte/core"; -import { ParentComponent, createSignal } from "solid-js"; +import { ExternalLink } from "@mutinywallet/ui"; +import { createSignal, ParentComponent } from "solid-js"; + import { DIALOG_CONTENT, DIALOG_POSITIONER, - OVERLAY, ModalCloseButton, + OVERLAY, SmallHeader } from "~/components"; import { useI18n } from "~/i18n/context"; import { useMegaStore } from "~/state/megaStore"; -import { ExternalLink } from "@mutinywallet/ui"; export function BetaWarningModal() { const i18n = useI18n(); @@ -57,7 +58,7 @@ export const WarningModal: ParentComponent<{
- + {props.title} diff --git a/src/components/ContactEditor.tsx b/src/components/ContactEditor.tsx index 7f2c649..0ab2936 100644 --- a/src/components/ContactEditor.tsx +++ b/src/components/ContactEditor.tsx @@ -1,15 +1,16 @@ -import { Match, Switch, createSignal } from "solid-js"; import { Dialog } from "@kobalte/core"; -import close from "~/assets/icons/close.svg"; import { SubmitHandler } from "@modular-forms/solid"; +import { createSignal, Match, Switch } from "solid-js"; + +import close from "~/assets/icons/close.svg"; import { - ContactFormValues, ContactForm, + ContactFormValues, SmallHeader, TinyButton } from "~/components"; -import { DIALOG_CONTENT, DIALOG_POSITIONER } from "~/styles/dialogs"; import { useI18n } from "~/i18n/context"; +import { DIALOG_CONTENT, DIALOG_POSITIONER } from "~/styles/dialogs"; export function ContactEditor(props: { createContact: (contact: ContactFormValues) => void; @@ -34,7 +35,7 @@ export function ContactEditor(props: { onClick={() => setIsOpen(true)} class="flex flex-col items-center gap-2" > -
+
+
@@ -54,11 +55,11 @@ export function ContactEditor(props: { class={DIALOG_CONTENT} onEscapeKeyDown={() => setIsOpen(false)} > -
+
diff --git a/src/components/ContactForm.tsx b/src/components/ContactForm.tsx index e9364e2..4f0b34b 100644 --- a/src/components/ContactForm.tsx +++ b/src/components/ContactForm.tsx @@ -1,10 +1,11 @@ -import { SubmitHandler, createForm, required } from "@modular-forms/solid"; +import { createForm, required, SubmitHandler } from "@modular-forms/solid"; + import { Button, + ContactFormValues, LargeHeader, - VStack, TextField, - ContactFormValues + VStack } from "~/components"; import { useI18n } from "~/i18n/context"; @@ -22,7 +23,7 @@ export function ContactForm(props: { return (
{props.title} diff --git a/src/components/ContactViewer.tsx b/src/components/ContactViewer.tsx index e9caa1e..fc26d50 100644 --- a/src/components/ContactViewer.tsx +++ b/src/components/ContactViewer.tsx @@ -1,18 +1,19 @@ -import { Match, Switch, createSignal } from "solid-js"; +import { Dialog } from "@kobalte/core"; +import { SubmitHandler } from "@modular-forms/solid"; +import { Contact } from "@mutinywallet/mutiny-wasm"; +import { createSignal, Match, Switch } from "solid-js"; + +import close from "~/assets/icons/close.svg"; import { Button, Card, - NiceP, - SmallHeader, ContactForm, - showToast + NiceP, + showToast, + SmallHeader } from "~/components"; -import { Dialog } from "@kobalte/core"; -import close from "~/assets/icons/close.svg"; -import { SubmitHandler } from "@modular-forms/solid"; -import { Contact } from "@mutinywallet/mutiny-wasm"; -import { DIALOG_CONTENT, DIALOG_POSITIONER } from "~/styles/dialogs"; import { useI18n } from "~/i18n/context"; +import { DIALOG_CONTENT, DIALOG_POSITIONER } from "~/styles/dialogs"; export type ContactFormValues = { name: string; @@ -42,15 +43,15 @@ export function ContactViewer(props: { @@ -63,14 +64,14 @@ export function ContactViewer(props: { setIsEditing(false); }} > -
+
@@ -85,17 +86,17 @@ export function ContactViewer(props: { /> -
-
+
+
{props.contact.name[0]}
-

+

{props.contact.name}

copy(props.value)} > -
+

{i18n.t("common.copied")}

); diff --git a/src/components/DecryptDialog.tsx b/src/components/DecryptDialog.tsx index 4764c3c..a7be673 100644 --- a/src/components/DecryptDialog.tsx +++ b/src/components/DecryptDialog.tsx @@ -1,9 +1,10 @@ -import { Show, createSignal } from "solid-js"; -import { Button, SimpleDialog, TextField, InfoBox } from "~/components"; +import { createSignal, Show } from "solid-js"; +import { A } from "solid-start"; + +import { Button, InfoBox, SimpleDialog, TextField } from "~/components"; +import { useI18n } from "~/i18n/context"; import { useMegaStore } from "~/state/megaStore"; import eify from "~/utils/eify"; -import { A } from "solid-start"; -import { useI18n } from "~/i18n/context"; export function DecryptDialog() { const i18n = useI18n(); diff --git a/src/components/DeleteEverything.tsx b/src/components/DeleteEverything.tsx index b550e2a..00343cf 100644 --- a/src/components/DeleteEverything.tsx +++ b/src/components/DeleteEverything.tsx @@ -1,6 +1,7 @@ import initMutinyWallet, { MutinyWallet } from "@mutinywallet/mutiny-wasm"; import { createSignal } from "solid-js"; -import { ConfirmDialog, Button, showToast } from "~/components"; + +import { Button, ConfirmDialog, showToast } from "~/components"; import { useI18n } from "~/i18n/context"; import { useMegaStore } from "~/state/megaStore"; import eify from "~/utils/eify"; diff --git a/src/components/DetailsModal.tsx b/src/components/DetailsModal.tsx index b49d7b3..aad2bdc 100644 --- a/src/components/DetailsModal.tsx +++ b/src/components/DetailsModal.tsx @@ -1,42 +1,41 @@ import { Dialog } from "@kobalte/core"; +import { MutinyChannel, MutinyInvoice } from "@mutinywallet/mutiny-wasm"; +import { ExternalLink } from "@mutinywallet/ui"; import { + createEffect, + createMemo, + createResource, For, Match, ParentComponent, Show, Suspense, - Switch, - createEffect, - createMemo, - createResource + Switch } from "solid-js"; -import { - InfoBox, - Hr, - ModalCloseButton, - TinyButton, - VStack, - ActivityAmount, - HackActivityType, - CopyButton, - TruncateMiddle, - AmountSmall -} from "~/components"; -import { MutinyChannel, MutinyInvoice } from "@mutinywallet/mutiny-wasm"; import bolt from "~/assets/icons/bolt-black.svg"; import chain from "~/assets/icons/chain-black.svg"; import copyIcon from "~/assets/icons/copy.svg"; import shuffle from "~/assets/icons/shuffle-black.svg"; - -import { prettyPrintTime } from "~/utils/prettyPrintTime"; +import { + ActivityAmount, + AmountSmall, + CopyButton, + HackActivityType, + Hr, + InfoBox, + ModalCloseButton, + TinyButton, + TruncateMiddle, + VStack +} from "~/components"; +import { useI18n } from "~/i18n/context"; +import { Network } from "~/logic/mutinyWalletSetup"; import { useMegaStore } from "~/state/megaStore"; +import mempoolTxUrl from "~/utils/mempoolTxUrl"; +import { prettyPrintTime } from "~/utils/prettyPrintTime"; import { MutinyTagItem, tagToMutinyTag } from "~/utils/tags"; import { useCopy } from "~/utils/useCopy"; -import mempoolTxUrl from "~/utils/mempoolTxUrl"; -import { Network } from "~/logic/mutinyWalletSetup"; -import { ExternalLink } from "@mutinywallet/ui"; -import { useI18n } from "~/i18n/context"; interface ChannelClosure { channel_id: string; @@ -74,10 +73,10 @@ function LightningHeader(props: { return (
-
- lightning bolt +
+ lightning bolt
-

+

{props.info.inbound ? i18n.t("modals.transaction_details.lightning_receive") : i18n.t("modals.transaction_details.lightning_send")} @@ -126,7 +125,7 @@ function OnchainHeader(props: { return (
-
+
- swap + swap - blockchain + blockchain
-

+

{props.kind === "ChannelOpen" ? i18n.t("modals.transaction_details.channel_open") : props.kind === "ChannelClose" @@ -176,8 +175,8 @@ function OnchainHeader(props: { export const KeyValue: ParentComponent<{ key: string }> = (props) => { return ( -
  • - +
  • + {props.key} {props.children} @@ -189,7 +188,7 @@ export function MiniStringShower(props: { text: string }) { const [copy, copied] = useCopy({ copiedTimeout: 1000 }); return ( -
    +
    {/* 
    {props.text}
    */}
    ); @@ -224,7 +223,7 @@ function LightningDetails(props: { info: MutinyInvoice }) { - + {props.info.description} @@ -268,8 +267,8 @@ function OnchainDetails(props: { info: OnChainTx; kind?: HackActivityType }) { await (state.mutiny_wallet?.list_channels() as Promise< MutinyChannel[] >); - const channel = channels.find((channel) => - channel.outpoint?.startsWith(props.info.txid) + const channel = channels.find( + (channel) => channel.outpoint?.startsWith(props.info.txid) ); return channel; } catch (e) { @@ -375,7 +374,7 @@ function ChannelCloseDetails(props: { info: ChannelClosure }) { -

    +

    {props.info.reason ?? ""}

    @@ -458,7 +457,7 @@ export function DetailsIdModal(props: {
    -
    +
    diff --git a/src/components/Dialog.tsx b/src/components/Dialog.tsx index 04e43f3..e2c78b2 100644 --- a/src/components/Dialog.tsx +++ b/src/components/Dialog.tsx @@ -1,5 +1,6 @@ import { Dialog } from "@kobalte/core"; import { ParentComponent } from "solid-js"; + import { Button, SmallHeader } from "~/components"; import { useI18n } from "~/i18n/context"; @@ -22,7 +23,7 @@ export const ConfirmDialog: ParentComponent<{
    -
    +
    {i18n.t( @@ -33,7 +34,7 @@ export const ConfirmDialog: ParentComponent<{
    {props.children} -
    +
    diff --git a/src/components/ErrorDisplay.tsx b/src/components/ErrorDisplay.tsx index 9cf6e7f..0746410 100644 --- a/src/components/ErrorDisplay.tsx +++ b/src/components/ErrorDisplay.tsx @@ -1,4 +1,6 @@ +import { ExternalLink } from "@mutinywallet/ui"; import { A, Title } from "solid-start"; + import { Button, DefaultMain, @@ -7,7 +9,6 @@ import { SafeArea, SmallHeader } from "~/components/layout"; -import { ExternalLink } from "@mutinywallet/ui"; import { useI18n } from "~/i18n/context"; export function ErrorDisplay(props: { error: Error }) { @@ -20,7 +21,7 @@ export function ErrorDisplay(props: { error: Error }) { {i18n.t("error.general.never_should_happen")} -

    +

    {props.error.name}:{" "} {props.error.message}

    diff --git a/src/components/Fee.tsx b/src/components/Fee.tsx index 98ee62a..0716db0 100644 --- a/src/components/Fee.tsx +++ b/src/components/Fee.tsx @@ -1,12 +1,12 @@ -import { useI18n } from "~/i18n/context"; import { AmountFiat, AmountSats, FeesModal } from "~/components"; +import { useI18n } from "~/i18n/context"; export function Fee(props: { amountSats?: bigint | number }) { const i18n = useI18n(); return (
    -

    {i18n.t("common.fee")}

    +

    {i18n.t("common.fee")}

    diff --git a/src/components/I18nProvider.tsx b/src/components/I18nProvider.tsx index 3dcb752..d30e190 100644 --- a/src/components/I18nProvider.tsx +++ b/src/components/I18nProvider.tsx @@ -1,7 +1,8 @@ -import { ParentComponent, Show, createResource } from "solid-js"; -import { I18nContext } from "~/i18n/context"; import i18next from "i18next"; +import { createResource, ParentComponent, Show } from "solid-js"; + import i18nConfig from "~/i18n/config"; +import { I18nContext } from "~/i18n/context"; export const I18nProvider: ParentComponent = (props) => { const [i18nConfigured] = createResource(async () => { diff --git a/src/components/ImportExport.tsx b/src/components/ImportExport.tsx index a7e11d7..fb3ac6c 100644 --- a/src/components/ImportExport.tsx +++ b/src/components/ImportExport.tsx @@ -1,21 +1,22 @@ -import { useMegaStore } from "~/state/megaStore"; +import initMutinyWallet, { MutinyWallet } from "@mutinywallet/mutiny-wasm"; +import { createFileUploader } from "@solid-primitives/upload"; +import { createSignal, Show } from "solid-js"; + import { Button, + ConfirmDialog, + InfoBox, InnerCard, NiceP, - SimpleDialog, - VStack, - ConfirmDialog, showToast, - InfoBox, - TextField + SimpleDialog, + TextField, + VStack } from "~/components"; -import { Show, createSignal } from "solid-js"; -import eify from "~/utils/eify"; -import { downloadTextFile } from "~/utils/download"; -import { createFileUploader } from "@solid-primitives/upload"; -import initMutinyWallet, { MutinyWallet } from "@mutinywallet/mutiny-wasm"; import { useI18n } from "~/i18n/context"; +import { useMegaStore } from "~/state/megaStore"; +import { downloadTextFile } from "~/utils/download"; +import eify from "~/utils/eify"; export function ImportExport(props: { emergency?: boolean }) { const i18n = useI18n(); diff --git a/src/components/InfoBox.tsx b/src/components/InfoBox.tsx index 7026cad..c4bd46d 100644 --- a/src/components/InfoBox.tsx +++ b/src/components/InfoBox.tsx @@ -1,4 +1,5 @@ import { ParentComponent } from "solid-js"; + import info from "~/assets/icons/info.svg"; export const InfoBox: ParentComponent<{ @@ -6,7 +7,7 @@ export const InfoBox: ParentComponent<{ }> = (props) => { return (
    - info + info

    {props.children}

    diff --git a/src/components/IntegratedQR.tsx b/src/components/IntegratedQR.tsx index 95cdac6..5fbcb33 100644 --- a/src/components/IntegratedQR.tsx +++ b/src/components/IntegratedQR.tsx @@ -1,18 +1,19 @@ import { Match, Show, Switch } from "solid-js"; import { QRCodeSVG } from "solid-qr-code"; -import { ReceiveFlavor } from "~/routes/Receive"; -import { useCopy } from "~/utils/useCopy"; -import { AmountSats, AmountFiat, TruncateMiddle } from "~/components"; + +import boltBlack from "~/assets/icons/bolt-black.svg"; +import chainBlack from "~/assets/icons/chain-black.svg"; import copyBlack from "~/assets/icons/copy-black.svg"; import shareBlack from "~/assets/icons/share-black.svg"; -import chainBlack from "~/assets/icons/chain-black.svg"; -import boltBlack from "~/assets/icons/bolt-black.svg"; +import { AmountFiat, AmountSats, TruncateMiddle } from "~/components"; import { useI18n } from "~/i18n/context"; +import { ReceiveFlavor } from "~/routes/Receive"; +import { useCopy } from "~/utils/useCopy"; function KindIndicator(props: { kind: ReceiveFlavor }) { const i18n = useI18n(); return ( -
    +

    @@ -68,16 +69,16 @@ export function IntegratedQr(props: { return (
    copy(props.value)} > -
    +

    {i18n.t("common.copied")}

    -
    +
    @@ -98,10 +99,10 @@ export function IntegratedQr(props: {
    -
    +
    {props.title} @@ -37,8 +38,8 @@ export function JsonModal(props: {
    - -
    + + 
                                         {json()}
    diff --git a/src/components/KitchenSink.tsx b/src/components/KitchenSink.tsx index bcd3f92..e08e52b 100644 --- a/src/components/KitchenSink.tsx +++ b/src/components/KitchenSink.tsx @@ -1,32 +1,33 @@ -import { useMegaStore } from "~/state/megaStore"; +import { Collapsible, TextField } from "@kobalte/core"; +import { MutinyChannel, MutinyPeer } from "@mutinywallet/mutiny-wasm"; +import { ExternalLink } from "@mutinywallet/ui"; import { + createResource, + createSignal, For, Match, Show, Suspense, - Switch, - createResource, - createSignal + Switch } from "solid-js"; -import { MutinyChannel, MutinyPeer } from "@mutinywallet/mutiny-wasm"; -import { Collapsible, TextField } from "@kobalte/core"; -import mempoolTxUrl from "~/utils/mempoolTxUrl"; -import eify from "~/utils/eify"; + import { + Button, ConfirmDialog, Hr, - Button, InnerCard, - VStack, - showToast, + MiniStringShower, + ResetRouter, Restart, ResyncOnchain, - ResetRouter, - MiniStringShower + showToast, + VStack } from "~/components"; -import { Network } from "~/logic/mutinyWalletSetup"; -import { ExternalLink } from "@mutinywallet/ui"; import { useI18n } from "~/i18n/context"; +import { Network } from "~/logic/mutinyWalletSetup"; +import { useMegaStore } from "~/state/megaStore"; +import eify from "~/utils/eify"; +import mempoolTxUrl from "~/utils/mempoolTxUrl"; // TODO: hopefully I don't have to maintain this type forever but I don't know how to pass it around otherwise type RefetchPeersType = ( @@ -57,7 +58,7 @@ function PeerItem(props: { peer: MutinyPeer }) { return ( -

    +

    {">"}{" "} {props.peer.alias ? props.peer.alias : props.peer.pubkey}

    @@ -157,7 +158,7 @@ function ConnectPeer(props: { refetchPeers: RefetchPeersType }) { {i18n.t("settings.admin.kitchen_sink.connect_peer")} @@ -207,7 +208,7 @@ function ChannelItem(props: { channel: MutinyChannel; network?: Network }) { return ( -

    +

    {">"} {props.channel.peer}

    @@ -386,7 +387,7 @@ function OpenChannel(props: { refetchChannels: RefetchChannelsListType }) { {i18n.t("settings.admin.kitchen_sink.pubkey")} - + @@ -52,7 +53,7 @@ export const MoreInfoModal: ParentComponent<{
    - + {props.title} diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx index 3828dc1..6a9e529 100644 --- a/src/components/NavBar.tsx +++ b/src/components/NavBar.tsx @@ -1,12 +1,12 @@ -import mutiny_m from "~/assets/icons/m.svg"; -import airplane from "~/assets/icons/airplane.svg"; -import settings from "~/assets/icons/settings.svg"; -import receive from "~/assets/icons/big-receive.svg"; -import redshift from "~/assets/icons/rs.svg"; -import userClock from "~/assets/icons/user-clock.svg"; - import { A } from "solid-start"; +import airplane from "~/assets/icons/airplane.svg"; +import receive from "~/assets/icons/big-receive.svg"; +import mutiny_m from "~/assets/icons/m.svg"; +import redshift from "~/assets/icons/rs.svg"; +import settings from "~/assets/icons/settings.svg"; +import userClock from "~/assets/icons/user-clock.svg"; + type ActiveTab = | "home" | "scan" @@ -41,8 +41,8 @@ function NavBarItem(props: { export function NavBar(props: { activeTab: ActiveTab }) { return ( -