diff --git a/packages/app/src/Element/Event/Create/NoteCreator.tsx b/packages/app/src/Element/Event/Create/NoteCreator.tsx index f11928da..a4be4fe9 100644 --- a/packages/app/src/Element/Event/Create/NoteCreator.tsx +++ b/packages/app/src/Element/Event/Create/NoteCreator.tsx @@ -152,16 +152,18 @@ export function NoteCreator() { const ev = await buildNote(); if (ev) { const events = (note.otherEvents ?? []).concat(ev); - events.map(a => sendEventToRelays(system, a, note.selectedCustomRelays, r => { - if (CONFIG.noteCreatorToast) { - r.forEach(rr => { - Toastore.push({ - element: , - expire: unixNow() + (rr.ok ? 5 : 55555) - }) - }); - } - })); + events.map(a => + sendEventToRelays(system, a, note.selectedCustomRelays, r => { + if (CONFIG.noteCreatorToast) { + r.forEach(rr => { + Toastore.push({ + element: , + expire: unixNow() + (rr.ok ? 5 : 55555), + }); + }); + } + }), + ); note.update(n => n.reset()); } } @@ -327,18 +329,18 @@ export function NoteCreator() { onChange={e => { note.update( v => - (v.selectedCustomRelays = - // set false if all relays selected - e.target.checked && + (v.selectedCustomRelays = + // set false if all relays selected + e.target.checked && note.selectedCustomRelays && note.selectedCustomRelays.length == a.length - 1 - ? undefined - : // otherwise return selectedCustomRelays with target relay added / removed - a.filter(el => - el === r - ? e.target.checked - : !note.selectedCustomRelays || note.selectedCustomRelays.includes(el), - )), + ? undefined + : // otherwise return selectedCustomRelays with target relay added / removed + a.filter(el => + el === r + ? e.target.checked + : !note.selectedCustomRelays || note.selectedCustomRelays.includes(el), + )), ); }} /> @@ -407,9 +409,9 @@ export function NoteCreator() { onChange={e => note.update( v => - (v.zapSplits = arr.map((vv, ii) => - ii === i ? { ...vv, weight: Number(e.target.value) } : vv, - )), + (v.zapSplits = arr.map((vv, ii) => + ii === i ? { ...vv, weight: Number(e.target.value) } : vv, + )), ) } /> @@ -656,4 +658,4 @@ export function NoteCreator() { {noteCreatorForm()} ); -} \ No newline at end of file +} diff --git a/packages/app/src/Element/Event/Create/OkResponseRow.tsx b/packages/app/src/Element/Event/Create/OkResponseRow.tsx index f34435c9..fc2088f1 100644 --- a/packages/app/src/Element/Event/Create/OkResponseRow.tsx +++ b/packages/app/src/Element/Event/Create/OkResponseRow.tsx @@ -11,50 +11,52 @@ import { useState } from "react"; import { useIntl } from "react-intl"; export function OkResponseRow({ rsp }: { rsp: OkResponse }) { - const [r, setResult] = useState(rsp); - const { formatMessage } = useIntl(); - const { publisher, system } = useEventPublisher(); - const login = useLogin(); + const [r, setResult] = useState(rsp); + const { formatMessage } = useIntl(); + const { publisher, system } = useEventPublisher(); + const login = useLogin(); - async function removeRelayFromResult(r: OkResponse) { - if (publisher) { - removeRelay(login, unwrap(sanitizeRelayUrl(r.relay))); - await saveRelays(system, publisher, login.relays.item); - } + async function removeRelayFromResult(r: OkResponse) { + if (publisher) { + removeRelay(login, unwrap(sanitizeRelayUrl(r.relay))); + await saveRelays(system, publisher, login.relays.item); } + } - async function retryPublish(r: OkResponse) { - const rsp = await system.WriteOnceToRelay(unwrap(sanitizeRelayUrl(r.relay)), r.event); - setResult(rsp); - } + async function retryPublish(r: OkResponse) { + const rsp = await system.WriteOnceToRelay(unwrap(sanitizeRelayUrl(r.relay)), r.event); + setResult(rsp); + } - return
- -
- {getRelayName(r.relay)} - {r.message && {r.message}} + return ( +
+ +
+ {getRelayName(r.relay)} + {r.message && {r.message}} +
+ {!r.ok && ( +
+ retryPublish(r)} + className="p4 br-compact flex items-center secondary" + title={formatMessage({ + defaultMessage: "Retry publishing", + id: "9kSari", + })}> + + + removeRelayFromResult(r)} + className="p4 br-compact flex items-center secondary" + title={formatMessage({ + defaultMessage: "Remove from my relays", + id: "UJTWqI", + })}> + +
- {!r.ok && ( -
- retryPublish(r)} - className="p4 br-compact flex items-center secondary" - title={formatMessage({ - defaultMessage: "Retry publishing", - id: "9kSari", - })}> - - - removeRelayFromResult(r)} - className="p4 br-compact flex items-center secondary" - title={formatMessage({ - defaultMessage: "Remove from my relays", - id: "UJTWqI", - })}> - - -
- )} + )}
-} \ No newline at end of file + ); +} diff --git a/packages/app/src/Toaster.css b/packages/app/src/Toaster.css index 4cfe2df7..cdf1e710 100644 --- a/packages/app/src/Toaster.css +++ b/packages/app/src/Toaster.css @@ -6,4 +6,4 @@ flex-direction: column-reverse; z-index: 9999; gap: 4px; -} \ No newline at end of file +}