Commit abf8b857 authored by Harrison Healey's avatar Harrison Healey Committed by Joram Wilander
Browse files

Fixed linking between teams from channels with the same name (#1283)

parent 8b60e562
...@@ -215,6 +215,7 @@ export default class ChannelIdentifierRouter extends React.PureComponent { ...@@ -215,6 +215,7 @@ export default class ChannelIdentifierRouter extends React.PureComponent {
match: PropTypes.shape({ match: PropTypes.shape({
params: PropTypes.shape({ params: PropTypes.shape({
identifier: PropTypes.string.isRequired, identifier: PropTypes.string.isRequired,
team: PropTypes.string.isRequired,
}).isRequired, }).isRequired,
}).isRequired, }).isRequired,
} }
...@@ -226,7 +227,8 @@ export default class ChannelIdentifierRouter extends React.PureComponent { ...@@ -226,7 +227,8 @@ export default class ChannelIdentifierRouter extends React.PureComponent {
} }
UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
if (this.props.match.params.identifier !== nextProps.match.params.identifier) { if (this.props.match.params.team !== nextProps.match.params.team ||
this.props.match.params.identifier !== nextProps.match.params.identifier) {
onChannelByIdentifierEnter(nextProps); onChannelByIdentifierEnter(nextProps);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment