Tweak cross-signing copy

This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.

src/components/structures/MatrixChat.tsx

@@ -1554,7 +1554,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             } else if (request.pending) {
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: 'verifreq_' + request.channel.transactionId,
-                    title: request.isSelfVerification ? _t("Self-verification request") : _t("Verification Request"),
+                    title: _t("Verification requested"),
                     icon: "verification",
                     props: {request},
                     component: sdk.getComponent("toasts.VerificationRequestToast"),

src/components/structures/auth/SetupEncryptionBody.js

@@ -155,15 +155,14 @@ export default class SetupEncryptionBody extends React.Component {
             let verifyButton;
             if (store.hasDevicesToVerifyAgainst) {
                 verifyButton = <AccessibleButton kind="primary" onClick={this._onVerifyClick}>
-                    { _t("Verify with another session") }
+                    { _t("Use another login") }
                 </AccessibleButton>;
             }
 
             return (
                 <div>
                     <p>{_t(
-                        "Verify this login to access your encrypted messages and " +
-                        "prove to others that this login is really you.",
+                        "Verify your identity to access encrypted messages and prove your identity to others.",
                     )}</p>
 
                     <div className="mx_CompleteSecurity_actionRow">
@@ -205,8 +204,8 @@ export default class SetupEncryptionBody extends React.Component {
             return (
                 <div>
                     <p>{_t(
-                        "Without completing security on this session, it won’t have " +
-                        "access to encrypted messages.",
+                        "Without verifying, you won’t have access to all your messages " +
+                        "and may appear as untrusted to others.",
                     )}</p>
                     <div className="mx_CompleteSecurity_actionRow">
                         <AccessibleButton

src/components/views/dialogs/VerificationRequestDialog.js

@@ -50,7 +50,7 @@ export default class VerificationRequestDialog extends React.Component {
         const member = this.props.member ||
             otherUserId && MatrixClientPeg.get().getUser(otherUserId);
         const title = request && request.isSelfVerification ?
-            _t("Verify other session") : _t("Verification Request");
+            _t("Verify other login") : _t("Verification Request");
 
         return <BaseDialog className="mx_InfoDialog" onFinished={this.props.onFinished}
                 contentId="mx_Dialog_content"

src/components/views/right_panel/EncryptionInfo.tsx

@@ -52,7 +52,7 @@ const EncryptionInfo: React.FC<IProps> = ({
         let text: string;
         if (waitingForOtherParty) {
             if (isSelfVerification) {
-                text = _t("Waiting for you to accept on your other session…");
+                text = _t("Accept on your other login…");
             } else {
                 text = _t("Waiting for %(displayName)s to accept…", {
                     displayName: member.displayName || member.name || member.userId,

src/components/views/toasts/GenericToast.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import {XOR} from "../../../@types/common";
 
 export interface IProps {
     description: ReactNode;
+    detail?: ReactNode;
     acceptLabel: string;
 
     onAccept();
@@ -33,14 +34,19 @@ interface IPropsExtended extends IProps {
 
 const GenericToast: React.FC<XOR<IPropsExtended, IProps>> = ({
     description,
+    detail,
     acceptLabel,
     rejectLabel,
     onAccept,
     onReject,
 }) => {
+    const detailContent = detail ? <span className="mx_Toast_detail">
+        {detail}
+    </span> : null;
+
     return <div>
         <div className="mx_Toast_description">
-            { description }
+            {description}&nbsp;{detailContent}
         </div>
         <div className="mx_Toast_buttons" aria-live="off">
             {onReject && rejectLabel && <FormButton label={rejectLabel} kind="danger" onClick={onReject} /> }

src/components/views/toasts/VerificationRequestToast.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019-2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -140,11 +140,12 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
 
     render() {
         const {request} = this.props;
-        let nameLabel;
+        let description;
+        let detail;
         if (request.isSelfVerification) {
             if (this.state.device) {
-                nameLabel = _t("From %(deviceName)s (%(deviceId)s) at %(ip)s", {
-                    deviceName: this.state.device.getDisplayName(),
+                description = this.state.device.getDisplayName();
+                detail = _t("%(deviceId)s from %(ip)s", {
                     deviceId: this.state.device.deviceId,
                     ip: this.state.ip,
                 });
@@ -152,13 +153,13 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
         } else {
             const userId = request.otherUserId;
             const roomId = request.channel.roomId;
-            nameLabel = roomId ? userLabelForEventRoom(userId, roomId) : userId;
+            description = roomId ? userLabelForEventRoom(userId, roomId) : userId;
             // for legacy to_device verification requests
-            if (nameLabel === userId) {
+            if (description === userId) {
                 const client = MatrixClientPeg.get();
                 const user = client.getUser(userId);
                 if (user && user.displayName) {
-                    nameLabel = _t("%(name)s (%(userId)s)", {name: user.displayName, userId});
+                    description = _t("%(name)s (%(userId)s)", {name: user.displayName, userId});
                 }
             }
         }
@@ -167,7 +168,8 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
             _t("Decline (%(counter)s)", {counter: this.state.counter});
 
         return <GenericToast
-            description={nameLabel}
+            description={description}
+            detail={detail}
             acceptLabel={_t("Accept")}
             onAccept={this.accept}
             rejectLabel={declineLabel}