diff --git a/src/views/user/emoji-packs.tsx b/src/views/user/emoji-packs.tsx index efb50dd57..b60b94db8 100644 --- a/src/views/user/emoji-packs.tsx +++ b/src/views/user/emoji-packs.tsx @@ -1,5 +1,5 @@ import { useOutletContext } from "react-router-dom"; -import { Divider, Flex, Heading, SimpleGrid, Text } from "@chakra-ui/react"; +import { Heading, SimpleGrid } from "@chakra-ui/react"; import { useAdditionalRelayContext } from "../../providers/additional-relay-context"; import useTimelineLoader from "../../hooks/use-timeline-loader"; @@ -33,10 +33,9 @@ export default function UserEmojiPacksTab() { {packs.length > 0 && ( <> - + Created packs - {packs.map((pack) => ( @@ -46,10 +45,9 @@ export default function UserEmojiPacksTab() { )} {favorites.length > 0 && ( <> - + Favorite packs - {favorites.map((event) => ( diff --git a/src/views/user/reports.tsx b/src/views/user/reports.tsx index 632f8948b..509ebb9b9 100644 --- a/src/views/user/reports.tsx +++ b/src/views/user/reports.tsx @@ -1,6 +1,7 @@ import { useRef } from "react"; import { Flex, Text } from "@chakra-ui/react"; import { useOutletContext } from "react-router-dom"; +import { Kind } from "nostr-tools"; import { NoteLink } from "../../components/note-link"; import { UserLink } from "../../components/user-link"; @@ -24,13 +25,15 @@ function ReportEvent({ report }: { report: NostrEvent }) { useRegisterIntersectionEntity(ref, getEventUID(report)); return ( - + + + reported {reportedEvent ? ( <> {reportedPubkey && ( <> - From + by )} @@ -38,7 +41,7 @@ function ReportEvent({ report }: { report: NostrEvent }) { ) : ( )} - {reason} + {reason && for {reason}} ); } @@ -47,10 +50,16 @@ export default function UserReportsTab() { const { pubkey } = useOutletContext() as { pubkey: string }; const contextRelays = useAdditionalRelayContext(); - const timeline = useTimelineLoader(`${pubkey}-reports`, contextRelays, { - authors: [pubkey], - kinds: [1984], - }); + const timeline = useTimelineLoader(`${pubkey}-reports`, contextRelays, [ + { + authors: [pubkey], + kinds: [Kind.Report], + }, + { + "#p": [pubkey], + kinds: [Kind.Report], + }, + ]); const events = useSubject(timeline.timeline); const callback = useTimelineCurserIntersectionCallback(timeline);