Skip to content
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

Beta #2273

Closed
wants to merge 21 commits into from
Closed

Beta #2273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1d96fed
Update WatermelonDB to 0.18.0
diegolmello Jul 2, 2020
749f1a3
Low onEndReachedThreshold
diegolmello Jul 3, 2020
97b8aa3
Query experiment
diegolmello Jul 3, 2020
073b0d5
Merge branch 'develop' into improvement.sort-native
diegolmello Jul 7, 2020
600df4b
QUERY_SIZE
diegolmello Jul 7, 2020
629f4b4
Query or fetch data
diegolmello Jul 7, 2020
66eadfd
Reorder class functions
diegolmello Jul 7, 2020
81208eb
Reset variables
diegolmello Jul 7, 2020
ded2d72
Hide system messages
diegolmello Jul 7, 2020
28549a0
Merge branch 'develop' into improvement.sort-native
diegolmello Jul 9, 2020
ba51597
Change this.count behaviour
diegolmello Jul 9, 2020
5161ab7
Starting on RoomsListView
diegolmello Jul 9, 2020
24e96ac
unsubscribeQuery
diegolmello Jul 9, 2020
4ca3351
onEndReached
diegolmello Jul 9, 2020
41e1af0
Separate queries
diegolmello Jul 9, 2020
6803ca1
Reusable where clause
diegolmello Jul 9, 2020
af14a09
Refactoring
diegolmello Jul 9, 2020
1f57d86
[CHORE] Improve reply notification code (iOS)
djorkaeffalexandre Jul 9, 2020
7b56b52
Refactor RoomItem to accept item as prop
diegolmello Jul 9, 2020
39f79bc
Comment RoomItem tests just so jest passes
diegolmello Jul 9, 2020
3ed15e8
Merge branch 'chore.reply-notification-ios' into beta
diegolmello Jul 9, 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
131 changes: 0 additions & 131 deletions __tests__/__snapshots__/Storyshots.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4994,137 +4994,6 @@ exports[`Storyshots Message list message 1`] = `
</RCTScrollView>
`;

exports[`Storyshots RoomItem list roomitem 1`] = `
<RCTScrollView
style={
Object {
"backgroundColor": "#efeff4",
}
}
>
<View>
<Text
style={
Array [
Object {
"fontSize": 20,
"fontWeight": "300",
"marginLeft": 10,
"marginTop": 30,
},
Object {
"backgroundColor": "#ffffff",
"color": "#0d0e12",
},
undefined,
]
}
>
Basic
</Text>
View
<Text
style={
Array [
Object {
"fontSize": 20,
"fontWeight": "300",
"marginLeft": 10,
"marginTop": 30,
},
Object {
"backgroundColor": "#ffffff",
"color": "#0d0e12",
},
undefined,
]
}
>
User
</Text>
View
View
<Text
style={
Array [
Object {
"fontSize": 20,
"fontWeight": "300",
"marginLeft": 10,
"marginTop": 30,
},
Object {
"backgroundColor": "#ffffff",
"color": "#0d0e12",
},
undefined,
]
}
>
Type
</Text>
View
View
View
View
View
<Text
style={
Array [
Object {
"fontSize": 20,
"fontWeight": "300",
"marginLeft": 10,
"marginTop": 30,
},
Object {
"backgroundColor": "#ffffff",
"color": "#0d0e12",
},
undefined,
]
}
>
Alerts
</Text>
View
View
View
View
View
View
View
View
View
<Text
style={
Array [
Object {
"fontSize": 20,
"fontWeight": "300",
"marginLeft": 10,
"marginTop": 30,
},
Object {
"backgroundColor": "#ffffff",
"color": "#0d0e12",
},
undefined,
]
}
>
Last Message
</Text>
View
View
View
View
View
View
</View>
</RCTScrollView>
`;

exports[`Storyshots UiKitMessage list uikitmessage 1`] = `
<RCTSafeAreaView
emulateUnlessSupported={true}
Expand Down
6 changes: 6 additions & 0 deletions app/lib/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,12 @@ const RocketChat = {
return other && other.length ? other[0] : me;
},

isRead(item) {
let isUnread = item.archived !== true && item.open === true; // item is not archived and not opened
isUnread = isUnread && (item.unread > 0 || item.alert === true); // either its unread count > 0 or its alert
return !isUnread;
},

isGroupChat(room) {
return (room.uids && room.uids.length > 2) || (room.usernames && room.usernames.length > 2);
},
Expand Down
Loading