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

[FIX] Cancelling when adding a server (#4565) 

* TC-110 [FIX] Cancelling when adding a server

* Removing the close button when connecting to a server
This commit is contained in:
Reinaldo Neto 2022-11-01 14:09:00 -03:00 committed by Diego Mello
parent 76c4ce74cd
commit 522c9da4d4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/NewServerView/index.tsx
View File

@ -116,12 +116,21 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
} }
} }
componentDidUpdate(prevProps: Readonly<INewServerViewProps>) {
if (prevProps.connecting !== this.props.connecting) {
this.setHeader();
}
}
setHeader = () => { setHeader = () => {
const { previousServer, navigation } = this.props; const { previousServer, navigation, connecting } = this.props;
if (previousServer) { if (previousServer) {
return navigation.setOptions({ return navigation.setOptions({
headerTitle: I18n.t('Workspaces'), headerTitle: I18n.t('Workspaces'),
headerLeft: () => <HeaderButton.CloseModal navigation={navigation} onPress={this.close} testID='new-server-view-close' /> headerLeft: () =>
!connecting ? (
<HeaderButton.CloseModal navigation={navigation} onPress={this.close} testID='new-server-view-close' />
) : null
}); });
} }
@ -162,6 +171,7 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
close = () => { close = () => {
const { dispatch, previousServer } = this.props; const { dispatch, previousServer } = this.props;
dispatch(inviteLinksClear()); dispatch(inviteLinksClear());
if (previousServer) { if (previousServer) {
dispatch(selectServerRequest(previousServer)); dispatch(selectServerRequest(previousServer));