[MM-23452][MM-36861] Fixed some configuration issues (#1725)

* [MM-23452] Show last used server and tab correctly when restarting the app

* [MM-36861] Ensure handleConfigUpdate runs
This commit is contained in:
Devin Binnie
2021-09-10 10:48:00 -04:00
committed by GitHub
parent 54d82493bf
commit 082c95b094
9 changed files with 40 additions and 23 deletions

View File

@@ -61,6 +61,7 @@ enum Status {
type Props = {
teams: TeamWithTabs[];
lastActiveTeam?: number;
moveTabs: (teamName: string, originalOrder: number, newOrder: number) => number | undefined;
openMenu: () => void;
darkMode: boolean;
@@ -101,8 +102,12 @@ export default class MainPage extends React.PureComponent<Props, State> {
this.topBar = React.createRef();
this.threeDotMenu = React.createRef();
const firstServer = this.props.teams.find((team) => team.order === 0);
const firstTab = firstServer?.tabs.find((tab, index) => index === (firstServer.lastActiveTab || 0)) || firstServer?.tabs[0];
const firstServer = this.props.teams.find((team) => team.order === this.props.lastActiveTeam || 0);
let firstTab = firstServer?.tabs.find((tab) => tab.order === firstServer.lastActiveTab || 0);
if (firstTab?.isClosed) {
const openTabs = firstServer?.tabs.filter((tab) => !tab.isClosed) || [];
firstTab = openTabs?.find((e) => e.order === 0) || openTabs[0];
}
this.state = {
activeServerName: firstServer?.name,

View File

@@ -122,6 +122,7 @@ class Root extends React.PureComponent<Record<string, never>, State> {
return (
<MainPage
teams={config.teams}
lastActiveTeam={config.lastActiveTeam}
moveTabs={this.moveTabs}
openMenu={this.openMenu}
darkMode={config.darkMode}