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

Change new session toast to unverified

Browse source 
This also changes text to show the device ID and name in the toast.

Fixes https://github.com/vector-im/riot-web/issues/11916
This commit is contained in:
J. Ryan Stinnett 2020-01-29 15:00:01 +00:00
parent 6d47f9620f
commit f12fe984e5
4 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/components/views/toasts/NewSessionToast.js → src/components/views/toasts/UnverifiedSessionToast.js
View file

@ -24,11 +24,11 @@ import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
import FormButton from '../elements/FormButton';
import { replaceableComponent } from '../../../utils/replaceableComponent';
@replaceableComponent("views.toasts.VerifySessionToast")
export default class VerifySessionToast extends React.PureComponent {
@replaceableComponent("views.toasts.UnverifiedSessionToast")
export default class UnverifiedSessionToast extends React.PureComponent {
static propTypes = {
toastKey: PropTypes.string.isRequired,
deviceId: PropTypes.string,
device: PropTypes.object.isRequired,
};
_onLaterClick = () => {
@ -36,9 +36,7 @@ export default class VerifySessionToast extends React.PureComponent {
};
_onReviewClick = async () => {
const cli = MatrixClientPeg.get();
const device = await cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
const { device } = this.props;
Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
userId: MatrixClientPeg.get().getUserId(),
@ -47,8 +45,16 @@ export default class VerifySessionToast extends React.PureComponent {
};
render() {
const { device } = this.props;
return (<div>
<div className="mx_Toast_description">{_t("Review & verify your new session")}</div>
<div className="mx_Toast_description">
<span className="mx_Toast_deviceName">
{device.getDisplayName()}
</span> <span className="mx_Toast_deviceID">
({device.deviceId})
</span>
</div>
<div className="mx_Toast_buttons" aria-live="off">
<FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
<FormButton label={_t("Review")} onClick={this._onReviewClick} />