mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Merge branch 'main' into HEAD

Browse source
This commit is contained in:
Scott Nonnenberg 2024-07-30 16:46:34 -07:00
commit d57d0cea19
1135 changed files with 264116 additions and 302492 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ts/components/StoryViewsNRepliesModal.tsx
View file

@ -51,6 +51,7 @@ const MESSAGE_DEFAULT_PROPS = {
isMessageRequestAccepted: true,
isSelected: false,
isSelectMode: false,
isSMS: false,
onToggleSelect: shouldNeverBeCalled,
onReplyToMessage: shouldNeverBeCalled,
kickOffAttachmentDownload: shouldNeverBeCalled,
@ -236,6 +237,7 @@ export function StoryViewsNRepliesModal({
getPreferredBadge={getPreferredBadge}
i18n={i18n}
inputApi={inputApiRef}
isActive
isFormattingEnabled={isFormattingEnabled}
moduleClassName="StoryViewsNRepliesModal__input"
onCloseLinkPreview={noop}
@ -258,8 +260,15 @@ export function StoryViewsNRepliesModal({
}
platform={platform}
sendCounter={0}
sortedGroupMembers={sortedGroupMembers}
skinTone={skinTone ?? null}
sortedGroupMembers={sortedGroupMembers ?? null}
theme={ThemeType.dark}
conversationId={null}
draftBodyRanges={null}
draftEditMessage={null}
large={null}
shouldHidePopovers={null}
linkPreviewResult={null}
>
<EmojiButton
className="StoryViewsNRepliesModal__emoji-button"
@ -359,7 +368,7 @@ export function StoryViewsNRepliesModal({
<div>
<Avatar
acceptedMessageRequest={view.recipient.acceptedMessageRequest}
avatarPath={view.recipient.avatarPath}
avatarUrl={view.recipient.avatarUrl}
badge={undefined}
color={getAvatarColor(view.recipient.color)}
conversationType="direct"
@ -433,18 +442,16 @@ export function StoryViewsNRepliesModal({
<Modal
modalName="StoryViewsNRepliesModal"
i18n={i18n}
moduleClassName="StoryViewsNRepliesModal"
moduleClassName={classNames({
StoryViewsNRepliesModal: true,
'StoryViewsNRepliesModal--group': Boolean(group),
})}
onClose={onClose}
padded={false}
useFocusTrap={Boolean(composerElement)}
theme={Theme.Dark}
>
<div
className={classNames({
StoryViewsNRepliesModal__content: true,
'StoryViewsNRepliesModal--group': Boolean(group),
})}
>
<div className="StoryViewsNRepliesModal__content">
{tabsElement || (
<>
{viewsElement || repliesElement}
@ -543,7 +550,7 @@ function ReplyOrReactionMessage({
<div className="StoryViewsNRepliesModal__reaction--container">
<Avatar
acceptedMessageRequest={reply.author.acceptedMessageRequest}
avatarPath={reply.author.avatarPath}
avatarUrl={reply.author.avatarUrl}
badge={getPreferredBadge(reply.author.badges)}
color={getAvatarColor(reply.author.color)}
conversationType="direct"