verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: minor tweaks

This commit is contained in:
AlexAlexandre 2021-12-07 16:50:32 -03:00
parent 2493cf3f59
commit bd34344a0c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/RoomView/List/index.tsx
View File

@ -6,6 +6,7 @@ import { dequal } from 'dequal';
import { Value, event } from 'react-native-reanimated'; import { Value, event } from 'react-native-reanimated';
import { Observable, Subscription } from 'rxjs'; import { Observable, Subscription } from 'rxjs';
import Model from '@nozbe/watermelondb/Model'; import Model from '@nozbe/watermelondb/Model';
import { StackNavigationProp } from '@react-navigation/stack';
import database from '../../../lib/database'; import database from '../../../lib/database';
import RocketChat from '../../../lib/rocketchat'; import RocketChat from '../../../lib/rocketchat';
@ -18,6 +19,7 @@ import debounce from '../../../utils/debounce';
import { compareServerVersion, methods } from '../../../lib/utils'; import { compareServerVersion, methods } from '../../../lib/utils';
import List from './List'; import List from './List';
import NavBottomFAB from './NavBottomFAB'; import NavBottomFAB from './NavBottomFAB';
import { ChatsStackParamList } from '../../../stacks/types';
const QUERY_SIZE = 50; const QUERY_SIZE = 50;
@ -43,7 +45,7 @@ interface IRoomListContainerProps {
hideSystemMessages: any[]; hideSystemMessages: any[];
tunread: []; tunread: [];
ignored: []; ignored: [];
navigation: any; // TODO - change this after merge with navigation ts; navigation: StackNavigationProp<ChatsStackParamList>;
showMessageInMainThread: boolean; showMessageInMainThread: boolean;
serverVersion: string; serverVersion: string;
t?: string; // TODO - verify if this props exist t?: string; // TODO - verify if this props exist
@ -130,9 +132,9 @@ class ListContainer extends React.Component<IRoomListContainerProps, any> {
componentWillUnmount() { componentWillUnmount() {
this.unsubscribeMessages(); this.unsubscribeMessages();
if (this.onEndReached && this.onEndReached.stop) { // if (this.onEndReached && this.onEndReached.stop) {
this.onEndReached.stop(); // this.onEndReached.stop();
} // }
if (this.unsubscribeFocus) { if (this.unsubscribeFocus) {
this.unsubscribeFocus(); this.unsubscribeFocus();
} }
@ -176,6 +178,7 @@ class ListContainer extends React.Component<IRoomListContainerProps, any> {
Q.experimentalTake(this.count) Q.experimentalTake(this.count)
]; ];
if (!showMessageInMainThread) { if (!showMessageInMainThread) {
// @ts-ignore
whereClause.push(Q.or(Q.where('tmid', null), Q.where('tshow', Q.eq(true)))); whereClause.push(Q.or(Q.where('tmid', null), Q.where('tshow', Q.eq(true))));
} }
this.messagesObservable = db.collections this.messagesObservable = db.collections
@ -196,7 +199,7 @@ class ListContainer extends React.Component<IRoomListContainerProps, any> {
* hide system message is enabled * hide system message is enabled
*/ */
if (compareServerVersion(serverVersion, '3.16.0', methods.lowerThan) || hideSystemMessages.length) { if (compareServerVersion(serverVersion, '3.16.0', methods.lowerThan) || hideSystemMessages.length) {
messages = messages.filter(m => !m.t || !hideSystemMessages?.includes(m.t)); messages = messages.filter((m: { t: string }) => !m.t || !hideSystemMessages?.includes(m.t));
} }
if (this.mounted) { if (this.mounted) {