From 2e61e8abbc318c36969cb5add0c63df81135b4ab Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 11 Feb 2026 23:02:30 -0800 Subject: formatting --- src/components/About.svelte | 26 +++---- src/components/Account.svelte | 4 +- src/components/AmountField.svelte | 4 +- src/components/AppForm.svelte | 4 +- src/components/Check.svelte | 7 +- src/components/FaqCard.svelte | 4 +- src/components/Footer.svelte | 10 +-- src/components/InvoiceActions.svelte | 14 +--- src/components/InvoiceData.svelte | 16 ++-- src/components/InvoiceTypes.svelte | 8 +- src/components/LandingHeader.svelte | 41 +++++----- src/components/LandingInfoCard.svelte | 6 +- src/components/Lnurlp.svelte | 4 +- src/components/Lnurlw.svelte | 15 ++-- src/components/LocationsMap.svelte | 4 +- src/components/Menu.svelte | 6 +- src/components/Nostr.svelte | 12 ++- src/components/Password.svelte | 6 +- src/components/Payments.svelte | 20 ++--- src/components/Pinpad.svelte | 4 +- src/components/Quote.svelte | 7 +- src/components/WalletPass.svelte | 6 +- .../(app)/[username]/(profile)/+layout.svelte | 35 ++++----- src/routes/(app)/[username]/(profile)/+page.svelte | 35 ++++----- .../[username]/(profile)/notes/new/+page.svelte | 2 +- .../(app)/[username]/accepted/[text]/+page.svelte | 8 +- src/routes/(app)/account/[id]/+page.svelte | 16 ++-- src/routes/(app)/account/ark/+page.svelte | 9 +-- src/routes/(app)/account/bitcoin/+page.svelte | 4 +- src/routes/(app)/account/import/+page.svelte | 4 +- src/routes/(app)/account/pass/+page.svelte | 10 +-- src/routes/(app)/account/seed/+page.svelte | 16 +--- src/routes/(app)/admin/+page.svelte | 8 +- src/routes/(app)/apps/[pubkey]/+page.svelte | 4 +- .../(app)/apps/[pubkey]/payments/+page.svelte | 4 +- src/routes/(app)/apps/new/+page.svelte | 4 +- src/routes/(app)/dm/+page.svelte | 90 +++++++++++----------- src/routes/(app)/fund/[id]/access/+page.svelte | 4 +- .../fund/[id]/authorize/[...amount]/+page.svelte | 4 +- .../(app)/fund/[id]/sweep/[...amount]/+page.svelte | 4 +- src/routes/(app)/fund/[id]/withdraw/+page.svelte | 11 ++- src/routes/(app)/invoice/[id]/paid/+page.svelte | 4 +- src/routes/(app)/invoice/[id]/tip/+page.svelte | 18 +++-- src/routes/(app)/invoice/sent/+page.svelte | 5 +- src/routes/(app)/invoices/+page.svelte | 4 +- src/routes/(app)/ln/withdrawal/sent/+page.svelte | 4 +- src/routes/(app)/messages/+page.svelte | 4 +- src/routes/(app)/messages/[recipient]/+page.svelte | 3 +- .../(app)/pay/[username]/[...amount]/+page.svelte | 16 ++-- src/routes/(app)/payment/[id]/+page.svelte | 28 +++---- src/routes/(app)/payment/[id]/plain/+page.svelte | 9 +-- src/routes/(app)/payments/[...page]/+page.svelte | 20 +++-- src/routes/(app)/pos/+page.svelte | 24 +++--- src/routes/(app)/printer/+page.svelte | 6 +- src/routes/(app)/receive/[...token]/+page.svelte | 4 +- src/routes/(app)/reset/[code]/+page.svelte | 7 +- src/routes/(app)/send/[...text]/+page.svelte | 12 ++- src/routes/(app)/send/ark/[address]/+page.svelte | 8 +- .../(app)/send/bitcoin/[address]/+page.svelte | 8 +- .../[address]/[amount]/[...feeRate]/+page.svelte | 6 +- .../send/fund/[...name]/[...amount]/+page.svelte | 11 ++- src/routes/(app)/send/invoice/[id]/+page.svelte | 32 +++----- .../send/lightning/[payreq]/[...memo]/+page.svelte | 18 ++--- .../(app)/send/zap/[id]/[...amount]/+page.svelte | 4 +- src/routes/(app)/sent/[id]/+page.svelte | 4 +- src/routes/(app)/settings/account/+page.svelte | 40 +++------- src/routes/(app)/settings/nostr/+page.svelte | 47 ++++------- src/routes/(app)/settings/profile/+page.svelte | 12 +-- src/routes/(app)/settings/security/+page.svelte | 21 +++-- src/routes/(app)/sign/+page.svelte | 4 +- src/routes/(app)/verify/[code]/+page.svelte | 4 +- src/routes/(static)/bounties/+page.svelte | 25 +++--- src/routes/(static)/docs/+page.svelte | 36 ++++----- src/routes/(static)/login/+page.svelte | 10 +-- src/routes/(static)/privacy/+page.svelte | 8 +- src/routes/(static)/register/+page.svelte | 9 +-- src/routes/(static)/removal/+page.svelte | 6 +- src/routes/(static)/support/+page.svelte | 10 +-- src/routes/+layout.svelte | 5 +- src/routes/+page.svelte | 14 ++-- 80 files changed, 424 insertions(+), 586 deletions(-) (limited to 'src') diff --git a/src/components/About.svelte b/src/components/About.svelte index dbcf7854..874ec8db 100644 --- a/src/components/About.svelte +++ b/src/components/About.svelte @@ -25,9 +25,7 @@
-

- {$t("about.team.header")} -

+

{$t("about.team.header")}

{#each team as member}
@@ -36,19 +34,19 @@
- {$t(`about.team.${member.name}.name`)} - {$t(`about.team.${member.name}.position`)} + + {$t(`about.team.${member.name}.name`)} + + + {$t(`about.team.${member.name}.position`)} +
{#each member.socials as { alt, src, url }} - + + + {/each}
@@ -63,9 +61,7 @@
-

- {$t("about.locations.header")} -

+

{$t("about.locations.header")}

{@html $t("about.locations.description")}

diff --git a/src/components/Account.svelte b/src/components/Account.svelte index 88b944b3..55766512 100644 --- a/src/components/Account.svelte +++ b/src/components/Account.svelte @@ -155,9 +155,7 @@ diff --git a/src/components/AmountField.svelte b/src/components/AmountField.svelte index b5c4261e..56b98d49 100644 --- a/src/components/AmountField.svelte +++ b/src/components/AmountField.svelte @@ -51,9 +51,7 @@ {#if setting}
-

- {label} -

+

{label}

diff --git a/src/components/AppForm.svelte b/src/components/AppForm.svelte index 2fedca47..cca4844b 100644 --- a/src/components/AppForm.svelte +++ b/src/components/AppForm.svelte @@ -142,8 +142,8 @@ {#if pubkey} + {$t("accounts.delete")} + {/if}
diff --git a/src/components/Check.svelte b/src/components/Check.svelte index 222c4dea..e20bde34 100644 --- a/src/components/Check.svelte +++ b/src/components/Check.svelte @@ -3,9 +3,10 @@ fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" - > + + /> + diff --git a/src/components/FaqCard.svelte b/src/components/FaqCard.svelte index c1739495..d92926e3 100644 --- a/src/components/FaqCard.svelte +++ b/src/components/FaqCard.svelte @@ -14,7 +14,5 @@

{$t("faq." + questionID + ".question")}

-

- {$t("faq." + questionID + ".answer")} -

+

{$t("faq." + questionID + ".answer")}

diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index 5bf7b461..8e80151c 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -28,9 +28,7 @@
@@ -45,9 +43,9 @@ diff --git a/src/components/InvoiceActions.svelte b/src/components/InvoiceActions.svelte index c6ae7249..5b2cc90b 100644 --- a/src/components/InvoiceActions.svelte +++ b/src/components/InvoiceActions.svelte @@ -62,18 +62,14 @@
+
{showQr ? t("payments.showText") : t("payments.showQr")}
+
{/if} diff --git a/src/components/InvoiceData.svelte b/src/components/InvoiceData.svelte index 142755f0..64f0f4d9 100644 --- a/src/components/InvoiceData.svelte +++ b/src/components/InvoiceData.svelte @@ -43,8 +43,8 @@
{t("payments.onlyLbtc")} - L-BTC — - {t("payments.dontDeposit")} + L-BTC + — {t("payments.dontDeposit")}
@@ -67,17 +67,11 @@ {@const itemTotal = i.price * i.quantity}
{i.quantity}
-
- {i.name} -
+
{i.name}
{#if $fiat} -
- {f(itemTotal, currency)} -
+
{f(itemTotal, currency)}
{:else} -
- {sat(btc(itemTotal, rate))} -
+
{sat(btc(itemTotal, rate))}
{/if}
{/each} diff --git a/src/components/InvoiceTypes.svelte b/src/components/InvoiceTypes.svelte index cfde1285..b3c430a2 100644 --- a/src/components/InvoiceTypes.svelte +++ b/src/components/InvoiceTypes.svelte @@ -60,7 +60,7 @@ class:bg-base-300={type === types.lightning && $page.url.pathname.includes("/receive")} class:text-secondary={type === types.lightning && $page.url.pathname.includes("/receive")} class:hidden={activeOnly && - (type !== types.lightning || !$page.url.pathname.includes("/receive"))} + (type !== types.lightning || !$page.url.pathname.includes("/receive"))} onclick={() => { if (activeOnly) toggleType(); else { @@ -99,7 +99,7 @@ class:bg-base-300={type === types.lightning && !$page.url.pathname.includes("/receive")} class:text-secondary={type === types.lightning && !$page.url.pathname.includes("/receive")} class:hidden={activeOnly && - (type !== types.lightning || $page.url.pathname.includes("/receive"))} + (type !== types.lightning || $page.url.pathname.includes("/receive"))} onclick={() => { if (activeOnly) toggleType(); else { @@ -147,8 +147,6 @@
{/if} diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte index 9d8b92cf..1bce2ce2 100644 --- a/src/components/LandingHeader.svelte +++ b/src/components/LandingHeader.svelte @@ -33,22 +33,22 @@
diff --git a/src/components/Nostr.svelte b/src/components/Nostr.svelte index 529dd6e7..f80e36de 100644 --- a/src/components/Nostr.svelte +++ b/src/components/Nostr.svelte @@ -130,18 +130,16 @@ class="z-10 border-4 border-white" alt="QR" /> -
- {connectUrl} -
+
{connectUrl}
- {$t("payments.openLink")} + {$t("payments.openLink")} + + {$t("payments.copy")} +
{:else} {#if $signer?.method === "nsec"} diff --git a/src/components/Password.svelte b/src/components/Password.svelte index 3a7d71fe..ab1b7d9d 100644 --- a/src/components/Password.svelte +++ b/src/components/Password.svelte @@ -31,9 +31,9 @@
- +
diff --git a/src/components/Payments.svelte b/src/components/Payments.svelte index ddbee1e0..7bfc8588 100644 --- a/src/components/Payments.svelte +++ b/src/components/Payments.svelte @@ -26,9 +26,7 @@
{#if $fiat} -
- {f(Math.abs(amount) * (p.rate / sats), p.currency, locale)} -
+
{f(Math.abs(amount) * (p.rate / sats), p.currency, locale)}
{:else} @@ -51,9 +49,7 @@
-
- {p.user.username} -
+
{p.user.username}
{:else} @@ -70,9 +66,7 @@
-
- {p.with.username} -
+
{p.with.username}
{:else}
@@ -100,10 +94,10 @@ {amount > 0 ? $t("payments.redeemed") : $t("payments.minted")} {:else} {amount > 0 - ? p.confirmed - ? $t("payments.received") - : $t("payments.pending") - : $t("payments.sent")} + ? p.confirmed + ? $t("payments.received") + : $t("payments.pending") + : $t("payments.sent")} {/if}
diff --git a/src/components/Pinpad.svelte b/src/components/Pinpad.svelte index 3e9c490b..6d528a98 100644 --- a/src/components/Pinpad.svelte +++ b/src/components/Pinpad.svelte @@ -68,8 +68,8 @@ aria-label={hide ? "Show PIN" : "Hide PIN"} > + > +
diff --git a/src/components/Quote.svelte b/src/components/Quote.svelte index 8901dae1..1d3ab9dd 100644 --- a/src/components/Quote.svelte +++ b/src/components/Quote.svelte @@ -4,8 +4,9 @@ viewBox="0 0 24 27" fill="none" xmlns="http://www.w3.org/2000/svg" - > + + /> + diff --git a/src/components/WalletPass.svelte b/src/components/WalletPass.svelte index cc9e2bbd..0d1b014a 100644 --- a/src/components/WalletPass.svelte +++ b/src/components/WalletPass.svelte @@ -25,9 +25,7 @@
-

- {$t("payments.enterWalletPass")} -

+

{$t("payments.enterWalletPass")}

{#if revealPassword} @@ -64,7 +62,7 @@
- + - +
diff --git a/src/routes/(app)/[username]/accepted/[text]/+page.svelte b/src/routes/(app)/[username]/accepted/[text]/+page.svelte index 3e16177c..6b2c3a86 100644 --- a/src/routes/(app)/[username]/accepted/[text]/+page.svelte +++ b/src/routes/(app)/[username]/accepted/[text]/+page.svelte @@ -38,13 +38,11 @@ /> {/if} -
- coinos.io/{username.toLowerCase()} -
+
coinos.io/{username.toLowerCase()}
+ LNURL +
diff --git a/src/routes/(app)/account/[id]/+page.svelte b/src/routes/(app)/account/[id]/+page.svelte index 43ebe508..7f306fea 100644 --- a/src/routes/(app)/account/[id]/+page.svelte +++ b/src/routes/(app)/account/[id]/+page.svelte @@ -71,9 +71,7 @@
-

- {$t("payments.accountSettings")} -

+

{$t("payments.accountSettings")}

@@ -92,20 +90,20 @@ +
{$t("accounts.copy")}
+ {:else if seed} +
{$t("accounts.revealMnemonic")}
+ {/if} {#if seed} +
{$t("accounts.deleteAccount")}
+ {/if}
diff --git a/src/routes/(app)/account/ark/+page.svelte b/src/routes/(app)/account/ark/+page.svelte index c21da0d5..79df4752 100644 --- a/src/routes/(app)/account/ark/+page.svelte +++ b/src/routes/(app)/account/ark/+page.svelte @@ -165,8 +165,7 @@ {#if hasMasterSeed}

- Your Ark wallet will be derived from your master seed. Enter your wallet password to - continue. + Your Ark wallet will be derived from your master seed. Enter your wallet password to continue.

- +
-

- {$t("accounts.accountSetup")} -

+

{$t("accounts.accountSetup")}

diff --git a/src/routes/(app)/account/import/+page.svelte b/src/routes/(app)/account/import/+page.svelte index 09e1edb1..93616a92 100644 --- a/src/routes/(app)/account/import/+page.svelte +++ b/src/routes/(app)/account/import/+page.svelte @@ -49,9 +49,7 @@ >
- + reset(username)} > + Reset +
{/each} diff --git a/src/routes/(app)/apps/[pubkey]/+page.svelte b/src/routes/(app)/apps/[pubkey]/+page.svelte index b15fa717..d60ac227 100644 --- a/src/routes/(app)/apps/[pubkey]/+page.svelte +++ b/src/routes/(app)/apps/[pubkey]/+page.svelte @@ -10,9 +10,7 @@

{$t("accounts.connection")}

{#if form?.error} -
- {form.error} -
+
{form.error}
{/if} diff --git a/src/routes/(app)/apps/[pubkey]/payments/+page.svelte b/src/routes/(app)/apps/[pubkey]/payments/+page.svelte index fe74dc5a..6ea6ae6c 100644 --- a/src/routes/(app)/apps/[pubkey]/payments/+page.svelte +++ b/src/routes/(app)/apps/[pubkey]/payments/+page.svelte @@ -10,9 +10,7 @@
-

- {$t("payments.header")} -

+

{$t("payments.header")}

diff --git a/src/routes/(app)/apps/new/+page.svelte b/src/routes/(app)/apps/new/+page.svelte index 583a4ba0..8268ef29 100644 --- a/src/routes/(app)/apps/new/+page.svelte +++ b/src/routes/(app)/apps/new/+page.svelte @@ -10,9 +10,7 @@

{$t("accounts.connection")}

{#if form?.error} -
- {form.error} -
+
{form.error}
{/if} diff --git a/src/routes/(app)/dm/+page.svelte b/src/routes/(app)/dm/+page.svelte index 5a908664..cc30e84f 100644 --- a/src/routes/(app)/dm/+page.svelte +++ b/src/routes/(app)/dm/+page.svelte @@ -156,9 +156,7 @@ userInfo(selectedChat.pubkey).then((info) => (nostrUserInfo = info)); libnip17.getPreferredRelays(selectedChat.pubkey).then((relays) => { canSend = relays && relays.length > 0; - relaysSupporting(relays, [40]).then( - (supporting) => (canSendExpiring = supporting.length > 0), - ); + relaysSupporting(relays, [40]).then((supporting) => (canSendExpiring = supporting.length > 0)); }); updateEvents(); }; @@ -299,13 +297,15 @@ {creatingNewChat ? $t("dm.newChatHeader") : $t("dm.chatHeader")} + + + {#if creatingNewChat} selectChat(c)} > - {name(c)} + + {name(c)} + {id(c)} {/if} @@ -376,49 +376,50 @@ {/if} {id(selectedChat)} + {id(selectedChat)} + + {$t(muted && muted.has(selectedChat.pubkey) ? "dm.unmute" : "dm.mute")} + {#if !(muted && muted.has(selectedChat.pubkey))}
{#each dates as day} -

- {formatDate(new Date(day * 86400 * 1000))} -

+

{formatDate(new Date(day * 86400 * 1000))}

    {#each messageRumours.get(day) as rumour} {#if rumour.pubkey === user.pubkey && pTagKeys(rumour).includes(selectedChat.pubkey)}
  • {rumour.content} - {TIME.format(new Date(rumour.created_at * 1000))} + + {TIME.format(new Date(rumour.created_at * 1000))} +
    • {:else if rumour.pubkey === selectedChat.pubkey && pTagKeys(rumour).includes(user.pubkey)}
  • {rumour.content} - {TIME.format(new Date(rumour.created_at * 1000))} + + {TIME.format(new Date(rumour.created_at * 1000))} +
    • {/if} {/each} @@ -433,8 +434,8 @@ class="btn btn-accent" disabled={!canSend} value={canSend - ? $t("dm.sendMessage") - : $t("dm.relaysNotFound").replace("[R]", name(selectedChat))} + ? $t("dm.sendMessage") + : $t("dm.relaysNotFound").replace("[R]", name(selectedChat))} on:click={async () => sendMessage(text)} /> {/if} @@ -447,7 +448,8 @@ bind:checked={expiryEnabled} disabled={!canSendExpiring} /> - : + + : . + /> + + .

    {$t("dm.fadedWarning")}

    {#if canSend && !canSendExpiring}

    @@ -471,10 +475,10 @@ {/if} {#if relayWarningShown}

    - {$t("dm.noRelaysSet")} - {$t("dm.nostrSettingsLink")} + + {$t("dm.noRelaysSet")} + {$t("dm.nostrSettingsLink")} +

    {/if}
diff --git a/src/routes/(app)/fund/[id]/access/+page.svelte b/src/routes/(app)/fund/[id]/access/+page.svelte index 9920fa5b..5c161e7c 100644 --- a/src/routes/(app)/fund/[id]/access/+page.svelte +++ b/src/routes/(app)/fund/[id]/access/+page.svelte @@ -56,8 +56,8 @@ - {$t("funds.returnToFund")} + {$t("funds.returnToFund")} +
diff --git a/src/routes/(app)/fund/[id]/authorize/[...amount]/+page.svelte b/src/routes/(app)/fund/[id]/authorize/[...amount]/+page.svelte index 746318e7..d49e047e 100644 --- a/src/routes/(app)/fund/[id]/authorize/[...amount]/+page.svelte +++ b/src/routes/(app)/fund/[id]/authorize/[...amount]/+page.svelte @@ -19,6 +19,4 @@
-
- {$t("payments.tapAnywhere")} -
+
{$t("payments.tapAnywhere")}
diff --git a/src/routes/(app)/fund/[id]/sweep/[...amount]/+page.svelte b/src/routes/(app)/fund/[id]/sweep/[...amount]/+page.svelte index b67a024b..40ceafb8 100644 --- a/src/routes/(app)/fund/[id]/sweep/[...amount]/+page.svelte +++ b/src/routes/(app)/fund/[id]/sweep/[...amount]/+page.svelte @@ -22,6 +22,4 @@
-
- {$t("payments.tapAnywhere")} -
+
{$t("payments.tapAnywhere")}
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte index b8ccd5af..a37185ed 100644 --- a/src/routes/(app)/fund/[id]/withdraw/+page.svelte +++ b/src/routes/(app)/fund/[id]/withdraw/+page.svelte @@ -35,9 +35,7 @@ {#if form?.message} -
- {form.message} -
+
{form.message}
{/if}
@@ -55,12 +53,13 @@ onclick={setMax} disabled={submitting} onkeydown={setMax} - >{#if $fiat} + > + {#if $fiat} Max {f((balance * rate) / sats, currency, locale)} {:else} Max ⚡️{s(balance)} - {/if} + {/if} +
-
- +{s(tip, locale)} -
+
+{s(tip, locale)}
{/if} @@ -139,24 +137,28 @@ type="button" class="btn" class:active={active(amount)} - onclick={() => handleTipButtonClick(amount)}>{amount} handleTipButtonClick(amount)} > + {amount} + {:else} handleTipButtonClick(amount)} > + {amount} + {/if} {/each} {/if}
- + {$t("payments.cancel")}
{/if} diff --git a/src/routes/(app)/invoice/sent/+page.svelte b/src/routes/(app)/invoice/sent/+page.svelte index 457ff108..cc87ddaf 100644 --- a/src/routes/(app)/invoice/sent/+page.svelte +++ b/src/routes/(app)/invoice/sent/+page.svelte @@ -6,5 +6,8 @@ Invoice sent to
-

{$request.requester.username} is ready to pay

+

+ {$request.requester.username} + is ready to pay +

diff --git a/src/routes/(app)/invoices/+page.svelte b/src/routes/(app)/invoices/+page.svelte index 418dfaf3..61c3173f 100644 --- a/src/routes/(app)/invoices/+page.svelte +++ b/src/routes/(app)/invoices/+page.svelte @@ -23,9 +23,7 @@ {#if !show[i.id]}...{/if} {/if} -
- {i.received} / {i.amount} -
+
{i.received} / {i.amount}
{i.memo?.startsWith("[") ? JSON.parse(i.memo)[0][1] : i.memo}
diff --git a/src/routes/(app)/ln/withdrawal/sent/+page.svelte b/src/routes/(app)/ln/withdrawal/sent/+page.svelte index 3f0b8711..6b7a8f95 100644 --- a/src/routes/(app)/ln/withdrawal/sent/+page.svelte +++ b/src/routes/(app)/ln/withdrawal/sent/+page.svelte @@ -20,6 +20,4 @@
-
- {$t("payments.tapAnywhere")} -
+
{$t("payments.tapAnywhere")}
diff --git a/src/routes/(app)/messages/+page.svelte b/src/routes/(app)/messages/+page.svelte index 2aaede8b..550daed4 100644 --- a/src/routes/(app)/messages/+page.svelte +++ b/src/routes/(app)/messages/+page.svelte @@ -76,9 +76,7 @@
{u.username}
-
- {content} -
+
{content}
diff --git a/src/routes/(app)/messages/[recipient]/+page.svelte b/src/routes/(app)/messages/[recipient]/+page.svelte index f828bde2..e82b5617 100644 --- a/src/routes/(app)/messages/[recipient]/+page.svelte +++ b/src/routes/(app)/messages/[recipient]/+page.svelte @@ -143,8 +143,7 @@
- {format(new Date(created_at * 1000), "MMM d")}, - {format(new Date(created_at * 1000), "h:mm aa")} + {format(new Date(created_at * 1000), "MMM d")}, {format(new Date(created_at * 1000), "h:mm aa")}
{/if} {/each} diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte index 6cae555c..aa46cfd5 100644 --- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte +++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte @@ -46,9 +46,7 @@ {#if form?.message} -
- {form.message} -
+
{form.message}
{/if}
@@ -61,17 +59,17 @@ {#if user?.balance} - + {/if} + {/if} + {$t("payments.next")} +
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte index b8a4223d..643ce1ae 100644 --- a/src/routes/(app)/payment/[id]/+page.svelte +++ b/src/routes/(app)/payment/[id]/+page.svelte @@ -80,9 +80,7 @@ aria-label="Toggle currency display" > {#if $fiat} -
- {f(toFiat(amount, rate), currency, userLocale)} -
+
{f(toFiat(amount, rate), currency, userLocale)}
{:else}
@@ -136,8 +134,7 @@
- {s((1 * sats) / rate)} = - {f(1, currency, userLocale, 0, 0)} + {s((1 * sats) / rate)} = {f(1, currency, userLocale, 0, 0)}
@@ -146,8 +143,7 @@
{$t("payments.date")}
- {format(new Date(created), "h:mmaaa", { locale })} - {format(new Date(created), "MMM d, yyyy", { locale })} + {format(new Date(created), "h:mmaaa", { locale })}{format(new Date(created), "MMM d, yyyy", { locale })}
@@ -158,7 +154,8 @@ {:else if type === types.fund} - {$t( + + {$t( "payments.viewFund", )} @@ -166,7 +163,8 @@ {@const eid = JSON.parse(memo).tags.find((t) => t[0] === "e")[1]} Nostr - {$t( + + {$t( "payments.zappedEvent", )} @@ -198,11 +196,13 @@ {txid} + {txid} + - + {/if} @@ -212,8 +212,8 @@ Path
{path}
- +
{/if} diff --git a/src/routes/(app)/payment/[id]/plain/+page.svelte b/src/routes/(app)/payment/[id]/plain/+page.svelte index 87ad2207..ad582c02 100644 --- a/src/routes/(app)/payment/[id]/plain/+page.svelte +++ b/src/routes/(app)/payment/[id]/plain/+page.svelte @@ -67,19 +67,14 @@
Date -
- {format(new Date(created), "MMMM d")}, - {format(new Date(created), "h:mm aaa")} -
+
{format(new Date(created), "MMMM d")}, {format(new Date(created), "h:mm aaa")}
{#if type === "bitcoin"}
Txid
-
- {id} -
+
{id}
{/if} diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte index f6cbcba8..4d20f8ef 100644 --- a/src/routes/(app)/payments/[...page]/+page.svelte +++ b/src/routes/(app)/payments/[...page]/+page.svelte @@ -148,9 +148,7 @@
-

- {$t("payments.header")} -

+

{$t("payments.header")}

@@ -205,15 +203,23 @@ {#if totalIn > 0} {$t("payments.income")} - {tipsIn > 0 ? f(tipsIn, c, locale) : ""} - {totalIn > 0 ? f(totalIn, c, locale) : "-"} + + {tipsIn > 0 ? f(tipsIn, c, locale) : ""} + + + {totalIn > 0 ? f(totalIn, c, locale) : "-"} + {/if} {#if totalOut > 0} {$t("payments.expenditure")} - {tipsOut > 0 ? f(tipsOut, c, locale) : "-"} - {totalOut > 0 ? f(totalOut, c, locale) : "-"} + + {tipsOut > 0 ? f(tipsOut, c, locale) : "-"} + + + {totalOut > 0 ? f(totalOut, c, locale) : "-"} + {/if} {/each}
diff --git a/src/routes/(app)/pos/+page.svelte b/src/routes/(app)/pos/+page.svelte index 0b29608d..81758c56 100644 --- a/src/routes/(app)/pos/+page.svelte +++ b/src/routes/(app)/pos/+page.svelte @@ -158,12 +158,12 @@ {#if connected}
- - + +
{#if tab === "config"} @@ -172,7 +172,11 @@ {#if configDone}
Config written ✔
{:else} -
Generated config file ({bytes.length} bytes)
+
+ Generated config file ( + {bytes.length} bytes + ) +
- {#if configProgress > 0}
- Progress: {configProgress}% -
{/if} + {#if configProgress > 0} +
Progress: {configProgress}%
+ {/if} {/if} {:else}
diff --git a/src/routes/(app)/printer/+page.svelte b/src/routes/(app)/printer/+page.svelte index 108af3b5..c55f0abf 100644 --- a/src/routes/(app)/printer/+page.svelte +++ b/src/routes/(app)/printer/+page.svelte @@ -76,7 +76,11 @@ {#if progress}
Done!
{:else} -
Generated config file ({data.length * 2} bytes)
+
+ Generated config file ( + {data.length * 2} bytes + ) +
{/if} {:else} diff --git a/src/routes/(app)/receive/[...token]/+page.svelte b/src/routes/(app)/receive/[...token]/+page.svelte index bea32277..63f34fb4 100644 --- a/src/routes/(app)/receive/[...token]/+page.svelte +++ b/src/routes/(app)/receive/[...token]/+page.svelte @@ -75,8 +75,6 @@
- + diff --git a/src/routes/(app)/reset/[code]/+page.svelte b/src/routes/(app)/reset/[code]/+page.svelte index deade18a..a2b13a30 100644 --- a/src/routes/(app)/reset/[code]/+page.svelte +++ b/src/routes/(app)/reset/[code]/+page.svelte @@ -74,9 +74,7 @@

{$t("login.reset")}

{#if form?.error} -
- {form.error} -
+
{form.error}
{/if}
@@ -84,8 +82,7 @@
- A new seed phrase will be generated for your account. You'll need to import your old seed - phrase if you want to use the same nostr profile and savings account as before. + A new seed phrase will be generated for your account. You'll need to import your old seed phrase if you want to use the same nostr profile and savings account as before.
+ {/if} + + {/if} + + {/if} + {:else} - + {/if} + + {$t("payments.trustUser")} + {/if} diff --git a/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte index fbafd7d4..b8f39802 100644 --- a/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte +++ b/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte @@ -104,9 +104,7 @@ {/if} {#if amount}
-

- {$t("payments.send")} -

+

{$t("payments.send")}

@@ -123,9 +121,7 @@
{#if $fiat} -

- {f(toFiat(ourfee as number, $rate as number), currency)} -

+

{f(toFiat(ourfee as number, $rate as number), currency)}

{:else}

⚡️{s(ourfee)}

{/if} @@ -144,9 +140,7 @@
-
- {$t("payments.maxFeeDesc")} -
+
{$t("payments.maxFeeDesc")}
{#if form?.message} -
- {$t(form.message)} -
+
{$t(form.message)}
{/if}
diff --git a/src/routes/(app)/sent/[id]/+page.svelte b/src/routes/(app)/sent/[id]/+page.svelte index 3dde854f..aaf2a3a0 100644 --- a/src/routes/(app)/sent/[id]/+page.svelte +++ b/src/routes/(app)/sent/[id]/+page.svelte @@ -15,6 +15,4 @@
-
- {$t("payments.tapAnywhere")} -
+
{$t("payments.tapAnywhere")}
diff --git a/src/routes/(app)/settings/account/+page.svelte b/src/routes/(app)/settings/account/+page.svelte index 7a1bbab1..c435aced 100644 --- a/src/routes/(app)/settings/account/+page.svelte +++ b/src/routes/(app)/settings/account/+page.svelte @@ -117,9 +117,7 @@
-

- {$t("user.settings.emailDescription")} -

+

{$t("user.settings.emailDescription")}

-

- {$t("user.settings.notificationsDesc")} -

+

{$t("user.settings.notificationsDesc")}

@@ -164,16 +160,12 @@ {$t("user.settings.tipPrompt")}
-

- {$t("user.settings.tipPromptDescription")} -

+

{$t("user.settings.tipPromptDescription")}

-

- {$t("user.settings.tipDesc")} -

+

{$t("user.settings.tipDesc")}

-

- {$t("user.settings.autoWithdrawDescription")} -

+

{$t("user.settings.autoWithdrawDescription")}

@@ -213,9 +203,7 @@
-

- {$t("user.settings.thresholdDesc")} -

+

{$t("user.settings.thresholdDesc")}

@@ -229,18 +217,14 @@
-

- {$t("user.settings.reserveDesc")} -

+

{$t("user.settings.reserveDesc")}

{#if editingThreshold}
-

- {$t("user.settings.threshold")} -

+

{$t("user.settings.threshold")}

-

- {$t("user.settings.reserve")} -

+

{$t("user.settings.reserve")}

Square -
{$t("user.settings.connectSquare")}
+
{$t("user.settings.connectSquare")}
+ {:else}
{#if revealNwc} -
- {nwc} -
+
{nwc}
+
{$t("accounts.copy")}
+
{$t("user.receive.showQR")}
@@ -179,9 +169,10 @@ class="my-auto btn btn-circle !w-auto grow" onclick={() => copy(npub)} aria-label="Copy" - > - {$t("accounts.copy")} + + {$t("accounts.copy")} + Alby - {$t("user.settings.syncWithExtension")} + {$t("user.settings.syncWithExtension")} + {/if}
@@ -206,9 +197,7 @@
-

- {$t("user.settings.nostrDescription")} -

+

{$t("user.settings.nostrDescription")}

{/if} - - {$t("user.settings.preferredDM")} - -

- {$t("user.settings.preferredDMDescription")} -

+{$t("user.settings.preferredDM")} +

{$t("user.settings.preferredDMDescription")}

diff --git a/src/routes/(app)/settings/profile/+page.svelte b/src/routes/(app)/settings/profile/+page.svelte index e56f8a70..201a9c30 100644 --- a/src/routes/(app)/settings/profile/+page.svelte +++ b/src/routes/(app)/settings/profile/+page.svelte @@ -119,9 +119,9 @@ {/if}
- +
{/if} - +
- {verifying ? $t("user.settings.verifyPIN") : $t("user.settings.securityPIN")} -

- {$t("user.settings.securityPINDescription")} -

+ + {verifying ? $t("user.settings.verifyPIN") : $t("user.settings.securityPIN")} + +

{$t("user.settings.securityPINDescription")}

{#if verifying} {:else if settingPin} @@ -180,16 +178,14 @@ icon={haspin ? "ph:lock-key-open-bold" : "ph:lock-key-bold"} width="32" > - {haspin ? $t("user.settings.disablePIN") : $t("user.settings.enablePIN")} + {haspin ? $t("user.settings.disablePIN") : $t("user.settings.enablePIN")} + {/if}
{$t("user.settings.twofa")} -

- {$t("user.settings.twofaDescription")} -

+

{$t("user.settings.twofaDescription")}

{#if setting2fa} @@ -197,7 +193,8 @@
- {$t("user.settings.accountId")}
+ {$t("user.settings.accountId")} +
{otp.secret}
diff --git a/src/routes/(app)/sign/+page.svelte b/src/routes/(app)/sign/+page.svelte index fbea78ed..32b96fe8 100644 --- a/src/routes/(app)/sign/+page.svelte +++ b/src/routes/(app)/sign/+page.svelte @@ -18,8 +18,8 @@ +
Copy
+ {:else}
{address}
diff --git a/src/routes/(app)/verify/[code]/+page.svelte b/src/routes/(app)/verify/[code]/+page.svelte index 813c29e6..c8587f2f 100644 --- a/src/routes/(app)/verify/[code]/+page.svelte +++ b/src/routes/(app)/verify/[code]/+page.svelte @@ -23,6 +23,4 @@
-
- {$t("payments.tapAnywhere")} -
+
{$t("payments.tapAnywhere")}
diff --git a/src/routes/(static)/bounties/+page.svelte b/src/routes/(static)/bounties/+page.svelte index fad8c041..c5bd99e7 100644 --- a/src/routes/(static)/bounties/+page.svelte +++ b/src/routes/(static)/bounties/+page.svelte @@ -42,7 +42,8 @@
First {b}
{s(100000, "en-CA")} + > + {s(100000, "en-CA")}
{/each}
@@ -55,7 +56,8 @@
{b.type}
{s(b.amount, "en-CA")} + > + {s(b.amount, "en-CA")}
{/each}
@@ -101,9 +103,7 @@
- - {s(amount, "en-CA")} - + {s(amount, "en-CA")}
@@ -132,8 +132,7 @@

- 25% of the bounty will be awarded once the business is ready to take payments and has been - announced + 25% of the bounty will be awarded once the business is ready to take payments and has been announced

The rest will be awarded once they've been accepting Bitcoin for 6 months

@@ -145,19 +144,17 @@

Get Started!

- Reach out to bounties@coinos.io and let us know who we should contact + Reach out to + bounties@coinos.io + and let us know who we should contact

- We'll update this page as the bounties are claimed so you'll be able to see which ones are still - available. + We'll update this page as the bounties are claimed so you'll be able to see which ones are still available.

- Have a lead or idea for something that's not on the list? Reach out! We offer sats for all sorts - of referrals! + Have a lead or idea for something that's not on the list? Reach out! We offer sats for all sorts of referrals!

Thanks for participating and helping to orange pill Vancouver!

diff --git a/src/routes/(static)/docs/+page.svelte b/src/routes/(static)/docs/+page.svelte index fc803158..90d14ff1 100644 --- a/src/routes/(static)/docs/+page.svelte +++ b/src/routes/(static)/docs/+page.svelte @@ -26,18 +26,13 @@

Documentation

- Coinos is free and open source software. The code is available at github.com/coinos + Coinos is free and open source software. The code is available at + github.com/coinos

- Coinos has a REST API that can be used to register accounts and make payments. The following - examples show how you can call the API with curl + Coinos has a REST API that can be used to register accounts and make payments. The following examples show how you can call the API with + curl

API Base URL

@@ -49,14 +44,16 @@

Auth Token

{#if user && token} - This token authorizes you to use the API as {user.username}. + This token authorizes you to use the API as + {user.username} + . {:else} - Sign in to view your auth token here, or get one from the - /login endpoint. + Sign in + to view your auth token here, or get one from the /login endpoint. {/if} - - Save it in a variable called $token to run the examples. It gives full access to your account - so keep it safe. + Save it in a variable called + $token + to run the examples. It gives full access to your account so keep it safe.

@@ -66,8 +63,7 @@ {#if ro}

- This read-only token has permission to create invoices and fetch payments but can't be used to - make withdrawals + This read-only token has permission to create invoices and fetch payments but can't be used to make withdrawals

{roSample}
@@ -130,7 +126,11 @@

Sample response

-

You can check the received field to see how much has been paid

+

+ You can check the + received + field to see how much has been paid +

Specify a webhook to be called when an invoice is paid

diff --git a/src/routes/(static)/login/+page.svelte b/src/routes/(static)/login/+page.svelte index 7c9c29fc..22e49e65 100644 --- a/src/routes/(static)/login/+page.svelte +++ b/src/routes/(static)/login/+page.svelte @@ -161,9 +161,7 @@

{$t("login.signIn")}

{#if form?.error && !form?.message.includes("2fa")} -
- {form.error} -
+
{form.error}
{/if} @@ -184,9 +182,9 @@
- {$t("login.forgotUserOrPassword")} + + {$t("login.forgotUserOrPassword")} +
diff --git a/src/routes/(static)/register/+page.svelte b/src/routes/(static)/register/+page.svelte index f594244c..a8d05e42 100644 --- a/src/routes/(static)/register/+page.svelte +++ b/src/routes/(static)/register/+page.svelte @@ -298,10 +298,7 @@
{#if form?.error || form?.message} -
- {form?.message} - {form?.error} -
+
{form?.message}{form?.error}
{/if} @@ -326,8 +323,8 @@ placeholder={$t("login.username")} /> + + Data Removal
- If you wish to delete your account and have your data removed, please add a verified email - address to your account and send an email from it to - support@coinos.io requesting that we delete your account data. + If you wish to delete your account and have your data removed, please add a verified email address to your account and send an email from it to + support@coinos.io + requesting that we delete your account data.
diff --git a/src/routes/(static)/support/+page.svelte b/src/routes/(static)/support/+page.svelte index 8a7f55bf..3a9b011f 100644 --- a/src/routes/(static)/support/+page.svelte +++ b/src/routes/(static)/support/+page.svelte @@ -80,14 +80,13 @@ + Ok + {:else} -

- {$t("user.support.header")} -

+

{$t("user.support.header")}

{$t("user.support.fillForm")} @@ -115,8 +114,9 @@ type="submit" disabled={!email || !message} class="g-recaptcha bg-black text-white font-bold rounded-xl py-3 w-full mx-auto hover:opacity-80" - >{$t("user.support.send")} + {$t("user.support.send")} + {/if} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 71613871..c1586698 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -51,10 +51,7 @@ if (hasNotch) { window.AndroidNotch.getInsetTop( (px) => { - document.documentElement.style.setProperty( - "--safe-area-inset-top", - Math.round(px) + "px", - ); + document.documentElement.style.setProperty("--safe-area-inset-top", Math.round(px) + "px"); }, (err) => { console.error("Failed to get notch inset:", err); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index eee8e40c..c160a685 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -36,9 +36,11 @@ {$t("landing.info2.description1")} -

+
+
{$t("landing.info2.description2")} -

+
+
{@html $t("landing.info2.description3")} @@ -53,9 +55,7 @@

-

- {$t("howItWorks.header")} -

+

{$t("howItWorks.header")}

{#each howItWorksSteps as step} @@ -66,9 +66,7 @@
-

- {$t("faq.header")} -

+

{$t("faq.header")}

{#each faqs as f} {/each} -- cgit v1.2.3