diff --git a/app/icons/bell-filled.svg b/app/icons/bell-filled.svg new file mode 100644 index 0000000000..5f040218e0 --- /dev/null +++ b/app/icons/bell-filled.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/soapbox/components/link.tsx b/app/soapbox/components/link.tsx new file mode 100644 index 0000000000..7455547e6b --- /dev/null +++ b/app/soapbox/components/link.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import { Link as Comp, LinkProps } from 'react-router-dom'; + +const Link = (props: LinkProps) => ( + +); + +export default Link; \ No newline at end of file diff --git a/app/soapbox/features/chats/components/chat-list-item.tsx b/app/soapbox/features/chats/components/chat-list-item.tsx index bbe7c469da..1864cef8b4 100644 --- a/app/soapbox/features/chats/components/chat-list-item.tsx +++ b/app/soapbox/features/chats/components/chat-list-item.tsx @@ -121,7 +121,7 @@ const ChatListItem: React.FC = ({ chat, chatSilence, onC {chatSilence ? ( - + ) : null} {chat.last_message && ( diff --git a/app/soapbox/features/chats/components/chat-message-list-intro.tsx b/app/soapbox/features/chats/components/chat-message-list-intro.tsx index 790bd51887..d977a24dc5 100644 --- a/app/soapbox/features/chats/components/chat-message-list-intro.tsx +++ b/app/soapbox/features/chats/components/chat-message-list-intro.tsx @@ -4,6 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { openModal } from 'soapbox/actions/modals'; import { initReport } from 'soapbox/actions/reports'; +import Link from 'soapbox/components/link'; import { Avatar, Button, HStack, Icon, Stack, Text } from 'soapbox/components/ui'; import { useChatContext } from 'soapbox/contexts/chat-context'; import { useAppDispatch } from 'soapbox/hooks'; @@ -60,7 +61,10 @@ const ChatMessageListIntro = () => { } > - + + + + {needsAcceptance ? ( <> @@ -69,7 +73,9 @@ const ChatMessageListIntro = () => { {intl.formatMessage(messages.intro)} ) : ( - @{chat.account.acct} + + @{chat.account.acct} + )} diff --git a/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx b/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx index 87d37e6bd0..064ffe61e0 100644 --- a/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx +++ b/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx @@ -3,7 +3,6 @@ import { defineMessages, useIntl } from 'react-intl'; import { blockAccount } from 'soapbox/actions/accounts'; import { openModal } from 'soapbox/actions/modals'; -import { initReport } from 'soapbox/actions/reports'; import List, { ListItem } from 'soapbox/components/list'; import { Avatar, Divider, HStack, Icon, IconButton, Menu, MenuButton, MenuItem, MenuList, Stack, Text, Toggle } from 'soapbox/components/ui'; import VerificationBadge from 'soapbox/components/verification_badge'; @@ -56,8 +55,6 @@ const ChatPageMain = () => { })); }; - const handleReportChat = () => dispatch(initReport(chat?.account as any)); - useEffect(() => { if (chat?.id) { fetchChatSilence(); @@ -147,17 +144,6 @@ const ChatPageMain = () => { - -
- - {intl.formatMessage(messages.reportUser, { acct: chat.account.acct })} -
-
- { })); }; - const handleReportChat = () => dispatch(initReport(chat?.account as any)); - useEffect(() => { if (chat?.id) { fetchChatSilence(); @@ -120,11 +116,6 @@ const ChatSettings = () => { {intl.formatMessage(messages.blockUser, { acct: chat.account.acct })} - -