[MM-38310][MM-38313][MM-38315] Fixed some issues caused by having multiple tabs (#1722)
* [MM-38313][MM-38315] Fixed some issues caused by having multiple tabs * [MM-38310] Make sure notification navigates to correct tab
This commit is contained in:
@@ -102,7 +102,7 @@ export default class MainPage extends React.PureComponent<Props, State> {
|
||||
this.threeDotMenu = React.createRef();
|
||||
|
||||
const firstServer = this.props.teams.find((team) => team.order === 0);
|
||||
const firstTab = firstServer?.tabs.find((tab) => tab.order === (firstServer.lastActiveTab || 0)) || firstServer?.tabs[0];
|
||||
const firstTab = firstServer?.tabs.find((tab, index) => index === (firstServer.lastActiveTab || 0)) || firstServer?.tabs[0];
|
||||
|
||||
this.state = {
|
||||
activeServerName: firstServer?.name,
|
||||
|
@@ -101,7 +101,7 @@ export default class TabBar extends React.PureComponent<Props> {
|
||||
as='li'
|
||||
id={`teamTabItem${index}`}
|
||||
draggable={false}
|
||||
title={tab.name}
|
||||
title={getTabDisplayName(tab.name as TabType)}
|
||||
className={classNames('teamTabItem', {
|
||||
active: this.props.activeTabName === tab.name,
|
||||
dragging: snapshot.isDragging,
|
||||
|
Reference in New Issue
Block a user