diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 17405e403..8ec93809f 100644 --- a/_locales/en/messages.json +++ b/_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", - "description": "Title given to QRCode modal" + "message": "View My QR Code", + "description": "Title given to QR Code modal" }, "QRCodeDescription": { "message": - "Your friends can scan this QR code to start a conversation with you.", + "This is your unique public QR Code.Other users may scan this in order to begin a conversation with you.", "description": "Description given to QRCode modal" }, "showQRCode": { diff --git a/js/views/password_dialog_view.js b/js/views/password_dialog_view.js index f35a85360..d3221b566 100644 --- a/js/views/password_dialog_view.js +++ b/js/views/password_dialog_view.js @@ -30,4 +30,4 @@ this.remove(); }, }); -})(); \ No newline at end of file +})(); diff --git a/stylesheets/_session_theme_dark.scss b/stylesheets/_session_theme_dark.scss index ec0787eb5..291853042 100644 --- a/stylesheets/_session_theme_dark.scss +++ b/stylesheets/_session_theme_dark.scss @@ -54,4 +54,3 @@ } } } - diff --git a/ts/components/DevicePairingDialog.tsx b/ts/components/DevicePairingDialog.tsx index 3615ec696..1a30e4153 100644 --- a/ts/components/DevicePairingDialog.tsx +++ b/ts/components/DevicePairingDialog.tsx @@ -63,9 +63,7 @@ export class DevicePairingDialog extends React.Component { // Foreground equivalent to .session-modal background color const bgColor = 'rgba(0, 0, 0, 0)'; - const fgColor = theme === 'dark' - ? '#FFFFFF' - : '#1B1B1B'; + const fgColor = theme === 'dark' ? '#FFFFFF' : '#1B1B1B'; // const renderPairedDevices = this.state.data.map((pubKey: any) => { // const pubKeyInfo = this.getPubkeyName(pubKey); diff --git a/ts/components/session/SessionQRModal.tsx b/ts/components/session/SessionQRModal.tsx index 9820377eb..cd8ee506e 100644 --- a/ts/components/session/SessionQRModal.tsx +++ b/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 { } 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' - ? '#FFFFFF' - : '#1B1B1B'; - + const fgColor = theme === 'dark' ? '#FFFFFF' : '#1B1B1B'; + return ( { - {window.i18n('QRCodeDescription')} + + +
{window.i18n('QRCodeDescription')}
+ +