verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Changed Navigation to props.navigation

This commit is contained in:
Reinaldo Neto 2021-07-06 11:33:33 -03:00
parent 20ebc34b20
commit 986abe9a61
1 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/views/RoomView/index.js
View File

@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { CommonActions } from '@react-navigation/native';
import { Text, View, InteractionManager } from 'react-native'; import { Text, View, InteractionManager } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import parse from 'url-parse'; import parse from 'url-parse';
@ -57,7 +58,6 @@ import RoomClass from '../../lib/methods/subscriptions/room';
import { getUserSelector } from '../../selectors/login'; import { getUserSelector } from '../../selectors/login';
import { CONTAINER_TYPES } from '../../lib/methods/actions'; import { CONTAINER_TYPES } from '../../lib/methods/actions';
import Banner from './Banner'; import Banner from './Banner';
import Navigation from '../../lib/Navigation';
import SafeAreaView from '../../containers/SafeAreaView'; import SafeAreaView from '../../containers/SafeAreaView';
import { withDimensions } from '../../dimensions'; import { withDimensions } from '../../dimensions';
import { getHeaderTitlePosition } from '../../containers/Header'; import { getHeaderTitlePosition } from '../../containers/Header';
@ -736,9 +736,10 @@ class RoomView extends React.Component {
} }
handleRoomRemoved = ({ rid }) => { handleRoomRemoved = ({ rid }) => {
const { navigation } = this.props;
const { room } = this.state; const { room } = this.state;
if (rid === this.rid) { if (rid === this.rid) {
Navigation.navigate('RoomsListView'); navigation.navigate('RoomsListView');
showErrorAlert(I18n.t('You_were_removed_from_channel', { channel: RocketChat.getRoomTitle(room) }), I18n.t('Oops')); showErrorAlert(I18n.t('You_were_removed_from_channel', { channel: RocketChat.getRoomTitle(room) }), I18n.t('Oops'));
} }
} }
@ -850,7 +851,8 @@ class RoomView extends React.Component {
}); });
} }
return Navigation.reset({ return navigation.dispatch(
CommonActions.reset({
index: 2, index: 2,
routes: [ routes: [
{ {
@ -879,7 +881,8 @@ class RoomView extends React.Component {
jumpToMessageId: item.id jumpToMessageId: item.id
} }
}] }]
}); })
);
} }
if (item.tlm) { if (item.tlm) {
@ -899,7 +902,8 @@ class RoomView extends React.Component {
}); });
} }
return Navigation.reset({ return navigation.dispatch(
CommonActions.reset({
index: 1, index: 1,
routes: [ routes: [
{ {
@ -918,7 +922,8 @@ class RoomView extends React.Component {
jumpToMessageId: item.id jumpToMessageId: item.id
} }
}] }]
}); })
);
} }
callJitsi = () => { callJitsi = () => {