Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion mobile/views/Channel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ class Channel extends Component<Props> {
} else {
title = 'Loading channel...';
}
if (navigation.state.params.title === title) return;
const oldTitle = navigation.getParam('title', null);
if (oldTitle && oldTitle === title) return;
navigation.setParams({ title });
};

Expand Down
3 changes: 2 additions & 1 deletion mobile/views/Community/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ class Community extends Component<Props> {
} else {
title = 'Loading community...';
}
if (navigation.state.params.title === title) return;
const oldTitle = navigation.getParam('title', null);
if (oldTitle && oldTitle === title) return;
navigation.setParams({ title });
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ class DirectMessageThread extends Component<Props> {
let title = directMessageThread
? sentencify(directMessageThread.participants.map(({ name }) => name))
: 'Loading thread...';
if (navigation.state.params.title === title) return;
const oldTitle = navigation.getParam('title', null);
if (oldTitle && oldTitle === title) return;
navigation.setParams({ title });
};

Expand Down
3 changes: 1 addition & 2 deletions mobile/views/DirectMessageThread/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// @flow
import React from 'react';
import compose from 'recompose/compose';
import idx from 'idx';
import Text from '../../components/Text';
import { withCurrentUser } from '../../components/WithCurrentUser';
import DirectMessageThread from './components/DirectMessageThread';
Expand All @@ -17,8 +16,8 @@ type Props = {

class DirectMessageThreadView extends React.Component<Props> {
render() {
const id = idx(this.props, props => props.navigation.state.params.id);
const { currentUser, navigation } = this.props;
const id = navigation.getParam('id', null);
if (!id) return <Text>Non-existant DM thread</Text>;

if (!currentUser) return null;
Expand Down
8 changes: 4 additions & 4 deletions mobile/views/TabBar/BaseStack.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@ const BaseStack = {
Thread: {
screen: withMappedNavigationProps(Thread),
navigationOptions: ({ navigation }: NavigationScreenConfigProps) => ({
headerTitle: navigation.state.params.title || null,
headerTitle: navigation.getParam('title', null),
tabBarVisible: false,
}),
},
Community: {
screen: withMappedNavigationProps(Community),
navigationOptions: ({ navigation }: NavigationScreenConfigProps) => ({
headerTitle: navigation.state.params.title || null,
headerTitle: navigation.getParam('title', null),
}),
},
Channel: {
screen: withMappedNavigationProps(Channel),
navigationOptions: ({ navigation }: NavigationScreenConfigProps) => ({
headerTitle: navigation.state.params.title || null,
headerTitle: navigation.getParam('title', null),
}),
},
User: {
screen: withMappedNavigationProps(User),
navigationOptions: ({ navigation }: NavigationScreenConfigProps) => ({
headerTitle: navigation.state.params.title || null,
headerTitle: navigation.getParam('title', null),
}),
},
};
Expand Down
5 changes: 2 additions & 3 deletions mobile/views/TabBar/DirectMessageStack.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// @flow
import { createStackNavigator } from 'react-navigation';
import idx from 'idx';
import BaseStack from './BaseStack';
import DirectMessages from '../DirectMessages';
import DirectMessageThread from '../DirectMessageThread';
Expand All @@ -10,13 +9,13 @@ const DMStack = createStackNavigator(
DirectMessages: {
screen: DirectMessages,
navigationOptions: ({ navigation }) => ({
headerTitle: idx(navigation, _ => _.state.params.title) || 'Messages',
headerTitle: navigation.getParam('title', 'Messages'),
}),
},
DirectMessageThread: {
screen: DirectMessageThread,
navigationOptions: ({ navigation }) => ({
headerTitle: idx(navigation, _ => _.state.params.title) || '',
headerTitle: navigation.getParam('title', null),
tabBarVisible: false,
}),
},
Expand Down
3 changes: 2 additions & 1 deletion mobile/views/Thread/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ class Thread extends Component<Props> {
} else {
title = 'Loading thread...';
}
if (navigation.state.params.title === title) return;
const oldTitle = navigation.getParam('title', null);
if (oldTitle && oldTitle === title) return;
navigation.setParams({ title });
};

Expand Down
4 changes: 3 additions & 1 deletion mobile/views/User/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ class User extends Component<Props, State> {
} else {
title = 'Loading user...';
}
if (navigation.state.params.title === title) return;

const oldTitle = navigation.getParam('title', null);
if (oldTitle && oldTitle === title) return;
navigation.setParams({ title });
};

Expand Down