OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Redirect to the registration page if there's a 3PID invite 

Fixes https://github.com/vector-im/element-web/issues/15130
pull/21833/head
Travis Ralston 2020-09-11 19:53:52 -06:00
parent dc44b9ef59
commit b1cdf1bc9a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/MatrixChat.tsx
View File

@ -413,9 +413,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}); });
}).then((loadedSession) => { }).then((loadedSession) => {
if (!loadedSession) { if (!loadedSession) {
// fall back to showing the welcome screen // fall back to showing the welcome screen... unless we have a 3pid invite pending
if (ThreepidInviteStore.instance.pickBestInvite()) {
dis.dispatch({action: 'start_registration'});
} else {
dis.dispatch({action: "view_welcome_page"}); dis.dispatch({action: "view_welcome_page"});
} }
}
}); });
// Note we don't catch errors from this: we catch everything within // Note we don't catch errors from this: we catch everything within
// loadSession as there's logic there to ask the user if they want // loadSession as there's logic there to ask the user if they want