Bluesky app fork with some witchin' additions 💫
witchsky.app
bluesky
fork
client
Fix some minor chat issues (#10332)
+15
-6
+5
-2
src/components/AvatarBubbles.tsx
+5
-2
src/components/AvatarBubbles.tsx
···
28
28
size = 'large',
29
29
}: Props) {
30
30
const {currentAccount} = useSession()
31
-
const profiles = allProfiles.filter(p => p.did !== currentAccount?.did)
31
+
const profiles =
32
+
allProfiles.length > 2
33
+
? allProfiles.filter(p => p.did !== currentAccount?.did)
34
+
: allProfiles
32
35
const containerSize =
33
36
typeof size === 'number'
34
37
? size
···
86
89
let avatars = (
87
90
<>
88
91
<AvatarBubble
89
-
profile={profiles[0] ?? allProfiles[0]}
92
+
profile={profiles[0]}
90
93
scale={p0}
91
94
size={76}
92
95
x={-2}
+7
-1
src/components/dms/MessageItem.tsx
+7
-1
src/components/dms/MessageItem.tsx
···
168
168
isInCluster && !effectiveFirstInCluster && !effectiveLastInCluster
169
169
170
170
const hasReactions = message.reactions && message.reactions.length > 0
171
+
const prevHasReactions =
172
+
prevIsMessage &&
173
+
prevMessage.reactions != null &&
174
+
prevMessage.reactions.length > 0
171
175
const squaredBottomCorner =
172
176
!hasReactions &&
173
177
isInCluster &&
174
178
(isInMiddleOfCluster || effectiveFirstInCluster)
175
179
const squaredTopCorner =
176
-
isInCluster && (isInMiddleOfCluster || effectiveLastInCluster)
180
+
!prevHasReactions &&
181
+
isInCluster &&
182
+
(isInMiddleOfCluster || effectiveLastInCluster)
177
183
178
184
const pendingColor = t.palette.primary_300
179
185
+2
-3
src/screens/Messages/ConversationSettings.tsx
+2
-3
src/screens/Messages/ConversationSettings.tsx
···
919
919
920
920
function SettingsHeaderPlaceholder() {
921
921
const t = useTheme()
922
-
const {t: l} = useLingui()
923
922
924
923
return (
925
924
<View style={[a.px_xl, a.py_4xl, a.border_b, t.atoms.border_contrast_low]}>
···
928
927
</View>
929
928
<Text
930
929
style={[a.text_2xl, a.font_bold, a.text_center, a.pt_lg, t.atoms.text]}>
931
-
{l`…`}
930
+
…
932
931
</Text>
933
932
<Text
934
933
style={[
···
1015
1014
a.pt_xs,
1016
1015
t.atoms.text,
1017
1016
]}>
1018
-
{l`…`}
1017
+
…
1019
1018
</Text>
1020
1019
</View>
1021
1020
)