diff --git a/packages/app/src/Components/Event/Note/ReactionsModal.tsx b/packages/app/src/Components/Event/Note/ReactionsModal.tsx index 962c8753..09c6d96c 100644 --- a/packages/app/src/Components/Event/Note/ReactionsModal.tsx +++ b/packages/app/src/Components/Event/Note/ReactionsModal.tsx @@ -1,11 +1,8 @@ -import "./ReactionsModal.css"; - import { NostrLink, TaggedNostrEvent } from "@snort/system"; import { useEventReactions, useReactions } from "@snort/system-react"; -import { useMemo, useState } from "react"; +import { Fragment, useMemo, useState } from "react"; import { FormattedMessage, MessageDescriptor, useIntl } from "react-intl"; -import CloseButton from "@/Components/Button/CloseButton"; import Icon from "@/Components/Icons/Icon"; import Modal from "@/Components/Modal/Modal"; import TabSelectors, { Tab } from "@/Components/TabSelectors/TabSelectors"; @@ -58,45 +55,42 @@ const ReactionsModal = ({ onClose, event, initialTab = 0 }: ReactionsModalProps) const [tab, setTab] = useState(tabs[initialTab]); const renderReactionItem = (ev: TaggedNostrEvent, icon: string, iconClass?: string, size?: number) => ( -
-
+ +
-
+ ); return ( - - -
-

- -

+ +
+
-
- {tab.value === 0 && likes.map(ev => renderReactionItem(ev, "heart-solid", "text-heart"))} - {tab.value === 1 && - zaps.map( - z => - z.sender && ( -
- - {z.content}
} - link={z.anonZap ? "" : undefined} - overrideUsername={ - z.anonZap ? formatMessage({ defaultMessage: "Anonymous", id: "LXxsbk" }) : undefined - } - /> -
- ), - )} - {tab.value === 2 && sortedReposts.map(ev => renderReactionItem(ev, "repost", "text-repost", 16))} - {tab.value === 3 && dislikes.map(ev => renderReactionItem(ev, "dislike"))} +
+
+ {tab.value === 0 && likes.map(ev => renderReactionItem(ev, "heart-solid", "text-heart"))} + {tab.value === 1 && + zaps.map( + z => + z.sender && ( + + + {z.content}
} + link={z.anonZap ? "" : undefined} + overrideUsername={z.anonZap ? formatMessage({ defaultMessage: "Anonymous" }) : undefined} + /> + + ), + )} + {tab.value === 2 && sortedReposts.map(ev => renderReactionItem(ev, "repost", "text-repost", 16))} + {tab.value === 3 && dislikes.map(ev => renderReactionItem(ev, "dislike"))} +
); diff --git a/packages/app/src/Components/Event/ZapsSummary.tsx b/packages/app/src/Components/Event/ZapsSummary.tsx index e2ea8c9c..5b0874c1 100644 --- a/packages/app/src/Components/Event/ZapsSummary.tsx +++ b/packages/app/src/Components/Event/ZapsSummary.tsx @@ -26,13 +26,9 @@ export const ZapsSummary = ({ zaps, onClick }: ZapsSummaryProps) => { }; return ( -
-
-
- {}} /> - {zaps.length > 3 &&
+{zaps.length - 3}
} -
-
+
+ {}} /> + {zaps.length > 3 &&
+{zaps.length - 3}
}
); }; diff --git a/packages/app/src/Components/TabSelectors/TabSelectors.css b/packages/app/src/Components/TabSelectors/TabSelectors.css deleted file mode 100644 index d0e8b380..00000000 --- a/packages/app/src/Components/TabSelectors/TabSelectors.css +++ /dev/null @@ -1,60 +0,0 @@ -.tabs { - display: flex; - align-items: center; - flex-direction: row; - overflow-x: scroll; - -ms-overflow-style: none; - /* for Internet Explorer, Edge */ - scrollbar-width: none; - /* Firefox */ - white-space: nowrap; - gap: 8px; -} - -.tabs::-webkit-scrollbar { - display: none; -} - -.light .tab { - border: 1px solid var(--border-color); -} - -.tab.active { - background: var(--gray-superdark); -} - -.light .tab.active { - background: #fff; - border-color: #bfc6d6; -} - -.tab { - background: var(--gray-ultradark); - color: var(--font-secondary-color); - border-radius: 100px; - font-weight: 600; - font-size: 16px; - padding: 6px 12px; - display: flex; - align-items: center; - justify-items: center; - gap: 6px; -} - -.tab.active { - color: var(--font-color); -} - -.tabs > div { - cursor: pointer; -} - -.tab.disabled { - opacity: 0.3; - cursor: not-allowed; - pointer-events: none; -} - -.tab:hover { - box-shadow: rgba(0, 0, 0, 0.2) 0 1px 3px; -} diff --git a/packages/app/src/Components/TabSelectors/TabSelectors.tsx b/packages/app/src/Components/TabSelectors/TabSelectors.tsx index b01d4544..93ed4160 100644 --- a/packages/app/src/Components/TabSelectors/TabSelectors.tsx +++ b/packages/app/src/Components/TabSelectors/TabSelectors.tsx @@ -1,5 +1,4 @@ -import "./TabSelectors.css"; - +import classNames from "classnames"; import { ReactNode } from "react"; import useHorizontalScroll from "@/Hooks/useHorizontalScroll"; @@ -23,7 +22,14 @@ interface TabElementProps extends Omit { export const TabSelector = ({ t, tab, setTab }: TabElementProps) => { return (
!t.disabled && setTab(t)}> {t.text}
@@ -33,7 +39,7 @@ export const TabSelector = ({ t, tab, setTab }: TabElementProps) => { const TabSelectors = ({ tabs, tab, setTab }: TabsProps) => { const horizontalScroll = useHorizontalScroll(); return ( -
+
{tabs.map((t, index) => ( ))} diff --git a/packages/app/src/Components/User/AvatarGroup.tsx b/packages/app/src/Components/User/AvatarGroup.tsx index 8c8f5b91..16e082e9 100644 --- a/packages/app/src/Components/User/AvatarGroup.tsx +++ b/packages/app/src/Components/User/AvatarGroup.tsx @@ -5,7 +5,7 @@ import ProfileImage from "@/Components/User/ProfileImage"; export function AvatarGroup({ ids, onClick }: { ids: HexKey[]; onClick?: () => void }) { return ids.map((a, index) => ( -
0 ? "-ml-5" : ""}`} key={a} style={{ zIndex: ids.length - index }}> +
0 ? "-ml-4" : ""}`} key={a} style={{ zIndex: ids.length - index }}>
));