Skip to content

Commit 9ff9fa3

Browse files
committed
continued feedback changes on v3
1 parent 24fcb29 commit 9ff9fa3

File tree

6 files changed

+27
-14
lines changed

6 files changed

+27
-14
lines changed

src/components/Attachment/Card.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ const styles = StyleSheet.create({
7070
},
7171
description: {
7272
fontSize: 12,
73+
marginHorizontal: 8,
7374
},
7475
title: {
7576
fontSize: 12,
77+
marginHorizontal: 8,
7678
},
7779
});
7880

src/components/Attachment/Gallery.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ const styles = StyleSheet.create({
8888
moreImagesContainer: {
8989
alignItems: 'center',
9090
justifyContent: 'center',
91+
margin: 1,
9192
},
9293
moreImagesText: { color: '#FFFFFF', fontSize: 26, fontWeight: '700' },
9394
});

src/components/Message/Message.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -845,11 +845,13 @@ const MessageWithContext = <
845845
handleReaction: reactionsEnabled ? handleReaction : undefined,
846846
images: attachments.images,
847847
message,
848-
messageActions: error
849-
? messageActionsProp || [retry, editMessage, deleteMessage]
848+
messageActions: messageActionsProp
849+
? messageActionsProp
850+
: error
851+
? [retry, editMessage, deleteMessage]
850852
: messageReactions
851853
? undefined
852-
: messageActionsProp || canModifyMessage
854+
: canModifyMessage
853855
? isThreadMessage
854856
? message.text
855857
? [editMessage, copyMessage, flagMessage, deleteMessage]

src/components/Message/MessageSimple/MessageContent.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ export const MessageContentWithContext = <
284284
? transparent
285285
: grey_gainsboro;
286286

287+
const repliesCurveColor =
288+
isMyMessage && !error ? backgroundColor : grey_whisper;
289+
287290
return (
288291
<TouchableOpacity
289292
activeOpacity={0.7}
@@ -322,7 +325,7 @@ export const MessageContentWithContext = <
322325
style={[
323326
styles.replyBorder,
324327
{
325-
borderColor: grey_whisper,
328+
borderColor: repliesCurveColor,
326329
height: borderRadiusL,
327330
left: alignment === 'left' ? 0 : undefined,
328331
right: alignment === 'right' ? 0 : undefined,
@@ -408,7 +411,12 @@ export const MessageContentWithContext = <
408411
</View>
409412
)}
410413
</View>
411-
{repliesEnabled && <MessageReplies noBorder={noBorder} />}
414+
{repliesEnabled && (
415+
<MessageReplies
416+
noBorder={noBorder}
417+
repliesCurveColor={repliesCurveColor}
418+
/>
419+
)}
412420
<MessageFooter
413421
alignment={alignment}
414422
formattedDate={getDateText(formatDate)}

src/components/Message/MessageSimple/MessageReplies.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ export type MessageRepliesPropsWithContext<
7474
MessagesContextValue<At, Ch, Co, Ev, Me, Re, Us>,
7575
'MessageRepliesAvatars'
7676
> &
77-
Pick<TranslationContextValue, 't'> & { noBorder?: boolean };
77+
Pick<TranslationContextValue, 't'> & {
78+
noBorder?: boolean;
79+
repliesCurveColor?: string;
80+
};
7881

7982
const MessageRepliesWithContext = <
8083
At extends UnknownType = DefaultAttachmentType,
@@ -94,13 +97,14 @@ const MessageRepliesWithContext = <
9497
noBorder,
9598
onLongPress,
9699
onOpenThread,
100+
repliesCurveColor,
97101
t,
98102
threadList,
99103
} = props;
100104

101105
const {
102106
theme: {
103-
colors: { accent_blue, grey_whisper },
107+
colors: { accent_blue },
104108
messageSimple: {
105109
replies: { container, leftCurve, messageRepliesText, rightCurve },
106110
},
@@ -116,7 +120,7 @@ const MessageRepliesWithContext = <
116120
{!noBorder && (
117121
<View
118122
style={[
119-
{ borderColor: grey_whisper },
123+
{ borderColor: repliesCurveColor },
120124
styles.messageRepliesCurve,
121125
styles.leftMessageRepliesCurve,
122126
leftCurve,
@@ -152,7 +156,7 @@ const MessageRepliesWithContext = <
152156
{!noBorder && (
153157
<View
154158
style={[
155-
{ borderColor: grey_whisper },
159+
{ borderColor: repliesCurveColor },
156160
styles.messageRepliesCurve,
157161
styles.rightMessageRepliesCurve,
158162
rightCurve,

src/contexts/themeContext/utils/theme.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -815,11 +815,7 @@ export const defaultTheme: Theme = {
815815
height: 16,
816816
width: 16,
817817
},
818-
markdown: {
819-
autolink: {
820-
textDecorationLine: 'underline',
821-
},
822-
},
818+
markdown: {},
823819
messageUser: {
824820
fontSize: 12,
825821
fontWeight: '700',

0 commit comments

Comments
 (0)