copy for verification screen

src/components/views/dialogs/DeviceVerifyDialog.js

@@ -233,6 +233,7 @@ export default class DeviceVerifyDialog extends React.Component {
             sas={this._showSasEvent.sas}
             onCancel={this._onCancelClick}
             onDone={this._onSasMatchesClick}
+            isSelf={MatrixClientPeg.get().getUserId() === this.props.userId}
         />;
     }
 

src/components/views/dialogs/IncomingSasDialog.js

@@ -121,7 +121,7 @@ export default class IncomingSasDialog extends React.Component {
         const Spinner = sdk.getComponent("views.elements.Spinner");
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
-        const isSelf = this.props.verifier.userId == MatrixClientPeg.get().credentials.userId;
+        const isSelf = this.props.verifier.userId == MatrixClientPeg.get().getUserId();
 
         let profile;
         if (this.state.opponentProfile) {
@@ -196,6 +196,7 @@ export default class IncomingSasDialog extends React.Component {
             sas={this._showSasEvent.sas}
             onCancel={this._onCancelClick}
             onDone={this._onSasMatchesClick}
+            isSelf={this.props.verifier.userId == MatrixClientPeg.get().getUserId()}
         />;
     }
 

src/components/views/verification/VerificationShowSas.js

@@ -32,6 +32,7 @@ export default class VerificationShowSas extends React.Component {
         onDone: PropTypes.func.isRequired,
         onCancel: PropTypes.func.isRequired,
         sas: PropTypes.object.isRequired,
+        isSelf: PropTypes.bool,
     };
 
     constructor(props) {
@@ -66,7 +67,11 @@ export default class VerificationShowSas extends React.Component {
                 <div className="mx_VerificationShowSas_emojiSas_break" />
                 {emojiBlocks.slice(4)}
             </div>;
-            sasCaption = _t(
+            sasCaption = this.props.isSelf ?
+                _t(
+                    "Verify the device by confirming the following emoji appers on its screen.",
+                ):
+                _t(
                     "Verify this user by confirming the following emoji appear on their screen.",
                 );
         } else if (this.props.sas.decimal) {
@@ -76,7 +81,11 @@ export default class VerificationShowSas extends React.Component {
             sasDisplay = <div className="mx_VerificationShowSas_decimalSas">
                 {numberBlocks}
             </div>;
-            sasCaption = _t(
+            sasCaption = this.props.isSelf ?
+                _t(
+                    "Verify this device by confirming the following number appears on its screen.",
+                ):
+                _t(
                     "Verify this user by confirming the following number appears on their screen.",
                 );
         } else {

src/i18n/strings/en_EN.json

@@ -444,7 +444,9 @@
     "You've successfully verified this user.": "You've successfully verified this user.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
     "Got It": "Got It",
+    "Verify the device by confirming the following emoji appers on its screen.": "Verify the device by confirming the following emoji appers on its screen.",
     "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
+    "Verify this device by confirming the following number appears on its screen.": "Verify this device by confirming the following number appears on its screen.",
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
     "Cancel": "Cancel",