PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

open a to_device request in a modal instead of the right panel 1st room

Browse source
This commit is contained in:
Bruno Windels 2020-01-31 17:16:27 +01:00
parent 049a6d2064
commit 1a5bed5a10
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/components/views/toasts/VerificationRequestToast.js
View file

@ -78,28 +78,28 @@ export default class VerificationRequestToast extends React.PureComponent {
// no room id for to_device requests
const cli = MatrixClientPeg.get();
try {
await request.accept();
if (request.channel.roomId) {
dis.dispatch({
action: 'view_room',
room_id: request.channel.roomId,
should_peek: false,
});
} else {
dis.dispatch({
action: 'view_room',
room_id: cli.getRooms()[0].roomId,
should_peek: false,
action: "set_right_panel_phase",
phase: RIGHT_PANEL_PHASES.EncryptionPanel,
refireParams: {
verificationRequest: request,
member: cli.getUser(request.otherUserId),
},
});
}
await request.accept();
dis.dispatch({
action: "set_right_panel_phase",
phase: RIGHT_PANEL_PHASES.EncryptionPanel,
refireParams: {
} else {
const VerificationRequestDialog = sdk.getComponent("views.dialogs.VerificationRequestDialog");
Modal.createTrackedDialog('Incoming Verification', '', VerificationRequestDialog, {
verificationRequest: request,
member: cli.getUser(request.otherUserId),
},
});
}, null, /* priority = */ false, /* static = */ true);
}
// } else if (request.channel.deviceId && request.verifier) {
// // show to_device verifications in dialog still
// const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");