Skip to content

Commit 5bed02b

Browse files
committed
Skip e2ee warn logout prompt if user has no megolm sessions to lose
1 parent e404934 commit 5bed02b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/components/structures/UserMenu.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,18 @@ export default class UserMenu extends React.Component<IProps, IState> {
190190
this.setState({contextMenuPosition: null}); // also close the menu
191191
};
192192

193-
private onSignOutClick = (ev: ButtonEvent) => {
193+
private onSignOutClick = async (ev: ButtonEvent) => {
194194
ev.preventDefault();
195195
ev.stopPropagation();
196196

197-
Modal.createTrackedDialog('Logout from LeftPanel', '', LogoutDialog);
197+
const cli = MatrixClientPeg.get();
198+
if (!cli || !cli.isCryptoEnabled() || !(await cli.exportRoomKeys())?.length) {
199+
// log out without user prompt if they have no local megolm sessions
200+
dis.dispatch({action: 'logout'});
201+
} else {
202+
Modal.createTrackedDialog('Logout from LeftPanel', '', LogoutDialog);
203+
}
204+
198205
this.setState({contextMenuPosition: null}); // also close the menu
199206
};
200207

0 commit comments

Comments
 (0)