Cleanups

_locales/en/messages.json

@@ -2122,12 +2122,12 @@
       "Prompt on seed modal requesting user to save their seed. Line two"
   },
   "QRCodeTitle": {
-    "message": "Your Public Key QRCode",
+    "message": "View My QR Code",
-    "description": "Title given to QRCode modal"
+    "description": "Title given to QR Code modal"
   },
   "QRCodeDescription": {
     "message":
-      "Your friends can scan this QR code to start a conversation with you.",
+      "This is <strong>your unique public QR Code.</strong><br/>Other users may scan this in order to begin a conversation with you.",
     "description": "Description given to QRCode modal"
   },
   "showQRCode": {

js/views/password_dialog_view.js

@@ -30,4 +30,4 @@
       this.remove();
     },
   });
-})();
+})();

stylesheets/_session_theme_dark.scss

@@ -54,4 +54,3 @@
     }
   }
 }
-

ts/components/DevicePairingDialog.tsx

@@ -63,9 +63,7 @@ export class DevicePairingDialog extends React.Component<Props, State> {
 
     // Foreground equivalent to .session-modal background color
     const bgColor = 'rgba(0, 0, 0, 0)';
-    const fgColor = theme === 'dark'
+    const fgColor = theme === 'dark' ? '#FFFFFF' : '#1B1B1B';
-      ? '#FFFFFF'
-      : '#1B1B1B';
 
     // const renderPairedDevices = this.state.data.map((pubKey: any) => {
     //   const pubKeyInfo = this.getPubkeyName(pubKey);

ts/components/session/SessionQRModal.tsx

@@ -3,6 +3,7 @@ import { QRCode } from 'react-qr-svg';
 
 import { SessionModal } from './SessionModal';
 import { SessionButton } from './SessionButton';
+import { SessionHtmlRenderer } from './SessionHTMLRenderer';
 
 interface Props {
   value: string;
@@ -15,15 +16,13 @@ export class SessionQRModal extends React.Component<Props> {
   }
   public render() {
     const { value, onClose } = this.props;
-    
+
     const theme = window.Events.getThemeSetting();
 
     // Foreground equivalent to .session-modal background color
     const bgColor = 'rgba(0, 0, 0, 0)';
-    const fgColor = theme === 'dark'
+    const fgColor = theme === 'dark' ? '#FFFFFF' : '#1B1B1B';
-      ? '#FFFFFF'
+
-      : '#1B1B1B';
-    
     return (
       <SessionModal
         title={window.i18n('QRCodeTitle')}
@@ -33,7 +32,9 @@ export class SessionQRModal extends React.Component<Props> {
         <div className="spacer-sm" />
 
         <div className="qr-dialog__description text-subtle">
-          <p>{window.i18n('QRCodeDescription')}</p>
+          <p>
+            <SessionHtmlRenderer html={window.i18n('QRCodeDescription')} />
+          </p>
         </div>
         <div className="spacer-lg" />