From 6f155806829c7784daf39c746547bcb604ba2847 Mon Sep 17 00:00:00 2001 From: Kieran Date: Wed, 1 Nov 2023 00:40:57 +0900 Subject: [PATCH] chore: formatting --- packages/app/custom.d.ts | 2 +- packages/app/src/Element/ErrorOrOffline.tsx | 22 +++++++++---- packages/app/src/Element/Event/Reveal.tsx | 4 +-- packages/app/src/Element/Offline.tsx | 25 +++++++------- packages/app/src/Element/WarningNotice.css | 33 +++++++++---------- packages/app/src/Element/WarningNotice.tsx | 16 +++++---- packages/app/src/Hooks/useLoginRelays.tsx | 5 ++- .../app/src/Pages/Profile/ProfilePage.tsx | 16 ++++----- packages/app/src/Pages/Root.tsx | 31 +++++++++-------- .../Pages/subscribe/ManageSubscription.tsx | 4 +-- packages/app/src/index.tsx | 3 +- packages/app/src/lang.json | 14 +++++--- packages/app/src/translations/en.json | 4 ++- 13 files changed, 100 insertions(+), 79 deletions(-) diff --git a/packages/app/custom.d.ts b/packages/app/custom.d.ts index 11bcbf5a..dcdd0016 100644 --- a/packages/app/custom.d.ts +++ b/packages/app/custom.d.ts @@ -60,4 +60,4 @@ declare const CONFIG: { /** * Single relay (Debug) */ -declare const SINGLE_RELAY: string | undefined; \ No newline at end of file +declare const SINGLE_RELAY: string | undefined; diff --git a/packages/app/src/Element/ErrorOrOffline.tsx b/packages/app/src/Element/ErrorOrOffline.tsx index 5de062b8..79031f40 100644 --- a/packages/app/src/Element/ErrorOrOffline.tsx +++ b/packages/app/src/Element/ErrorOrOffline.tsx @@ -2,10 +2,18 @@ import { OfflineError } from "@snort/shared"; import { Offline } from "./Offline"; import classNames from "classnames"; -export function ErrorOrOffline({ error, onRetry, className }: { error: Error, onRetry?: () => void | Promise, className?: string }) { - if (error instanceof OfflineError) { - return ; - } else { - return {error.message} - } -} \ No newline at end of file +export function ErrorOrOffline({ + error, + onRetry, + className, +}: { + error: Error; + onRetry?: () => void | Promise; + className?: string; +}) { + if (error instanceof OfflineError) { + return ; + } else { + return {error.message}; + } +} diff --git a/packages/app/src/Element/Event/Reveal.tsx b/packages/app/src/Element/Event/Reveal.tsx index 9edd3b48..62a38131 100644 --- a/packages/app/src/Element/Event/Reveal.tsx +++ b/packages/app/src/Element/Event/Reveal.tsx @@ -10,9 +10,7 @@ export default function Reveal(props: RevealProps) { const [reveal, setReveal] = useState(false); if (!reveal) { - return setReveal(true)}> - {props.message} - + return setReveal(true)}>{props.message}; } else if (props.children) { return props.children; } diff --git a/packages/app/src/Element/Offline.tsx b/packages/app/src/Element/Offline.tsx index 30cd35ad..660737f3 100644 --- a/packages/app/src/Element/Offline.tsx +++ b/packages/app/src/Element/Offline.tsx @@ -3,15 +3,18 @@ import AsyncButton from "./AsyncButton"; import { FormattedMessage } from "react-intl"; import classNames from "classnames"; -export function Offline({ onRetry, className }: { onRetry?: () => void | Promise, className?: string }) { - return
- -
- -
- {onRetry && - - - } +export function Offline({ onRetry, className }: { onRetry?: () => void | Promise; className?: string }) { + return ( +
+ +
+ +
+ {onRetry && ( + + + + )}
-} \ No newline at end of file + ); +} diff --git a/packages/app/src/Element/WarningNotice.css b/packages/app/src/Element/WarningNotice.css index 008190a2..42c06350 100644 --- a/packages/app/src/Element/WarningNotice.css +++ b/packages/app/src/Element/WarningNotice.css @@ -1,18 +1,17 @@ .warning-notice { - color: var(--font-tertiary-color); - border: 1px solid var(--border-color); - padding: 8px 16px; - border-radius: 12px; - display: flex; - gap: 8px; - } - - .warning-notice i { - font-style: normal; - color: var(--font-color); - } - - .warning-notice > svg { - color: var(--warning); - } - \ No newline at end of file + color: var(--font-tertiary-color); + border: 1px solid var(--border-color); + padding: 8px 16px; + border-radius: 12px; + display: flex; + gap: 8px; +} + +.warning-notice i { + font-style: normal; + color: var(--font-color); +} + +.warning-notice > svg { + color: var(--warning); +} diff --git a/packages/app/src/Element/WarningNotice.tsx b/packages/app/src/Element/WarningNotice.tsx index 7c7853a5..feb83c53 100644 --- a/packages/app/src/Element/WarningNotice.tsx +++ b/packages/app/src/Element/WarningNotice.tsx @@ -1,12 +1,16 @@ import "./WarningNotice.css"; import Icon from "Icons/Icon"; -export function WarningNotice({ children, onClick }: { children: React.ReactNode, onClick?: () => void }) { - return
{ +export function WarningNotice({ children, onClick }: { children: React.ReactNode; onClick?: () => void }) { + return ( +
{ e.stopPropagation(); onClick?.(); - }}> - -
{children}
+ }}> + +
{children}
-} \ No newline at end of file + ); +} diff --git a/packages/app/src/Hooks/useLoginRelays.tsx b/packages/app/src/Hooks/useLoginRelays.tsx index 93574ca1..a90c4c85 100644 --- a/packages/app/src/Hooks/useLoginRelays.tsx +++ b/packages/app/src/Hooks/useLoginRelays.tsx @@ -9,8 +9,7 @@ export function useLoginRelays() { useEffect(() => { if (relays) { - updateRelayConnections(system, relays.item) - .catch(console.error); + updateRelayConnections(system, relays.item).catch(console.error); } }, [relays]); } @@ -28,4 +27,4 @@ export async function updateRelayConnections(system: SystemInterface, relays: Re } } } -} \ No newline at end of file +} diff --git a/packages/app/src/Pages/Profile/ProfilePage.tsx b/packages/app/src/Pages/Profile/ProfilePage.tsx index e0dc4019..f8c99a47 100644 --- a/packages/app/src/Pages/Profile/ProfilePage.tsx +++ b/packages/app/src/Pages/Profile/ProfilePage.tsx @@ -187,14 +187,14 @@ export default function ProfilePage({ id: propId, state }: ProfilePageProps) { targets={ lnurl?.lnurl && id ? [ - { - type: "lnurl", - value: lnurl?.lnurl, - weight: 1, - name: user?.display_name || user?.name, - zap: { pubkey: id }, - } as ZapTarget, - ] + { + type: "lnurl", + value: lnurl?.lnurl, + weight: 1, + name: user?.display_name || user?.name, + zap: { pubkey: id }, + } as ZapTarget, + ] : undefined } show={showLnQr} diff --git a/packages/app/src/Pages/Root.tsx b/packages/app/src/Pages/Root.tsx index 1602e671..4491cec6 100644 --- a/packages/app/src/Pages/Root.tsx +++ b/packages/app/src/Pages/Root.tsx @@ -73,10 +73,7 @@ export const GlobalTab = () => { return (

- +