From 7c8fff97ce64538f92a1e7478b363962556e2fa9 Mon Sep 17 00:00:00 2001 From: Kieran Date: Mon, 20 Nov 2023 19:16:47 +0000 Subject: [PATCH] chore: cleanup / yarn sdks --- .vscode/settings.json | 2 +- .yarn/sdks/eslint/lib/unsupported-api.js | 20 ++ .yarn/sdks/eslint/package.json | 12 +- .yarn/sdks/prettier/bin/prettier.cjs | 20 ++ .yarn/sdks/prettier/{index.js => index.cjs} | 0 .yarn/sdks/prettier/package.json | 7 +- .yarn/sdks/typescript/lib/typescript.js | 6 +- .yarn/sdks/typescript/package.json | 6 +- packages/app/.eslintrc.cjs | 6 +- packages/app/index.html | 4 +- packages/app/src/Element/Embed/CashuNuts.tsx | 6 +- packages/app/src/Element/Embed/PubkeyList.tsx | 6 +- .../app/src/Element/Event/LongFormText.tsx | 3 +- .../app/src/Element/Event/NostrFileHeader.tsx | 5 +- .../app/src/Element/Event/NoteBroadcaster.tsx | 6 +- .../app/src/Element/Event/NoteCreator.tsx | 33 ++- packages/app/src/Element/Event/NoteFooter.tsx | 14 +- packages/app/src/Element/Event/NoteInner.tsx | 6 +- .../app/src/Element/Event/NoteReaction.tsx | 3 +- packages/app/src/Element/Event/Poll.tsx | 15 +- packages/app/src/Element/Event/Reactions.tsx | 4 +- .../app/src/Element/Event/RevealMedia.tsx | 3 +- packages/app/src/Element/Event/Thread.tsx | 6 +- packages/app/src/Element/Event/Zap.tsx | 2 +- .../app/src/Element/Feed/TimelineFragment.tsx | 6 +- .../Element/IrisAccount/ReservedAccount.tsx | 3 +- packages/app/src/Element/PinPrompt.tsx | 9 +- packages/app/src/Element/ProxyImg.tsx | 3 +- packages/app/src/Element/SearchBox.tsx | 2 +- packages/app/src/Element/SendSats.tsx | 3 +- packages/app/src/Element/User/BadgeList.tsx | 3 +- packages/app/src/Element/messages.ts | 195 +++++++++--------- packages/app/src/Hooks/useLoginHandler.tsx | 3 +- packages/app/src/Pages/Discover.tsx | 6 +- packages/app/src/Pages/DonatePage.tsx | 17 +- packages/app/src/Pages/HashTagsPage.tsx | 3 +- packages/app/src/Pages/HelpPage.tsx | 3 +- packages/app/src/Pages/MessagesPage.tsx | 11 +- packages/app/src/Pages/Notifications.tsx | 31 +-- packages/app/src/Pages/Root.tsx | 6 +- packages/app/src/Pages/SearchPage.tsx | 6 +- packages/app/src/Pages/WalletPage.tsx | 13 +- packages/app/src/Pages/ZapPool.tsx | 23 ++- packages/app/src/Pages/messages.ts | 76 ++++--- .../app/src/Pages/onboarding/discover.tsx | 3 +- packages/app/src/Pages/onboarding/start.tsx | 9 +- packages/app/src/Pages/settings/Cache.tsx | 3 +- .../app/src/Pages/settings/Preferences.tsx | 9 +- packages/app/src/Pages/settings/Profile.tsx | 5 +- packages/app/src/Pages/settings/Relays.tsx | 8 +- .../src/Pages/settings/handle/LNAddress.tsx | 21 +- .../src/Pages/settings/handle/ListHandles.tsx | 3 +- .../Pages/settings/handle/TransferHandle.tsx | 3 +- packages/app/src/Pages/settings/messages.ts | 117 ++++++----- .../app/src/Pages/settings/wallet/Cashu.tsx | 3 +- .../app/src/Pages/settings/wallet/LNC.tsx | 10 +- .../app/src/Pages/settings/wallet/LNDHub.tsx | 3 +- .../app/src/Pages/settings/wallet/NWC.tsx | 6 +- .../Pages/subscribe/ManageSubscription.tsx | 3 +- packages/app/src/Pages/subscribe/RenewSub.tsx | 6 +- .../src/Pages/subscribe/SubscriptionCard.tsx | 6 +- packages/app/src/Pages/subscribe/index.tsx | 17 +- packages/app/src/Tasks/DonateTask.tsx | 3 +- packages/app/src/Tasks/Nip5Task.tsx | 3 +- packages/app/src/Tasks/NoticeZapPool.tsx | 3 +- packages/app/src/Tasks/RenewSubscription.tsx | 3 +- packages/app/src/Wallet/LNDHub.ts | 4 +- packages/app/src/index.tsx | 4 +- packages/app/src/lang.json | 6 +- packages/app/src/serviceWorkerRegistration.ts | 6 +- packages/app/src/translations/en.json | 2 +- packages/app/vite.config.ts | 26 +-- packages/system/src/pow.ts | 4 +- 73 files changed, 554 insertions(+), 362 deletions(-) create mode 100644 .yarn/sdks/eslint/lib/unsupported-api.js create mode 100755 .yarn/sdks/prettier/bin/prettier.cjs rename .yarn/sdks/prettier/{index.js => index.cjs} (100%) mode change 100755 => 100644 diff --git a/.vscode/settings.json b/.vscode/settings.json index 7d9b0afe..fd5275cb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,5 +15,5 @@ "typescript.tsdk": ".yarn/sdks/typescript/lib", "typescript.enablePromptUseWorkspaceTsdk": true, "eslint.nodePath": ".yarn/sdks", - "prettier.prettierPath": ".yarn/sdks/prettier/index.js" + "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs" } diff --git a/.yarn/sdks/eslint/lib/unsupported-api.js b/.yarn/sdks/eslint/lib/unsupported-api.js new file mode 100644 index 00000000..30fdf158 --- /dev/null +++ b/.yarn/sdks/eslint/lib/unsupported-api.js @@ -0,0 +1,20 @@ +#!/usr/bin/env node + +const {existsSync} = require(`fs`); +const {createRequire} = require(`module`); +const {resolve} = require(`path`); + +const relPnpApiPath = "../../../../.pnp.cjs"; + +const absPnpApiPath = resolve(__dirname, relPnpApiPath); +const absRequire = createRequire(absPnpApiPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require eslint/use-at-your-own-risk + require(absPnpApiPath).setup(); + } +} + +// Defer to the real eslint/use-at-your-own-risk your application uses +module.exports = absRequire(`eslint/use-at-your-own-risk`); diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json index ff446fd6..d65ecf38 100644 --- a/.yarn/sdks/eslint/package.json +++ b/.yarn/sdks/eslint/package.json @@ -1,6 +1,14 @@ { "name": "eslint", - "version": "8.48.0-sdk", + "version": "8.53.0-sdk", "main": "./lib/api.js", - "type": "commonjs" + "type": "commonjs", + "bin": { + "eslint": "./bin/eslint.js" + }, + "exports": { + "./package.json": "./package.json", + ".": "./lib/api.js", + "./use-at-your-own-risk": "./lib/unsupported-api.js" + } } diff --git a/.yarn/sdks/prettier/bin/prettier.cjs b/.yarn/sdks/prettier/bin/prettier.cjs new file mode 100755 index 00000000..5efad688 --- /dev/null +++ b/.yarn/sdks/prettier/bin/prettier.cjs @@ -0,0 +1,20 @@ +#!/usr/bin/env node + +const {existsSync} = require(`fs`); +const {createRequire} = require(`module`); +const {resolve} = require(`path`); + +const relPnpApiPath = "../../../../.pnp.cjs"; + +const absPnpApiPath = resolve(__dirname, relPnpApiPath); +const absRequire = createRequire(absPnpApiPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require prettier/bin/prettier.cjs + require(absPnpApiPath).setup(); + } +} + +// Defer to the real prettier/bin/prettier.cjs your application uses +module.exports = absRequire(`prettier/bin/prettier.cjs`); diff --git a/.yarn/sdks/prettier/index.js b/.yarn/sdks/prettier/index.cjs old mode 100755 new mode 100644 similarity index 100% rename from .yarn/sdks/prettier/index.js rename to .yarn/sdks/prettier/index.cjs diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json index c102fa29..c61f5117 100644 --- a/.yarn/sdks/prettier/package.json +++ b/.yarn/sdks/prettier/package.json @@ -1,6 +1,7 @@ { "name": "prettier", - "version": "3.0.3-sdk", - "main": "./index.js", - "type": "commonjs" + "version": "3.1.0-sdk", + "main": "./index.cjs", + "type": "commonjs", + "bin": "./bin/prettier.cjs" } diff --git a/.yarn/sdks/typescript/lib/typescript.js b/.yarn/sdks/typescript/lib/typescript.js index e14fa87b..b5f4db25 100644 --- a/.yarn/sdks/typescript/lib/typescript.js +++ b/.yarn/sdks/typescript/lib/typescript.js @@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath); if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { - // Setup the environment to be able to require typescript/lib/typescript.js + // Setup the environment to be able to require typescript require(absPnpApiPath).setup(); } } -// Defer to the real typescript/lib/typescript.js your application uses -module.exports = absRequire(`typescript/lib/typescript.js`); +// Defer to the real typescript your application uses +module.exports = absRequire(`typescript`); diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json index 0bfa4eb2..d32f3913 100644 --- a/.yarn/sdks/typescript/package.json +++ b/.yarn/sdks/typescript/package.json @@ -2,5 +2,9 @@ "name": "typescript", "version": "5.2.2-sdk", "main": "./lib/typescript.js", - "type": "commonjs" + "type": "commonjs", + "bin": { + "tsc": "./bin/tsc", + "tsserver": "./bin/tsserver" + } } diff --git a/packages/app/.eslintrc.cjs b/packages/app/.eslintrc.cjs index 333691e5..a938feaa 100644 --- a/packages/app/.eslintrc.cjs +++ b/packages/app/.eslintrc.cjs @@ -6,9 +6,9 @@ module.exports = { "formatjs/enforce-id": [ "error", { - "idInterpolationPattern": "[sha512:contenthash:base64:6]" - } - ] + idInterpolationPattern: "[sha512:contenthash:base64:6]", + }, + ], }, root: true, ignorePatterns: ["build/", "*.test.ts", "*.js"], diff --git a/packages/app/index.html b/packages/app/index.html index fd4cd482..a4b107b5 100644 --- a/packages/app/index.html +++ b/packages/app/index.html @@ -5,7 +5,9 @@ - + diff --git a/packages/app/src/Element/Embed/CashuNuts.tsx b/packages/app/src/Element/Embed/CashuNuts.tsx index 597aa202..55686c3e 100644 --- a/packages/app/src/Element/Embed/CashuNuts.tsx +++ b/packages/app/src/Element/Embed/CashuNuts.tsx @@ -107,7 +107,8 @@ export default function CashuNuts({ token }: { token: string }) {

{c}

, n: , @@ -116,7 +117,8 @@ export default function CashuNuts({ token }: { token: string }) { {c}, url: new URL(cashu.token[0].mint).hostname, diff --git a/packages/app/src/Element/Embed/PubkeyList.tsx b/packages/app/src/Element/Embed/PubkeyList.tsx index efe079b1..86bb60dd 100644 --- a/packages/app/src/Element/Embed/PubkeyList.tsx +++ b/packages/app/src/Element/Embed/PubkeyList.tsx @@ -42,7 +42,8 @@ export default function PubkeyList({ ev, className }: { ev: NostrEvent; classNam Toastore.push({ element: ( zapAll()}> , }} diff --git a/packages/app/src/Element/Event/LongFormText.tsx b/packages/app/src/Element/Event/LongFormText.tsx index 1cd19a8f..787fa45d 100644 --- a/packages/app/src/Element/Event/LongFormText.tsx +++ b/packages/app/src/Element/Event/LongFormText.tsx @@ -93,7 +93,8 @@ export function LongFormText(props: LongFormTextProps) {
, }} diff --git a/packages/app/src/Element/Event/NostrFileHeader.tsx b/packages/app/src/Element/Event/NostrFileHeader.tsx index 0b5891e0..aa236d1d 100644 --- a/packages/app/src/Element/Event/NostrFileHeader.tsx +++ b/packages/app/src/Element/Event/NostrFileHeader.tsx @@ -26,7 +26,10 @@ export function NostrFileElement({ ev }: { ev: NostrEvent }) { if (u && m) { return ( - }> + + }> ); diff --git a/packages/app/src/Element/Event/NoteBroadcaster.tsx b/packages/app/src/Element/Event/NoteBroadcaster.tsx index b05b5c42..923b988a 100644 --- a/packages/app/src/Element/Event/NoteBroadcaster.tsx +++ b/packages/app/src/Element/Event/NoteBroadcaster.tsx @@ -91,7 +91,8 @@ export function NoteBroadcaster({ onClick={() => retryPublish(r)} className="p4 br-compact flex items-center secondary" title={formatMessage({ - defaultMessage: "Retry publishing", id: '9kSari', + defaultMessage: "Retry publishing", + id: "9kSari", })}> @@ -99,7 +100,8 @@ export function NoteBroadcaster({ onClick={() => removeRelayFromResult(r)} className="p4 br-compact flex items-center secondary" title={formatMessage({ - defaultMessage: "Remove from my relays", id: 'UJTWqI', + defaultMessage: "Remove from my relays", + id: "UJTWqI", })}> diff --git a/packages/app/src/Element/Event/NoteCreator.tsx b/packages/app/src/Element/Event/NoteCreator.tsx index f91623cd..a880e462 100644 --- a/packages/app/src/Element/Event/NoteCreator.tsx +++ b/packages/app/src/Element/Event/NoteCreator.tsx @@ -52,7 +52,8 @@ export function NoteCreator() { throw new Error( formatMessage( { - defaultMessage: "Failed to parse zap split: {input}", id: 'sZQzjQ', + defaultMessage: "Failed to parse zap split: {input}", + id: "sZQzjQ", }, { input: s.value, @@ -69,7 +70,8 @@ export function NoteCreator() { throw new Error( formatMessage( { - defaultMessage: "Failed to parse zap split: {input}", id: 'sZQzjQ', + defaultMessage: "Failed to parse zap split: {input}", + id: "sZQzjQ", }, { input: s.value, @@ -81,7 +83,8 @@ export function NoteCreator() { throw new Error( formatMessage( { - defaultMessage: "Invalid zap split: {input}", id: '8Y6bZQ', + defaultMessage: "Invalid zap split: {input}", + id: "8Y6bZQ", }, { input: s.value, @@ -380,7 +383,7 @@ export function NoteCreator() { v => (v.zapSplits = arr.map((vv, ii) => (ii === i ? { ...vv, value: e.target.value } : vv))), ) } - placeholder={formatMessage({ defaultMessage: "npub / nprofile / nostr address", id: 'WvGmZT' })} + placeholder={formatMessage({ defaultMessage: "npub / nprofile / nostr address", id: "WvGmZT" })} />
@@ -419,14 +422,20 @@ export function NoteCreator() {
- +

- + @@ -486,7 +496,11 @@ export function NoteCreator() { - {note.replyTo ? : } + {note.replyTo ? ( + + ) : ( + + )}
@@ -597,7 +611,8 @@ export function NoteCreator() { value={note.hashTags} onChange={e => note.update(s => (s.hashTags = e))} placeHolder={formatMessage({ - defaultMessage: "Add up to 4 hashtags", id: 'AIgmDy', + defaultMessage: "Add up to 4 hashtags", + id: "AIgmDy", })} separators={["Enter", ","]} /> diff --git a/packages/app/src/Element/Event/NoteFooter.tsx b/packages/app/src/Element/Event/NoteFooter.tsx index 4e22bbbb..460e91f4 100644 --- a/packages/app/src/Element/Event/NoteFooter.tsx +++ b/packages/app/src/Element/Event/NoteFooter.tsx @@ -187,7 +187,11 @@ export default function NoteFooter(props: NoteFooterProps) { const pow = findTag(ev, "nonce") ? countLeadingZeros(ev.id) : undefined; if (pow) { return ( - + ); } } @@ -199,7 +203,7 @@ export default function NoteFooter(props: NoteFooterProps) { fastZap(e)} @@ -217,7 +221,7 @@ export default function NoteFooter(props: NoteFooterProps) { } @@ -258,7 +262,7 @@ export default function NoteFooter(props: NoteFooterProps) { { if (readonly) return; @@ -274,7 +278,7 @@ export default function NoteFooter(props: NoteFooterProps) { handleReplyButtonClick()} /> diff --git a/packages/app/src/Element/Event/NoteInner.tsx b/packages/app/src/Element/Event/NoteInner.tsx index ab00dcaa..bc8af732 100644 --- a/packages/app/src/Element/Event/NoteInner.tsx +++ b/packages/app/src/Element/Event/NoteInner.tsx @@ -118,7 +118,8 @@ export function NoteInner(props: NoteProps) { message={ <> {c}, }} @@ -127,7 +128,8 @@ export function NoteInner(props: NoteProps) { <>   {c}, reason: contentWarning[1], diff --git a/packages/app/src/Element/Event/NoteReaction.tsx b/packages/app/src/Element/Event/NoteReaction.tsx index f2738a06..8c11ad2f 100644 --- a/packages/app/src/Element/Event/NoteReaction.tsx +++ b/packages/app/src/Element/Event/NoteReaction.tsx @@ -79,7 +79,8 @@ export default function NoteReaction(props: NoteReactionProps) {
} link={z.anonZap ? "" : undefined} - overrideUsername={z.anonZap ? formatMessage({ defaultMessage: "Anonymous", id: 'LXxsbk' }) : undefined} + overrideUsername={ + z.anonZap ? formatMessage({ defaultMessage: "Anonymous", id: "LXxsbk" }) : undefined + } /> ) diff --git a/packages/app/src/Element/Event/RevealMedia.tsx b/packages/app/src/Element/Event/RevealMedia.tsx index 15706b98..2ce1f1c0 100644 --- a/packages/app/src/Element/Event/RevealMedia.tsx +++ b/packages/app/src/Element/Event/RevealMedia.tsx @@ -57,7 +57,8 @@ export default function RevealMedia(props: RevealMediaProps) { {i}, a: a => {a}, diff --git a/packages/app/src/Element/Event/Thread.tsx b/packages/app/src/Element/Event/Thread.tsx index 169b4ef6..9f701c6b 100644 --- a/packages/app/src/Element/Event/Thread.tsx +++ b/packages/app/src/Element/Event/Thread.tsx @@ -303,11 +303,13 @@ export function Thread(props: { onBack?: () => void; disableSpotlight?: boolean } const parentText = formatMessage({ - defaultMessage: "Parent", id: 'ADmfQT', + defaultMessage: "Parent", + id: "ADmfQT", description: "Link to parent note in thread", }); const backText = formatMessage({ - defaultMessage: "Back", id: 'jfV8Wr', + defaultMessage: "Back", + id: "jfV8Wr", description: "Navigate back button on threads view", }); diff --git a/packages/app/src/Element/Event/Zap.tsx b/packages/app/src/Element/Event/Zap.tsx index 56ac9b58..548fc0de 100644 --- a/packages/app/src/Element/Event/Zap.tsx +++ b/packages/app/src/Element/Event/Zap.tsx @@ -60,7 +60,7 @@ export const ZapsSummary = ({ zaps }: ZapsSummaryProps) => { )} {restZaps.length > 0 ? ( diff --git a/packages/app/src/Element/Feed/TimelineFragment.tsx b/packages/app/src/Element/Feed/TimelineFragment.tsx index eed30e7f..ad7afd23 100644 --- a/packages/app/src/Element/Feed/TimelineFragment.tsx +++ b/packages/app/src/Element/Feed/TimelineFragment.tsx @@ -39,7 +39,8 @@ export function TimelineRenderer(props: TimelineRendererProps) { return ; })} @@ -52,7 +53,8 @@ export function TimelineRenderer(props: TimelineRendererProps) { return ; })} diff --git a/packages/app/src/Element/IrisAccount/ReservedAccount.tsx b/packages/app/src/Element/IrisAccount/ReservedAccount.tsx index 6b9478dd..5d74da02 100644 --- a/packages/app/src/Element/IrisAccount/ReservedAccount.tsx +++ b/packages/app/src/Element/IrisAccount/ReservedAccount.tsx @@ -6,7 +6,8 @@ export default function ReservedAccount({ name = "", enableReserved = () => {},

{s} }} />

diff --git a/packages/app/src/Element/PinPrompt.tsx b/packages/app/src/Element/PinPrompt.tsx index 2f2b2a25..c6b01d48 100644 --- a/packages/app/src/Element/PinPrompt.tsx +++ b/packages/app/src/Element/PinPrompt.tsx @@ -29,7 +29,8 @@ export function PinPrompt({ if (pin.length < 4) { setError( formatMessage({ - defaultMessage: "Pin too short", id: 'LR1XjT', + defaultMessage: "Pin too short", + id: "LR1XjT", }), ); return; @@ -43,7 +44,8 @@ export function PinPrompt({ if (e instanceof InvalidPinError) { setError( formatMessage({ - defaultMessage: "Incorrect pin", id: 'qz9fty', + defaultMessage: "Incorrect pin", + id: "qz9fty", }), ); } else if (e instanceof Error) { @@ -143,7 +145,8 @@ export function LoginUnlock() { subTitle={

{ setBypass(true); }}>

- {!readonly && makeTab(ZapType.PublicZap, )} + {!readonly && + makeTab(ZapType.PublicZap, )} {/*makeTab(ZapType.PrivateZap, "Private")*/} {makeTab(ZapType.AnonZap, )} {makeTab( diff --git a/packages/app/src/Element/User/BadgeList.tsx b/packages/app/src/Element/User/BadgeList.tsx index 1a8fb5be..755adaf0 100644 --- a/packages/app/src/Element/User/BadgeList.tsx +++ b/packages/app/src/Element/User/BadgeList.tsx @@ -55,7 +55,8 @@ export default function BadgeList({ badges }: { badges: TaggedNostrEvent[] }) {

{description}

setShowModal(false)} /> }} />

diff --git a/packages/app/src/Element/messages.ts b/packages/app/src/Element/messages.ts index ff7fe52f..f1b9aadc 100644 --- a/packages/app/src/Element/messages.ts +++ b/packages/app/src/Element/messages.ts @@ -1,103 +1,104 @@ import { defineMessages } from "react-intl"; export default defineMessages({ - Cancel: { defaultMessage: "Cancel", id: '47FYwb' }, - Reply: { defaultMessage: "Reply", id: '9HU8vw' }, - Send: { defaultMessage: "Send", id: '9WRlF4' }, - NotePlaceholder: { defaultMessage: "What's on your mind?", id: 'flnGvv' }, - Back: { defaultMessage: "Back", id: 'cyR7Kh' }, - Block: { defaultMessage: "Block", id: 'Up5U7K' }, - Unblock: { defaultMessage: "Unblock", id: 'nDejmx' }, - MuteCount: { defaultMessage: "{n} muted", id: 'VlJkSk' }, - Mute: { defaultMessage: "Mute", id: 'x82IOl' }, - MutedAuthor: { defaultMessage: "This author has been muted", id: 'ASRK0S' }, - Others: { defaultMessage: ` & {n} {n, plural, =1 {other} other {others}}`, id: 'egib+2' }, - Show: { defaultMessage: "Show", id: 'K7AkdL' }, - Delete: { defaultMessage: "Delete", id: 'K3r6DQ' }, - Deleted: { defaultMessage: "Deleted", id: 'KQvWvD' }, - Unmute: { defaultMessage: "Unmute", id: 'W9355R' }, - MuteAll: { defaultMessage: "Mute all", id: 'cWx9t8' }, - BlockCount: { defaultMessage: "{n} blocked", id: 'nwZXeh' }, - JustNow: { defaultMessage: "Just now", id: 'bxv59V' }, - Follow: { defaultMessage: "Follow", id: 'ieGrWo' }, - FollowAll: { defaultMessage: "Follow all", id: 'mKAr6h' }, - Unfollow: { defaultMessage: "Unfollow", id: 'izWS4J' }, - FollowerCount: { defaultMessage: "{n} followers", id: 'o7e+nJ' }, - FollowingCount: { defaultMessage: "Follows {n}", id: '9SvQep' }, - FollowsYou: { defaultMessage: "follows you", id: 'FmXUJg' }, - Invoice: { defaultMessage: "Lightning Invoice", id: '9wO4wJ' }, - PayInvoice: { defaultMessage: "Pay Invoice", id: 'lvlPhZ' }, - Expired: { defaultMessage: "Expired", id: 'RahCRH' }, - Pay: { defaultMessage: "Pay", id: 'lD3+8a' }, - Loading: { defaultMessage: "Loading...", id: 'gjBiyj' }, - Logout: { defaultMessage: "Logout", id: 'C81/uG' }, - ShowMore: { defaultMessage: "Show more", id: 'aWpBzj' }, - TranslateTo: { defaultMessage: "Translate to {lang}", id: 'Ebl/B2' }, - TranslatedFrom: { defaultMessage: "Translated from {lang}", id: 'Cu/K85' }, - TranslationFailed: { defaultMessage: "Translation failed", id: 'qmJ8kD' }, - UnknownEventKind: { defaultMessage: "Unknown event kind: {kind}", id: 'KahimY' }, - ConfirmDeletion: { defaultMessage: `Are you sure you want to delete {id}`, id: 'RhDAoS' }, - ConfirmRepost: { defaultMessage: `Are you sure you want to repost: {id}`, id: '+D82kt' }, - Reactions: { defaultMessage: "Reactions", id: 'XgWvGA' }, - ReactionsCount: { defaultMessage: "Reactions ({n})", id: 'iCqGww' }, - Share: { defaultMessage: "Share", id: 'OKhRC6' }, - CopyID: { defaultMessage: "Copy ID", id: 'wtLjP6' }, - CopyJSON: { defaultMessage: "Copy Event JSON", id: 'P61BTu' }, - Dislike: { defaultMessage: "{n} Dislike", id: 'GspYR7' }, - DislikeAction: { defaultMessage: "Dislike", id: '4OB335' }, - Sats: { defaultMessage: `{n} {n, plural, =1 {sat} other {sats}}`, id: 'jA3OE/' }, - Zapped: { defaultMessage: "zapped", id: 'B6+XJy' }, - OthersZapped: { defaultMessage: `{n, plural, =0 {} =1 {zapped} other {zapped}}`, id: 'mKhgP9' }, - Likes: { defaultMessage: "Likes ({n})", id: '6ewQqw' }, - Zaps: { defaultMessage: "Zaps ({n})", id: 'JHEHCk' }, - Dislikes: { defaultMessage: "Dislikes ({n})", id: '2k0Cv+' }, - Reposts: { defaultMessage: "Reposts ({n})", id: '8/vBbP' }, - NoteToSelf: { defaultMessage: "Note to Self", id: '4rYCjn' }, - Read: { defaultMessage: "Read", id: 'filwqD' }, - Write: { defaultMessage: "Write", id: 'k2veDA' }, - Seconds: { defaultMessage: "{n} secs", id: '0yO7wF' }, - Milliseconds: { defaultMessage: "{n} ms", id: '/n5KSF' }, - ShowLatest: { defaultMessage: "Show latest {n} notes", id: 'DZzCem' }, - LNURLFail: { defaultMessage: "Failed to load LNURL service", id: 'zonsdq' }, - InvalidLNURL: { defaultMessage: "Invalid LNURL", id: '0jOEtS' }, - InvoiceFail: { defaultMessage: "Failed to load invoice", id: 'CHTbO3' }, - Custom: { defaultMessage: "Custom", id: 'Sjo1P4' }, - Confirm: { defaultMessage: "Confirm", id: 'N2IrpM' }, - Comment: { defaultMessage: "Comment", id: 'LgbKvU' }, - SendZap: { defaultMessage: "Send zap", id: '5ykRmX' }, - ShowReplies: { defaultMessage: "Show replies", id: 'hicxcO' }, - TooShort: { defaultMessage: "name too short", id: 'B4C47Y' }, - TooLong: { defaultMessage: "name too long", id: '8g2vyB' }, - Regex: { defaultMessage: "name has disallowed characters", id: '0mch2Y' }, - Registered: { defaultMessage: "name is registered", id: 'cuV2gK' }, - Disallowed: { defaultMessage: "name is blocked", id: 'wih7iJ' }, - DisalledLater: { defaultMessage: "name will be available later", id: 'HFls6j' }, - BuyNow: { defaultMessage: "Buy Now", id: 'lCILNz' }, - NotAvailable: { defaultMessage: "Not available:", id: 'MI2jkA' }, - Buying: { defaultMessage: "Buying {item}", id: 'MzRYWH' }, - OrderPaid: { defaultMessage: "Order Paid!", id: 'H6/kLh' }, - NewNip: { defaultMessage: "Your new NIP-05 handle is:", id: '4L2vUY' }, - ActivateNow: { defaultMessage: "Activate Now", id: 'ZKORll' }, - AddToProfile: { defaultMessage: "Add to Profile", id: 'qkvYUb' }, - AccountPage: { defaultMessage: "account page", id: 'lgg1KN' }, - AccountSupport: { defaultMessage: "Account Support", id: '/JE/X+' }, - GoTo: { defaultMessage: "Go to", id: 'xIoGG9' }, - FindMore: { defaultMessage: "Find out more info about {service} at {link}", id: 'wqyN/i' }, + Cancel: { defaultMessage: "Cancel", id: "47FYwb" }, + Reply: { defaultMessage: "Reply", id: "9HU8vw" }, + Send: { defaultMessage: "Send", id: "9WRlF4" }, + NotePlaceholder: { defaultMessage: "What's on your mind?", id: "flnGvv" }, + Back: { defaultMessage: "Back", id: "cyR7Kh" }, + Block: { defaultMessage: "Block", id: "Up5U7K" }, + Unblock: { defaultMessage: "Unblock", id: "nDejmx" }, + MuteCount: { defaultMessage: "{n} muted", id: "VlJkSk" }, + Mute: { defaultMessage: "Mute", id: "x82IOl" }, + MutedAuthor: { defaultMessage: "This author has been muted", id: "ASRK0S" }, + Others: { defaultMessage: ` & {n} {n, plural, =1 {other} other {others}}`, id: "egib+2" }, + Show: { defaultMessage: "Show", id: "K7AkdL" }, + Delete: { defaultMessage: "Delete", id: "K3r6DQ" }, + Deleted: { defaultMessage: "Deleted", id: "KQvWvD" }, + Unmute: { defaultMessage: "Unmute", id: "W9355R" }, + MuteAll: { defaultMessage: "Mute all", id: "cWx9t8" }, + BlockCount: { defaultMessage: "{n} blocked", id: "nwZXeh" }, + JustNow: { defaultMessage: "Just now", id: "bxv59V" }, + Follow: { defaultMessage: "Follow", id: "ieGrWo" }, + FollowAll: { defaultMessage: "Follow all", id: "mKAr6h" }, + Unfollow: { defaultMessage: "Unfollow", id: "izWS4J" }, + FollowerCount: { defaultMessage: "{n} followers", id: "o7e+nJ" }, + FollowingCount: { defaultMessage: "Follows {n}", id: "9SvQep" }, + FollowsYou: { defaultMessage: "follows you", id: "FmXUJg" }, + Invoice: { defaultMessage: "Lightning Invoice", id: "9wO4wJ" }, + PayInvoice: { defaultMessage: "Pay Invoice", id: "lvlPhZ" }, + Expired: { defaultMessage: "Expired", id: "RahCRH" }, + Pay: { defaultMessage: "Pay", id: "lD3+8a" }, + Loading: { defaultMessage: "Loading...", id: "gjBiyj" }, + Logout: { defaultMessage: "Logout", id: "C81/uG" }, + ShowMore: { defaultMessage: "Show more", id: "aWpBzj" }, + TranslateTo: { defaultMessage: "Translate to {lang}", id: "Ebl/B2" }, + TranslatedFrom: { defaultMessage: "Translated from {lang}", id: "Cu/K85" }, + TranslationFailed: { defaultMessage: "Translation failed", id: "qmJ8kD" }, + UnknownEventKind: { defaultMessage: "Unknown event kind: {kind}", id: "KahimY" }, + ConfirmDeletion: { defaultMessage: `Are you sure you want to delete {id}`, id: "RhDAoS" }, + ConfirmRepost: { defaultMessage: `Are you sure you want to repost: {id}`, id: "+D82kt" }, + Reactions: { defaultMessage: "Reactions", id: "XgWvGA" }, + ReactionsCount: { defaultMessage: "Reactions ({n})", id: "iCqGww" }, + Share: { defaultMessage: "Share", id: "OKhRC6" }, + CopyID: { defaultMessage: "Copy ID", id: "wtLjP6" }, + CopyJSON: { defaultMessage: "Copy Event JSON", id: "P61BTu" }, + Dislike: { defaultMessage: "{n} Dislike", id: "GspYR7" }, + DislikeAction: { defaultMessage: "Dislike", id: "4OB335" }, + Sats: { defaultMessage: `{n} {n, plural, =1 {sat} other {sats}}`, id: "jA3OE/" }, + Zapped: { defaultMessage: "zapped", id: "B6+XJy" }, + OthersZapped: { defaultMessage: `{n, plural, =0 {} =1 {zapped} other {zapped}}`, id: "mKhgP9" }, + Likes: { defaultMessage: "Likes ({n})", id: "6ewQqw" }, + Zaps: { defaultMessage: "Zaps ({n})", id: "JHEHCk" }, + Dislikes: { defaultMessage: "Dislikes ({n})", id: "2k0Cv+" }, + Reposts: { defaultMessage: "Reposts ({n})", id: "8/vBbP" }, + NoteToSelf: { defaultMessage: "Note to Self", id: "4rYCjn" }, + Read: { defaultMessage: "Read", id: "filwqD" }, + Write: { defaultMessage: "Write", id: "k2veDA" }, + Seconds: { defaultMessage: "{n} secs", id: "0yO7wF" }, + Milliseconds: { defaultMessage: "{n} ms", id: "/n5KSF" }, + ShowLatest: { defaultMessage: "Show latest {n} notes", id: "DZzCem" }, + LNURLFail: { defaultMessage: "Failed to load LNURL service", id: "zonsdq" }, + InvalidLNURL: { defaultMessage: "Invalid LNURL", id: "0jOEtS" }, + InvoiceFail: { defaultMessage: "Failed to load invoice", id: "CHTbO3" }, + Custom: { defaultMessage: "Custom", id: "Sjo1P4" }, + Confirm: { defaultMessage: "Confirm", id: "N2IrpM" }, + Comment: { defaultMessage: "Comment", id: "LgbKvU" }, + SendZap: { defaultMessage: "Send zap", id: "5ykRmX" }, + ShowReplies: { defaultMessage: "Show replies", id: "hicxcO" }, + TooShort: { defaultMessage: "name too short", id: "B4C47Y" }, + TooLong: { defaultMessage: "name too long", id: "8g2vyB" }, + Regex: { defaultMessage: "name has disallowed characters", id: "0mch2Y" }, + Registered: { defaultMessage: "name is registered", id: "cuV2gK" }, + Disallowed: { defaultMessage: "name is blocked", id: "wih7iJ" }, + DisalledLater: { defaultMessage: "name will be available later", id: "HFls6j" }, + BuyNow: { defaultMessage: "Buy Now", id: "lCILNz" }, + NotAvailable: { defaultMessage: "Not available:", id: "MI2jkA" }, + Buying: { defaultMessage: "Buying {item}", id: "MzRYWH" }, + OrderPaid: { defaultMessage: "Order Paid!", id: "H6/kLh" }, + NewNip: { defaultMessage: "Your new NIP-05 handle is:", id: "4L2vUY" }, + ActivateNow: { defaultMessage: "Activate Now", id: "ZKORll" }, + AddToProfile: { defaultMessage: "Add to Profile", id: "qkvYUb" }, + AccountPage: { defaultMessage: "account page", id: "lgg1KN" }, + AccountSupport: { defaultMessage: "Account Support", id: "/JE/X+" }, + GoTo: { defaultMessage: "Go to", id: "xIoGG9" }, + FindMore: { defaultMessage: "Find out more info about {service} at {link}", id: "wqyN/i" }, SavePassword: { - defaultMessage: "Please make sure to save the following password in order to manage your handle in the future", id: '+vIQlC', + defaultMessage: "Please make sure to save the following password in order to manage your handle in the future", + id: "+vIQlC", }, - Handle: { defaultMessage: "Handle", id: 'iNWbVV' }, - Pin: { defaultMessage: "Pin", id: 'puLNUJ' }, - Pinned: { defaultMessage: "Pinned", id: 'fWZYP5' }, - Bookmark: { defaultMessage: "Bookmark", id: 'Rs4kCE' }, - Bookmarks: { defaultMessage: "Bookmarks", id: 'nGBrvw' }, - BookmarksCount: { defaultMessage: "Bookmarks ({n})", id: 'GL8aXW' }, - Bookmarked: { defaultMessage: "Saved", id: 'fsB/4p' }, - All: { defaultMessage: "All", id: 'zQvVDJ' }, - ConfirmUnbookmark: { defaultMessage: "Are you sure you want to remove this note from bookmarks?", id: '1Mo59U' }, - ConfirmUnpin: { defaultMessage: "Are you sure you want to unpin this note?", id: 'IEwZvs' }, - ReactionsLink: { defaultMessage: "{n} Reactions", id: 'jzgQ2z' }, - ReBroadcast: { defaultMessage: "Broadcast Again", id: 'c3g2hL' }, - IrisUserNameLengthError: { defaultMessage: "Name must be between 1 and 32 characters", id: '4MBtMa' }, - IrisUserNameFormatError: { defaultMessage: "Username must only contain lowercase letters and numbers", id: 'RSr2uB' }, + Handle: { defaultMessage: "Handle", id: "iNWbVV" }, + Pin: { defaultMessage: "Pin", id: "puLNUJ" }, + Pinned: { defaultMessage: "Pinned", id: "fWZYP5" }, + Bookmark: { defaultMessage: "Bookmark", id: "Rs4kCE" }, + Bookmarks: { defaultMessage: "Bookmarks", id: "nGBrvw" }, + BookmarksCount: { defaultMessage: "Bookmarks ({n})", id: "GL8aXW" }, + Bookmarked: { defaultMessage: "Saved", id: "fsB/4p" }, + All: { defaultMessage: "All", id: "zQvVDJ" }, + ConfirmUnbookmark: { defaultMessage: "Are you sure you want to remove this note from bookmarks?", id: "1Mo59U" }, + ConfirmUnpin: { defaultMessage: "Are you sure you want to unpin this note?", id: "IEwZvs" }, + ReactionsLink: { defaultMessage: "{n} Reactions", id: "jzgQ2z" }, + ReBroadcast: { defaultMessage: "Broadcast Again", id: "c3g2hL" }, + IrisUserNameLengthError: { defaultMessage: "Name must be between 1 and 32 characters", id: "4MBtMa" }, + IrisUserNameFormatError: { defaultMessage: "Username must only contain lowercase letters and numbers", id: "RSr2uB" }, }); diff --git a/packages/app/src/Hooks/useLoginHandler.tsx b/packages/app/src/Hooks/useLoginHandler.tsx index 39c6d168..fe44ae18 100644 --- a/packages/app/src/Hooks/useLoginHandler.tsx +++ b/packages/app/src/Hooks/useLoginHandler.tsx @@ -14,7 +14,8 @@ export default function useLoginHandler() { async function doLogin(key: string, pin: (key: string) => Promise) { const insecureMsg = formatMessage({ defaultMessage: - "Can't login with private key on an insecure connection, please use a Nostr key manager extension instead", id: 'iXPL0Z', + "Can't login with private key on an insecure connection, please use a Nostr key manager extension instead", + id: "iXPL0Z", }); // private key logins if (key.startsWith("nsec")) { diff --git a/packages/app/src/Pages/Discover.tsx b/packages/app/src/Pages/Discover.tsx index ba61a5ea..466d1b7a 100644 --- a/packages/app/src/Pages/Discover.tsx +++ b/packages/app/src/Pages/Discover.tsx @@ -9,9 +9,9 @@ export default function Discover() { const { formatMessage } = useIntl(); // tabs const Tabs = { - Follows: { text: formatMessage({ defaultMessage: "Suggested Follows", id: 'C8HhVE' }), value: 0 }, - Posts: { text: formatMessage({ defaultMessage: "Trending Notes", id: 'Ix8l+B' }), value: 1 }, - Profiles: { text: formatMessage({ defaultMessage: "Trending People", id: 'CVWeJ6' }), value: 2 }, + Follows: { text: formatMessage({ defaultMessage: "Suggested Follows", id: "C8HhVE" }), value: 0 }, + Posts: { text: formatMessage({ defaultMessage: "Trending Notes", id: "Ix8l+B" }), value: 1 }, + Profiles: { text: formatMessage({ defaultMessage: "Trending People", id: "CVWeJ6" }), value: 2 }, }; const [tab, setTab] = useState(Tabs.Follows); diff --git a/packages/app/src/Pages/DonatePage.tsx b/packages/app/src/Pages/DonatePage.tsx index 1d8c62b0..4b9ee623 100644 --- a/packages/app/src/Pages/DonatePage.tsx +++ b/packages/app/src/Pages/DonatePage.tsx @@ -87,13 +87,15 @@ const DonatePage = () => {

@@ -102,7 +104,8 @@ const DonatePage = () => {

@@ -113,7 +116,10 @@ const DonatePage = () => { />

- +

@@ -126,7 +132,8 @@ const DonatePage = () => { {today && ( diff --git a/packages/app/src/Pages/HashTagsPage.tsx b/packages/app/src/Pages/HashTagsPage.tsx index d938cbfb..0905c499 100644 --- a/packages/app/src/Pages/HashTagsPage.tsx +++ b/packages/app/src/Pages/HashTagsPage.tsx @@ -71,7 +71,8 @@ export function HashTagHeader({ tag, events, className }: { tag: string; events? {events && (

- + {cx.unread > 0 && }

@@ -161,7 +164,11 @@ function ProfileDmActions({ id }: { id: string }) {
(blocked ? unblock(pubkey) : block(pubkey))}> - {blocked ? : } + {blocked ? ( + + ) : ( + + )}
); diff --git a/packages/app/src/Pages/Notifications.tsx b/packages/app/src/Pages/Notifications.tsx index 282d6768..c41c4895 100644 --- a/packages/app/src/Pages/Notifications.tsx +++ b/packages/app/src/Pages/Notifications.tsx @@ -8,25 +8,10 @@ import { FormattedMessage, useIntl } from "react-intl"; import { useNavigate } from "react-router-dom"; import { Bar, BarChart, Tooltip, XAxis, YAxis } from "recharts"; -<<<<<<< HEAD -import useLogin from "Hooks/useLogin"; -import { markNotificationsRead } from "Login"; -import { Notifications } from "Cache"; -import { dedupe, orderAscending, orderDescending, getDisplayName } from "SnortUtils"; -import Icon from "Icons/Icon"; -import ProfileImage from "Element/User/ProfileImage"; -import useModeration from "Hooks/useModeration"; -import Text from "Element/Text"; -import { formatShort } from "Number"; -import { LiveEvent } from "Element/LiveEvent"; -import ProfilePreview from "Element/User/ProfilePreview"; -import { Day } from "Const"; -import Tabs, { Tab } from "Element/Tabs"; -======= import useLogin from "@/Hooks/useLogin"; import { markNotificationsRead } from "@/Login"; import { Notifications } from "@/Cache"; -import { dedupe, findTag, orderAscending, orderDescending, getDisplayName } from "@/SnortUtils"; +import { dedupe, orderAscending, orderDescending, getDisplayName } from "@/SnortUtils"; import Icon from "@/Icons/Icon"; import ProfileImage from "@/Element/User/ProfileImage"; import useModeration from "@/Hooks/useModeration"; @@ -36,7 +21,6 @@ import { LiveEvent } from "@/Element/LiveEvent"; import ProfilePreview from "@/Element/User/ProfilePreview"; import { Day } from "@/Const"; import Tabs, { Tab } from "@/Element/Tabs"; ->>>>>>> 7ec02f9b (wip vite) import classNames from "classnames"; import { AsyncIcon } from "@/Element/AsyncIcon"; import { ShowMoreInView } from "@/Element/Event/ShowMore"; @@ -345,7 +329,8 @@ function NotificationGroup({ evs, onClick }: { evs: Array; onC case EventKind.Reaction: { return ( ; onC case EventKind.Repost: { return ( ; onC case EventKind.ZapReceipt: { return ( ; onC showUsername={kind === EventKind.TextNote} pubkey={v} size={40} - overrideUsername={v === "" ? formatMessage({ defaultMessage: "Anon", id: 'bfvyfs' }) : undefined} + overrideUsername={v === "" ? formatMessage({ defaultMessage: "Anon", id: "bfvyfs" }) : undefined} /> ))}
@@ -409,7 +396,7 @@ function NotificationGroup({ evs, onClick }: { evs: Array; onC {actionName( pubkeys.length - 1, firstPubkey === "anon" - ? formatMessage({ defaultMessage: "Anon", id: 'bfvyfs' }) + ? formatMessage({ defaultMessage: "Anon", id: "bfvyfs" }) : getDisplayName(firstPubkeyProfile, firstPubkey), )}
diff --git a/packages/app/src/Pages/Root.tsx b/packages/app/src/Pages/Root.tsx index 801ac517..7431f56e 100644 --- a/packages/app/src/Pages/Root.tsx +++ b/packages/app/src/Pages/Root.tsx @@ -75,7 +75,11 @@ export const GlobalTab = () => { return (

- +

setSearch(e.target.value)} autoFocus={true} diff --git a/packages/app/src/Pages/WalletPage.tsx b/packages/app/src/Pages/WalletPage.tsx index 360ddd45..89a75166 100644 --- a/packages/app/src/Pages/WalletPage.tsx +++ b/packages/app/src/Pages/WalletPage.tsx @@ -41,7 +41,7 @@ export default function WalletPage() { if (e instanceof Error) { setError((e as Error).message); } else { - setError(formatMessage({ defaultMessage: "Unknown error", id: 'qDwvZ4' })); + setError(formatMessage({ defaultMessage: "Unknown error", id: "qDwvZ4" })); } } } @@ -90,7 +90,8 @@ export default function WalletPage() { (
- +
{(a.memo ?? "").length === 0 ? <>  : a.memo}
{stateIcon(a.state)} , }} @@ -176,7 +178,8 @@ export default function WalletPage() { return ( , }} diff --git a/packages/app/src/Pages/ZapPool.tsx b/packages/app/src/Pages/ZapPool.tsx index 2335779e..de4de15d 100644 --- a/packages/app/src/Pages/ZapPool.tsx +++ b/packages/app/src/Pages/ZapPool.tsx @@ -96,14 +96,21 @@ export default function ZapPoolPage() {

- -

-

- +

+

+

+ @@ -115,7 +122,8 @@ export default function ZapPoolPage() {

@@ -134,7 +142,8 @@ export default function ZapPoolPage() {

diff --git a/packages/app/src/Pages/messages.ts b/packages/app/src/Pages/messages.ts index 96b3f860..808feb3e 100644 --- a/packages/app/src/Pages/messages.ts +++ b/packages/app/src/Pages/messages.ts @@ -1,45 +1,55 @@ import { defineMessages } from "react-intl"; export default defineMessages({ - Login: { defaultMessage: "Login", id: 'AyGauy' }, - Global: { defaultMessage: "Global", id: 'EWyQH5' }, - NewUsers: { defaultMessage: "New users page", id: 'NndBJE' }, - NoFollows: { defaultMessage: "Hmm nothing here.. Checkout {newUsersPage} to follow some recommended nostrich's!", id: 'NdOYJJ' }, - Reactions: { defaultMessage: "Reactions", id: 'XgWvGA' }, - Followers: { defaultMessage: "Followers", id: 'pzTOmv' }, - FollowersCount: { defaultMessage: "{n} Followers", id: '3tVy+Z' }, - Follows: { defaultMessage: "Following", id: 'cPIKU2' }, - FollowsCount: { defaultMessage: "{n} Following", id: '1nYUGC' }, - Zaps: { defaultMessage: "Zaps", id: 'OEW7yJ' }, - ZapsCount: { defaultMessage: "{n} Zaps", id: 'FDguSC' }, - Muted: { defaultMessage: "Muted", id: 'HOzFdo' }, - MutedCount: { defaultMessage: "{n} Muted", id: 'CmZ9ls' }, - Blocked: { defaultMessage: "Blocked", id: 'qUJTsT' }, - BlockedCount: { defaultMessage: "{n} Blocked", id: 'W2PiAr' }, - Sats: { defaultMessage: "{n} {n, plural, =1 {sat} other {sats}}", id: 'jA3OE/' }, - Following: { defaultMessage: "Following {n}", id: 'lnaT9F' }, - Settings: { defaultMessage: "Settings", id: 'D3idYv' }, - Messages: { defaultMessage: "Messages", id: 'hMzcSq' }, - MarkAllRead: { defaultMessage: "Mark All Read", id: 'e7qqly' }, - GetVerified: { defaultMessage: "Get Verified", id: 'eJj8HD' }, - Nip05: { defaultMessage: `NIP-05 is a DNS based verification spec which helps to validate you as a real user.`, id: 'vZ4quW' }, - Nip05Pros: { defaultMessage: `Getting NIP-05 verified can help:`, id: 'thnRpU' }, - AvoidImpersonators: { defaultMessage: "Prevent fake accounts from imitating you", id: 'iGT1eE' }, - EasierToFind: { defaultMessage: "Make your profile easier to find and share", id: '/d6vEc' }, - Funding: { defaultMessage: "Fund developers and platforms providing NIP-05 verification services", id: 'a5UPxh' }, + Login: { defaultMessage: "Login", id: "AyGauy" }, + Global: { defaultMessage: "Global", id: "EWyQH5" }, + NewUsers: { defaultMessage: "New users page", id: "NndBJE" }, + NoFollows: { + defaultMessage: "Hmm nothing here.. Checkout {newUsersPage} to follow some recommended nostrich's!", + id: "NdOYJJ", + }, + Reactions: { defaultMessage: "Reactions", id: "XgWvGA" }, + Followers: { defaultMessage: "Followers", id: "pzTOmv" }, + FollowersCount: { defaultMessage: "{n} Followers", id: "3tVy+Z" }, + Follows: { defaultMessage: "Following", id: "cPIKU2" }, + FollowsCount: { defaultMessage: "{n} Following", id: "1nYUGC" }, + Zaps: { defaultMessage: "Zaps", id: "OEW7yJ" }, + ZapsCount: { defaultMessage: "{n} Zaps", id: "FDguSC" }, + Muted: { defaultMessage: "Muted", id: "HOzFdo" }, + MutedCount: { defaultMessage: "{n} Muted", id: "CmZ9ls" }, + Blocked: { defaultMessage: "Blocked", id: "qUJTsT" }, + BlockedCount: { defaultMessage: "{n} Blocked", id: "W2PiAr" }, + Sats: { defaultMessage: "{n} {n, plural, =1 {sat} other {sats}}", id: "jA3OE/" }, + Following: { defaultMessage: "Following {n}", id: "lnaT9F" }, + Settings: { defaultMessage: "Settings", id: "D3idYv" }, + Messages: { defaultMessage: "Messages", id: "hMzcSq" }, + MarkAllRead: { defaultMessage: "Mark All Read", id: "e7qqly" }, + GetVerified: { defaultMessage: "Get Verified", id: "eJj8HD" }, + Nip05: { + defaultMessage: `NIP-05 is a DNS based verification spec which helps to validate you as a real user.`, + id: "vZ4quW", + }, + Nip05Pros: { defaultMessage: `Getting NIP-05 verified can help:`, id: "thnRpU" }, + AvoidImpersonators: { defaultMessage: "Prevent fake accounts from imitating you", id: "iGT1eE" }, + EasierToFind: { defaultMessage: "Make your profile easier to find and share", id: "/d6vEc" }, + Funding: { defaultMessage: "Fund developers and platforms providing NIP-05 verification services", id: "a5UPxh" }, SnortSocialNip: { - defaultMessage: `Our very own NIP-05 verification service, help support the development of this site and get a shiny special badge on our site!`, id: 'k7sKNy', + defaultMessage: `Our very own NIP-05 verification service, help support the development of this site and get a shiny special badge on our site!`, + id: "k7sKNy", }, NostrPlebsNip: { - defaultMessage: `Nostr Plebs is one of the first NIP-05 providers in the space and offers a good collection of domains at reasonable prices`, id: '4Vmpt4', + defaultMessage: `Nostr Plebs is one of the first NIP-05 providers in the space and offers a good collection of domains at reasonable prices`, + id: "4Vmpt4", }, Relays: { - defaultMessage: "Relays", id: 'RoOyAh', + defaultMessage: "Relays", + id: "RoOyAh", }, RelaysCount: { - defaultMessage: "{n} Relays", id: 'QDFTjG', + defaultMessage: "{n} Relays", + id: "QDFTjG", }, - Bookmarks: { defaultMessage: "Bookmarks", id: 'nGBrvw' }, - BookmarksCount: { defaultMessage: "{n} Bookmarks", id: '2a2YiP' }, - KeyPlaceholder: { defaultMessage: "nsec, npub, nip-05, hex", id: 'B6H7eJ' }, + Bookmarks: { defaultMessage: "Bookmarks", id: "nGBrvw" }, + BookmarksCount: { defaultMessage: "{n} Bookmarks", id: "2a2YiP" }, + KeyPlaceholder: { defaultMessage: "nsec, npub, nip-05, hex", id: "B6H7eJ" }, }); diff --git a/packages/app/src/Pages/onboarding/discover.tsx b/packages/app/src/Pages/onboarding/discover.tsx index 8b1e1c26..a3022e25 100644 --- a/packages/app/src/Pages/onboarding/discover.tsx +++ b/packages/app/src/Pages/onboarding/discover.tsx @@ -13,7 +13,8 @@ export function Discover() {

setKey(e.target.value)} @@ -125,7 +127,8 @@ export function SignUp() { type="text" autoFocus={true} placeholder={formatMessage({ - defaultMessage: "Name or nym", id: 'aHje0o', + defaultMessage: "Name or nym", + id: "aHje0o", })} value={name} onChange={e => setName(e.target.value)} diff --git a/packages/app/src/Pages/settings/Cache.tsx b/packages/app/src/Pages/settings/Cache.tsx index 58f9e654..5d3c1b95 100644 --- a/packages/app/src/Pages/settings/Cache.tsx +++ b/packages/app/src/Pages/settings/Cache.tsx @@ -45,7 +45,8 @@ function CacheDetails({ cache, name }: { cache: FeedCache; name: ReactNode {name} , count2: , diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx index 0cbab73f..f30ac428 100644 --- a/packages/app/src/Pages/settings/Preferences.tsx +++ b/packages/app/src/Pages/settings/Preferences.tsx @@ -316,7 +316,8 @@ const PreferencesPage = () => { type="text" value={perf.imgProxyConfig?.url} placeholder={formatMessage({ - defaultMessage: "URL..", id: 'cQfLWb', + defaultMessage: "URL..", + id: "cQfLWb", description: "Placeholder text for imgproxy url textbox", })} onChange={e => @@ -340,7 +341,8 @@ const PreferencesPage = () => { type="password" value={perf.imgProxyConfig?.key} placeholder={formatMessage({ - defaultMessage: "Hex Key..", id: 'H+vHiz', + defaultMessage: "Hex Key..", + id: "H+vHiz", description: "Hexidecimal 'key' input for improxy", })} onChange={e => @@ -364,7 +366,8 @@ const PreferencesPage = () => { type="password" value={perf.imgProxyConfig?.salt} placeholder={formatMessage({ - defaultMessage: "Hex Salt..", id: 'TpgeGw', + defaultMessage: "Hex Salt..", + id: "TpgeGw", description: "Hexidecimal 'salt' input for imgproxy", })} onChange={e => diff --git a/packages/app/src/Pages/settings/Profile.tsx b/packages/app/src/Pages/settings/Profile.tsx index 09e426ae..7e9445d1 100644 --- a/packages/app/src/Pages/settings/Profile.tsx +++ b/packages/app/src/Pages/settings/Profile.tsx @@ -162,7 +162,10 @@ export default function ProfileSettings(props: ProfileSettingsProps) { disabled={readonly} /> - +
@@ -170,6 +170,7 @@ export function CloseRelays() {

- +

- +
- +

@@ -64,7 +74,8 @@ export default function LNForwardAddress({ handle }: { handle: ManageHandle }) { type="text" className="w-max" placeholder={formatMessage({ - defaultMessage: "LNURL or Lightning Address", id: 'yCLnBC', + defaultMessage: "LNURL or Lightning Address", + id: "yCLnBC", })} value={newAddress} onChange={e => setNewAddress(e.target.value)} diff --git a/packages/app/src/Pages/settings/handle/ListHandles.tsx b/packages/app/src/Pages/settings/handle/ListHandles.tsx index 00d8f189..b3b4a903 100644 --- a/packages/app/src/Pages/settings/handle/ListHandles.tsx +++ b/packages/app/src/Pages/settings/handle/ListHandles.tsx @@ -32,7 +32,8 @@ export default function ListHandles() { <> {handles.length === 0 && ( diff --git a/packages/app/src/Pages/settings/handle/TransferHandle.tsx b/packages/app/src/Pages/settings/handle/TransferHandle.tsx index 52d5c134..ea9899b9 100644 --- a/packages/app/src/Pages/settings/handle/TransferHandle.tsx +++ b/packages/app/src/Pages/settings/handle/TransferHandle.tsx @@ -39,7 +39,8 @@ export default function TransferHandle({ handle }: { handle: ManageHandle }) { type="text" className="w-max mr10" placeholder={formatMessage({ - defaultMessage: "Public key (npub/nprofile)", id: 'VR5eHw', + defaultMessage: "Public key (npub/nprofile)", + id: "VR5eHw", })} value={newKey} onChange={e => setNewKey(e.target.value)} diff --git a/packages/app/src/Pages/settings/messages.ts b/packages/app/src/Pages/settings/messages.ts index 0d691e87..f6f855e0 100644 --- a/packages/app/src/Pages/settings/messages.ts +++ b/packages/app/src/Pages/settings/messages.ts @@ -1,64 +1,69 @@ import { defineMessages } from "react-intl"; export default defineMessages({ - Profile: { defaultMessage: "Profile", id: 'itPgxd' }, - Relays: { defaultMessage: "Relays", id: 'RoOyAh' }, - Owner: { defaultMessage: "Owner", id: 'zINlao' }, - Software: { defaultMessage: "Software", id: 'r3C4x/' }, - Contact: { defaultMessage: "Contact", id: 'zFegDD' }, - Supports: { defaultMessage: "Supports", id: 'hY4lzx' }, - Remove: { defaultMessage: "Remove", id: 'G/yZLu' }, - Preferences: { defaultMessage: "Preferences", id: 'PCSt5T' }, - Donate: { defaultMessage: "Donate", id: '2IFGap' }, - LogOut: { defaultMessage: "Log Out", id: 'H0JBH6' }, - Theme: { defaultMessage: "Theme", id: 'Pe0ogR' }, - System: { defaultMessage: "System (Default)", id: 'P7FD0F' }, - Light: { defaultMessage: "Light", id: '3cc4Ct' }, - Dark: { defaultMessage: "Dark", id: 'tOdNiY' }, - DefaultRootTab: { defaultMessage: "Default Page", id: 'MWTx65' }, - Conversations: { defaultMessage: "Conversations", id: '1udzha' }, - Global: { defaultMessage: "Global", id: 'EWyQH5' }, - AutoloadMedia: { defaultMessage: "Automatically load media", id: 'xbVgIm' }, + Profile: { defaultMessage: "Profile", id: "itPgxd" }, + Relays: { defaultMessage: "Relays", id: "RoOyAh" }, + Owner: { defaultMessage: "Owner", id: "zINlao" }, + Software: { defaultMessage: "Software", id: "r3C4x/" }, + Contact: { defaultMessage: "Contact", id: "zFegDD" }, + Supports: { defaultMessage: "Supports", id: "hY4lzx" }, + Remove: { defaultMessage: "Remove", id: "G/yZLu" }, + Preferences: { defaultMessage: "Preferences", id: "PCSt5T" }, + Donate: { defaultMessage: "Donate", id: "2IFGap" }, + LogOut: { defaultMessage: "Log Out", id: "H0JBH6" }, + Theme: { defaultMessage: "Theme", id: "Pe0ogR" }, + System: { defaultMessage: "System (Default)", id: "P7FD0F" }, + Light: { defaultMessage: "Light", id: "3cc4Ct" }, + Dark: { defaultMessage: "Dark", id: "tOdNiY" }, + DefaultRootTab: { defaultMessage: "Default Page", id: "MWTx65" }, + Conversations: { defaultMessage: "Conversations", id: "1udzha" }, + Global: { defaultMessage: "Global", id: "EWyQH5" }, + AutoloadMedia: { defaultMessage: "Automatically load media", id: "xbVgIm" }, AutoloadMediaHelp: { - defaultMessage: "Media in notes will automatically be shown for selected people, otherwise only the link will show", id: 'TDR5ge', + defaultMessage: "Media in notes will automatically be shown for selected people, otherwise only the link will show", + id: "TDR5ge", }, - None: { defaultMessage: "None", id: '450Fty' }, - FollowsOnly: { defaultMessage: "Follows only", id: 'odFwjL' }, - All: { defaultMessage: "All", id: 'zQvVDJ' }, - ImgProxy: { defaultMessage: "Image proxy service", id: 'll3xBp' }, - ImgProxyHelp: { defaultMessage: "Use imgproxy to compress images", id: '4Z3t5i' }, - ServiceUrl: { defaultMessage: "Service URL", id: 'YDURw6' }, - ServiceKey: { defaultMessage: "Key", id: 'EcglP9' }, - ServiceSalt: { defaultMessage: "Salt", id: 'GFOoEE' }, - EnableReactions: { defaultMessage: "Enable reactions", id: 'YXA3AH' }, + None: { defaultMessage: "None", id: "450Fty" }, + FollowsOnly: { defaultMessage: "Follows only", id: "odFwjL" }, + All: { defaultMessage: "All", id: "zQvVDJ" }, + ImgProxy: { defaultMessage: "Image proxy service", id: "ll3xBp" }, + ImgProxyHelp: { defaultMessage: "Use imgproxy to compress images", id: "4Z3t5i" }, + ServiceUrl: { defaultMessage: "Service URL", id: "YDURw6" }, + ServiceKey: { defaultMessage: "Key", id: "EcglP9" }, + ServiceSalt: { defaultMessage: "Salt", id: "GFOoEE" }, + EnableReactions: { defaultMessage: "Enable reactions", id: "YXA3AH" }, EnableReactionsHelp: { - defaultMessage: "Reactions will be shown on every page, if disabled no reactions will be shown", id: 'PrsIg7', + defaultMessage: "Reactions will be shown on every page, if disabled no reactions will be shown", + id: "PrsIg7", }, - ConfirmReposts: { defaultMessage: "Confirm Reposts", id: '89q5wc' }, - ConfirmRepostsHelp: { defaultMessage: "Reposts need to be manually confirmed", id: 'uSV4Ti' }, - ShowLatest: { defaultMessage: "Automatically show latest notes", id: 'zvCDao' }, - ShowLatestHelp: { defaultMessage: "Notes will stream in real time into global and notes tab", id: 'a7TDNm' }, - FileUpload: { defaultMessage: "File upload service", id: 'mKh2HS' }, - FileUploadHelp: { defaultMessage: "Pick which upload service you want to upload attachments to", id: 'VOjC1i' }, - Default: { defaultMessage: "(Default)", id: 'rfuMjE' }, - DebugMenus: { defaultMessage: "Debug Menus", id: 'M3Oirc' }, - DebugMenusHelp: { defaultMessage: `Shows "Copy ID" and "Copy Event JSON" in the context menu on each message`, id: 'MBAYRO' }, - EditProfile: { defaultMessage: "Edit Profile", id: 'usAvMr' }, - About: { defaultMessage: "About", id: 'g5pX+a' }, - LnAddress: { defaultMessage: "LN Address", id: 'd7d0/x' }, - Avatar: { defaultMessage: "Avatar", id: 'VnXp8Z' }, - Banner: { defaultMessage: "Banner", id: '25V4l1' }, - Edit: { defaultMessage: "Edit", id: 'wEQDC6' }, - PrivateKey: { defaultMessage: "Your Private Key Is (do not share this with anyone)", id: 'qdGuQo' }, - Add: { defaultMessage: "Add", id: '2/2yg+' }, - AddRelays: { defaultMessage: "Add Relays", id: 'rT14Ow' }, - Name: { defaultMessage: "Name", id: 'HAlOn1' }, - Website: { defaultMessage: "Website", id: 'JkLHGw' }, - Save: { defaultMessage: "Save", id: 'jvo0vs' }, - DisplayName: { defaultMessage: "Display name", id: 'dOQCL8' }, - Buy: { defaultMessage: "Buy", id: 'EnCOBJ' }, - Nip05: { defaultMessage: "NIP-05", id: '7hp70g' }, - ReactionEmoji: { defaultMessage: "Reaction emoji", id: 'eHAneD' }, - ReactionEmojiHelp: { defaultMessage: "Emoji to send when reactiong to a note", id: 'gDzDRs' }, - SocialGraph: { defaultMessage: "Social Graph", id: 'CzHZoc' }, + ConfirmReposts: { defaultMessage: "Confirm Reposts", id: "89q5wc" }, + ConfirmRepostsHelp: { defaultMessage: "Reposts need to be manually confirmed", id: "uSV4Ti" }, + ShowLatest: { defaultMessage: "Automatically show latest notes", id: "zvCDao" }, + ShowLatestHelp: { defaultMessage: "Notes will stream in real time into global and notes tab", id: "a7TDNm" }, + FileUpload: { defaultMessage: "File upload service", id: "mKh2HS" }, + FileUploadHelp: { defaultMessage: "Pick which upload service you want to upload attachments to", id: "VOjC1i" }, + Default: { defaultMessage: "(Default)", id: "rfuMjE" }, + DebugMenus: { defaultMessage: "Debug Menus", id: "M3Oirc" }, + DebugMenusHelp: { + defaultMessage: `Shows "Copy ID" and "Copy Event JSON" in the context menu on each message`, + id: "MBAYRO", + }, + EditProfile: { defaultMessage: "Edit Profile", id: "usAvMr" }, + About: { defaultMessage: "About", id: "g5pX+a" }, + LnAddress: { defaultMessage: "LN Address", id: "d7d0/x" }, + Avatar: { defaultMessage: "Avatar", id: "VnXp8Z" }, + Banner: { defaultMessage: "Banner", id: "25V4l1" }, + Edit: { defaultMessage: "Edit", id: "wEQDC6" }, + PrivateKey: { defaultMessage: "Your Private Key Is (do not share this with anyone)", id: "qdGuQo" }, + Add: { defaultMessage: "Add", id: "2/2yg+" }, + AddRelays: { defaultMessage: "Add Relays", id: "rT14Ow" }, + Name: { defaultMessage: "Name", id: "HAlOn1" }, + Website: { defaultMessage: "Website", id: "JkLHGw" }, + Save: { defaultMessage: "Save", id: "jvo0vs" }, + DisplayName: { defaultMessage: "Display name", id: "dOQCL8" }, + Buy: { defaultMessage: "Buy", id: "EnCOBJ" }, + Nip05: { defaultMessage: "NIP-05", id: "7hp70g" }, + ReactionEmoji: { defaultMessage: "Reaction emoji", id: "eHAneD" }, + ReactionEmojiHelp: { defaultMessage: "Emoji to send when reactiong to a note", id: "gDzDRs" }, + SocialGraph: { defaultMessage: "Social Graph", id: "CzHZoc" }, }); diff --git a/packages/app/src/Pages/settings/wallet/Cashu.tsx b/packages/app/src/Pages/settings/wallet/Cashu.tsx index 116eb87f..ec457f64 100644 --- a/packages/app/src/Pages/settings/wallet/Cashu.tsx +++ b/packages/app/src/Pages/settings/wallet/Cashu.tsx @@ -38,7 +38,8 @@ const ConnectCashu = () => { } else { setError( formatMessage({ - defaultMessage: "Unknown error", id: 'qDwvZ4', + defaultMessage: "Unknown error", + id: "qDwvZ4", }), ); } diff --git a/packages/app/src/Pages/settings/wallet/LNC.tsx b/packages/app/src/Pages/settings/wallet/LNC.tsx index 95ed927e..78eac6b0 100644 --- a/packages/app/src/Pages/settings/wallet/LNC.tsx +++ b/packages/app/src/Pages/settings/wallet/LNC.tsx @@ -31,7 +31,8 @@ const ConnectLNC = () => { } else { setError( formatMessage({ - defaultMessage: "Unknown error", id: 'qDwvZ4', + defaultMessage: "Unknown error", + id: "qDwvZ4", }), ); } @@ -60,7 +61,7 @@ const ConnectLNC = () => {
setPairingPhrase(e.target.value)} @@ -81,7 +82,8 @@ const ConnectLNC = () => {

{
setWalletPassword(e.target.value)} diff --git a/packages/app/src/Pages/settings/wallet/LNDHub.tsx b/packages/app/src/Pages/settings/wallet/LNDHub.tsx index 8731be81..56f54b5f 100644 --- a/packages/app/src/Pages/settings/wallet/LNDHub.tsx +++ b/packages/app/src/Pages/settings/wallet/LNDHub.tsx @@ -36,7 +36,8 @@ const ConnectLNDHub = () => { } else { setError( formatMessage({ - defaultMessage: "Unknown error", id: 'qDwvZ4', + defaultMessage: "Unknown error", + id: "qDwvZ4", }), ); } diff --git a/packages/app/src/Pages/settings/wallet/NWC.tsx b/packages/app/src/Pages/settings/wallet/NWC.tsx index fa05b3a6..c04db480 100644 --- a/packages/app/src/Pages/settings/wallet/NWC.tsx +++ b/packages/app/src/Pages/settings/wallet/NWC.tsx @@ -36,7 +36,8 @@ const ConnectNostrWallet = () => { } else { setError( formatMessage({ - defaultMessage: "Unknown error", id: 'qDwvZ4', + defaultMessage: "Unknown error", + id: "qDwvZ4", }), ); } @@ -65,7 +66,8 @@ const ConnectNostrWallet = () => { {error && {error}}

diff --git a/packages/app/src/Pages/subscribe/ManageSubscription.tsx b/packages/app/src/Pages/subscribe/ManageSubscription.tsx index 92359d44..d2f4f88f 100644 --- a/packages/app/src/Pages/subscribe/ManageSubscription.tsx +++ b/packages/app/src/Pages/subscribe/ManageSubscription.tsx @@ -53,7 +53,8 @@ export default function ManageSubscriptionPage() { {subs.length === 0 && (

diff --git a/packages/app/src/Pages/subscribe/RenewSub.tsx b/packages/app/src/Pages/subscribe/RenewSub.tsx index c00646ac..5bdc369f 100644 --- a/packages/app/src/Pages/subscribe/RenewSub.tsx +++ b/packages/app/src/Pages/subscribe/RenewSub.tsx @@ -60,7 +60,8 @@ export function RenewSub({ sub: s }: { sub?: Subscription }) { renew(sub.id, months)}> {sub.state === "expired" ? ( setInvoice("")} title={formatMessage({ - defaultMessage: "Pay for subscription", id: 'Mrpkot', + defaultMessage: "Pay for subscription", + id: "Mrpkot", })} /> {error && {mapSubscriptionErrorCode(error)}} diff --git a/packages/app/src/Pages/subscribe/SubscriptionCard.tsx b/packages/app/src/Pages/subscribe/SubscriptionCard.tsx index b159af9d..28e3f6a1 100644 --- a/packages/app/src/Pages/subscribe/SubscriptionCard.tsx +++ b/packages/app/src/Pages/subscribe/SubscriptionCard.tsx @@ -60,7 +60,8 @@ export default function SubscriptionCard({ sub }: { sub: Subscription }) { : 

{mapPlanName(a.id)}

(

  • diff --git a/packages/app/src/Tasks/Nip5Task.tsx b/packages/app/src/Tasks/Nip5Task.tsx index 9eb591af..93bee4aa 100644 --- a/packages/app/src/Tasks/Nip5Task.tsx +++ b/packages/app/src/Tasks/Nip5Task.tsx @@ -14,7 +14,8 @@ export class Nip5Task extends BaseUITask { return (

    diff --git a/packages/app/src/Tasks/NoticeZapPool.tsx b/packages/app/src/Tasks/NoticeZapPool.tsx index d087f4b1..7617c0a3 100644 --- a/packages/app/src/Tasks/NoticeZapPool.tsx +++ b/packages/app/src/Tasks/NoticeZapPool.tsx @@ -14,7 +14,8 @@ export class NoticeZapPoolDefault extends BaseUITask { <>

    { + if ("serviceWorker" in navigator) { + window.addEventListener("load", () => { //registerValidSW(ServiceWorkerURL); }); } @@ -37,7 +37,7 @@ async function registerValidSW(swUrl: string) { */ export async function unregister() { - if ('serviceWorker' in navigator) { + if ("serviceWorker" in navigator) { const registration = await navigator.serviceWorker.ready; await registration.unregister(); } diff --git a/packages/app/src/translations/en.json b/packages/app/src/translations/en.json index 471fc1d5..1d8a8cb7 100644 --- a/packages/app/src/translations/en.json +++ b/packages/app/src/translations/en.json @@ -344,6 +344,7 @@ "eJj8HD": "Get Verified", "eSzf2G": "A single zap of {nIn} sats will allocate {nOut} sats to the zap pool.", "eXT2QQ": "Group Chat", + "egib+2": "{n,plural,=1{& {n} other} other{& {n} others}}", "fBI91o": "Zap", "fBlba3": "Thanks for using {site}, please consider donating if you can.", "fOksnD": "Can't vote because LNURL service does not support zaps", @@ -468,7 +469,6 @@ "v8lolG": "Start chat", "vB3oQ/": "Must be a contact list or pubkey list", "vN5UH8": "Profile Image", - "vOKedj": "{n,plural,=1{& {n} other} other{& {n} others}}", "vZ4quW": "NIP-05 is a DNS based verification spec which helps to validate you as a real user.", "vhlWFg": "Poll Options", "vlbWtt": "Get a free one", diff --git a/packages/app/vite.config.ts b/packages/app/vite.config.ts index 10c69575..9c5ebfc3 100644 --- a/packages/app/vite.config.ts +++ b/packages/app/vite.config.ts @@ -1,7 +1,7 @@ -import react from '@vitejs/plugin-react'; -import { VitePWA } from 'vite-plugin-pwa'; -import { visualizer } from 'rollup-plugin-visualizer'; -import { defineConfig, type PluginOption } from 'vite'; +import react from "@vitejs/plugin-react"; +import { VitePWA } from "vite-plugin-pwa"; +import { visualizer } from "rollup-plugin-visualizer"; +import { defineConfig } from "vite"; import appConfig from "config"; @@ -9,24 +9,24 @@ export default defineConfig({ plugins: [ react(), VitePWA({ - strategies: 'injectManifest', - srcDir: 'src', - filename: 'service-worker.ts', + strategies: "injectManifest", + srcDir: "src", + filename: "service-worker.ts", devOptions: { enabled: true, - type: 'module', - } + type: "module", + }, }), visualizer({ open: true, gzipSize: true, - filename: 'dist/stats.html', - } as PluginOption), + filename: "dist/stats.html", + }), ], - assetsInclude: ['**/*.md'], + assetsInclude: ["**/*.md"], resolve: { alias: { - '@': '/src', + "@": "/src", }, }, define: { diff --git a/packages/system/src/pow.ts b/packages/system/src/pow.ts index 292aef32..4811eece 100644 --- a/packages/system/src/pow.ts +++ b/packages/system/src/pow.ts @@ -18,8 +18,8 @@ export class PowWorker implements PowMiner { constructor(workerPath: string) { this.#worker = new Worker(workerPath, { - type: 'module', - name: 'POW', + type: "module", + name: "POW", }); this.#worker.onerror = ev => { console.error(ev);