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

Merge pull request #3978 from matrix-org/jryans/cs-polish

Browse source 
Change new session toast to unverified
This commit is contained in:
J. Ryan Stinnett 2020-01-29 15:33:19 +00:00 • committed by GitHub
commit 725ec1dda6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,21 +24,20 @@ 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 = () => {
DeviceListener.sharedInstance().dismissVerification(this.props.deviceId);
const { device } = this.props;
DeviceListener.sharedInstance().dismissVerification(device.deviceId);
};
_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 +46,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} />