[FIX] Load messages issue when trying to get ts from empty results (#…

…2185)
RocketChat · Jun 12, 2020 · 48be676 · 48be676
1 parent 2cc599c
commit 48be676
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/views/RoomView/List.js b/app/views/RoomView/List.js
@@ -171,7 +171,7 @@ class List extends React.Component {
 
 	onEndReached = debounce(async() => {
 		const {
-			loading, end, messages, latest = messages[messages.length - 1].ts
+			loading, end, messages, latest = messages[messages.length - 1]?.ts
 		} = this.state;
 		if (loading || end) {
 			return;
@@ -188,7 +188,7 @@ class List extends React.Component {
 				result = await RocketChat.loadMessagesForRoom({ rid, t, latest });
 			}
 
-			this.setState({ end: result.length < 50, loading: false, latest: result[result.length - 1].ts }, () => this.loadMoreMessages(result));
+			this.setState({ end: result.length < 50, loading: false, latest: result[result.length - 1]?.ts }, () => this.loadMoreMessages(result));
 		} catch (e) {
 			this.setState({ loading: false });
 			log(e);