Skip to content

[FIX] In-app notification showing wrong content on channels #1400

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 1 commit into from
Nov 19, 2019
Merged

[FIX] In-app notification showing wrong content on channels #1400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions app/notifications/inApp/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ const styles = StyleSheet.create({
flexDirection: 'row',
alignItems: 'center'
},
inner: {
flex: 1
},
avatar: {
marginRight: 10
},
Expand Down Expand Up @@ -160,7 +163,7 @@ class NotificationBadge extends React.Component {
if (!rid) {
return;
}
const name = type === 'p' ? payload.name : payload.sender.username;
const name = type === 'd' ? payload.sender.username : payload.name;
await navigation.navigate('RoomsListView');
navigation.navigate('RoomView', {
rid, name, t: type, prid
Expand All @@ -174,7 +177,7 @@ class NotificationBadge extends React.Component {
} = this.props;
const { message, payload } = notification;
const { type } = payload;
const name = type === 'p' ? payload.name : payload.sender.username;
const name = type === 'd' ? payload.sender.username : payload.name;

let top = 0;
if (isIOS) {
Expand All @@ -186,8 +189,6 @@ class NotificationBadge extends React.Component {
}
}

const maxWidthMessage = window.width - 110;

const translateY = this.animatedValue.interpolate({
inputRange: [0, 1],
outputRange: [-top - ROW_HEIGHT, top]
Expand All @@ -202,9 +203,9 @@ class NotificationBadge extends React.Component {
>
<>
<Avatar text={name} size={AVATAR_SIZE} type={type} baseUrl={baseUrl} style={styles.avatar} userId={userId} token={token} />
<View>
<Text style={styles.roomName}>{name}</Text>
<Text style={[styles.message, { maxWidth: maxWidthMessage }]} numberOfLines={1}>{message}</Text>
<View style={styles.inner}>
<Text style={styles.roomName} numberOfLines={1}>{name}</Text>
<Text style={styles.message} numberOfLines={1}>{message}</Text>
</View>
</>
</Touchable>
Expand Down