forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
[🐴] show deleted account for `missing.invalid` (#4014)
* show deleted account for `missing.invalid`
* sigh
+26
-14
+11
-4
src/screens/Messages/Conversation/index.tsx
+11
-4
src/screens/Messages/Conversation/index.tsx
···
147
147
const navigation = useNavigation<NavigationProp>()
148
148
const convoState = useConvo()
149
149
150
+
const isDeletedAccount = profile?.handle === 'missing.invalid'
151
+
const displayName = isDeletedAccount
152
+
? 'Deleted Account'
153
+
: profile?.displayName
154
+
150
155
const onPressBack = useCallback(() => {
151
156
if (isWeb) {
152
157
navigation.replace('Messages')
···
197
202
<Text
198
203
style={[a.text_lg, a.font_bold, a.pt_sm, a.pb_2xs]}
199
204
numberOfLines={1}>
200
-
{profile.displayName}
201
-
</Text>
202
-
<Text style={[t.atoms.text_contrast_medium]} numberOfLines={1}>
203
-
@{profile.handle}
205
+
{displayName}
204
206
</Text>
207
+
{!isDeletedAccount && (
208
+
<Text style={[t.atoms.text_contrast_medium]} numberOfLines={1}>
209
+
@{profile.handle}
210
+
</Text>
211
+
)}
205
212
</View>
206
213
) : (
207
214
<>
+15
-10
src/screens/Messages/List/ChatListItem.tsx
+15
-10
src/screens/Messages/List/ChatListItem.tsx
···
29
29
const {currentAccount} = useSession()
30
30
const menuControl = useMenuControl()
31
31
const {gtMobile} = useBreakpoints()
32
+
const otherUser = convo.members.find(
33
+
member => member.did !== currentAccount?.did,
34
+
)
35
+
const isDeletedAccount = otherUser?.handle === 'missing.invalid'
36
+
const displayName = isDeletedAccount
37
+
? 'Deleted Account'
38
+
: otherUser?.displayName || otherUser?.handle
32
39
33
40
let lastMessage = _(msg`No messages yet`)
34
41
let lastMessageSentAt: string | null = null
···
43
50
if (ChatBskyConvoDefs.isDeletedMessageView(convo.lastMessage)) {
44
51
lastMessage = _(msg`Message deleted`)
45
52
}
46
-
47
-
const otherUser = convo.members.find(
48
-
member => member.did !== currentAccount?.did,
49
-
)
50
53
51
54
const navigation = useNavigation<NavigationProp>()
52
55
const [showActions, setShowActions] = React.useState(false)
···
113
116
numberOfLines={1}
114
117
style={[{maxWidth: '85%'}, web([a.leading_normal])]}>
115
118
<Text style={[a.text_md, t.atoms.text, a.font_bold]}>
116
-
{otherUser.displayName || otherUser.handle}
119
+
{displayName}
117
120
</Text>
118
121
</Text>
119
122
{lastMessageSentAt && (
···
147
150
</Text>
148
151
)}
149
152
</View>
150
-
<Text
151
-
numberOfLines={1}
152
-
style={[a.text_sm, t.atoms.text_contrast_medium, a.pb_xs]}>
153
-
@{otherUser.handle}
154
-
</Text>
153
+
{!isDeletedAccount && (
154
+
<Text
155
+
numberOfLines={1}
156
+
style={[a.text_sm, t.atoms.text_contrast_medium, a.pb_xs]}>
157
+
@{otherUser.handle}
158
+
</Text>
159
+
)}
155
160
<Text
156
161
numberOfLines={2}
157
162
style={[