Skip to content

[FIX] Read receipt crashing in some cases #2464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 2 commits into from
Sep 15, 2020
Merged

[FIX] Read receipt crashing in some cases #2464

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
733b8a8
[FIX] Read receipt crashing in some cases
diegolmello Sep 14, 2020
564e9d8
Merge branch 'develop' into fix.read-receipt
diegolmello Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions app/views/ReadReceiptView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ class ReadReceiptView extends React.Component {
Message_TimeFormat, user: { id: userId, token }, baseUrl, theme
} = this.props;
const time = moment(item.ts).format(Message_TimeFormat);
if (!item?.user?.username) {
return null;
}
return (
<View style={[styles.itemContainer, { backgroundColor: themes[theme].backgroundColor }]}>
<Avatar
Expand All @@ -112,7 +115,7 @@ class ReadReceiptView extends React.Component {
<View style={styles.infoContainer}>
<View style={styles.item}>
<Text style={[styles.name, { color: themes[theme].titleText }]}>
{item.user.name}
{item?.user?.name}
</Text>
<Text style={{ color: themes[theme].auxiliaryText }}>
{time}
Expand Down Expand Up @@ -142,25 +145,23 @@ class ReadReceiptView extends React.Component {
return (
<SafeAreaView testID='read-receipt-view' theme={theme}>
<StatusBar theme={theme} />
<View>
{loading
? <ActivityIndicator theme={theme} />
: (
<FlatList
data={receipts}
renderItem={this.renderItem}
ItemSeparatorComponent={this.renderSeparator}
style={[
styles.list,
{
backgroundColor: themes[theme].chatComponentBackground,
borderColor: themes[theme].separatorColor
}
]}
keyExtractor={item => item._id}
/>
)}
</View>
{loading
? <ActivityIndicator theme={theme} />
: (
<FlatList
data={receipts}
renderItem={this.renderItem}
ItemSeparatorComponent={this.renderSeparator}
style={[
styles.list,
{
backgroundColor: themes[theme].chatComponentBackground,
borderColor: themes[theme].separatorColor
}
]}
keyExtractor={item => item._id}
/>
)}
</SafeAreaView>
);
}
Expand Down
3 changes: 1 addition & 2 deletions app/views/ReadReceiptView/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export default StyleSheet.create({
padding: 10
},
list: {
...sharedStyles.separatorVertical,
marginVertical: 10
...sharedStyles.separatorVertical
}
});