imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4

Browse source 
 Conflicts:
	src/components/structures/MatrixChat.tsx
This commit is contained in:
Michael Telatynski 2020-04-30 17:41:14 +01:00
commit 9c916cc544
90 changed files with 2032 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/structures/MatrixChat.tsx
View file

@ -1215,6 +1215,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
*/
private async onLoggedIn() {
ThemeController.isLogin = false;
this.themeWatcher.recheck();
this.setStateForNewView({ view: Views.LOGGED_IN });
// If a specific screen is set to be shown after login, show that above
// all else, as it probably means the user clicked on something already.