diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 71d5f0b07..43e7f9222 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1922,8 +1922,7 @@ }, "showQRCode": { "message": "Show QR code", - "description": - "Button action that the user can click to view their QR code" + "description": "Button action that the user can click to view their QR code" }, "seedViewTitle": { diff --git a/js/views/qr_dialog_view.js b/js/views/qr_dialog_view.js index 1a53eb85f..a55d1f99c 100644 --- a/js/views/qr_dialog_view.js +++ b/js/views/qr_dialog_view.js @@ -14,9 +14,7 @@ initialize(options = {}) { this.okText = options.okText || i18n('ok'); this.render(); - this.$('.qr-dialog').bind('keyup', event => - this.onKeyup(event) - ); + this.$('.qr-dialog').bind('keyup', event => this.onKeyup(event)); if (options.string) { this.qr = new QRCode(this.$('#qr')[0], { diff --git a/preload.js b/preload.js index d6dfd14e3..d1d26243b 100644 --- a/preload.js +++ b/preload.js @@ -402,16 +402,16 @@ window.Signal.Logs = require('./js/modules/logs'); // Add right-click listener for selected text and urls const contextMenu = require('electron-context-menu'); -const isQR = (params) => params.mediaType === 'image' && params.titleText === 'Scan me!'; +const isQR = params => + params.mediaType === 'image' && params.titleText === 'Scan me!'; // QR saving doesn't work so we just disable it contextMenu({ showInspectElement: false, shouldShowMenu: (event, params) => { - const isRegular = params.mediaType === 'none' && (params.linkURL || params.selectionText); - return Boolean( - !params.isEditable && (isQR(params) || isRegular) - ) + const isRegular = + params.mediaType === 'none' && (params.linkURL || params.selectionText); + return Boolean(!params.isEditable && (isQR(params) || isRegular)); }, menu: (actions, params) => { // If it's not a QR then show the default options diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss index f275fa9f2..93c5989f1 100644 --- a/stylesheets/_global.scss +++ b/stylesheets/_global.scss @@ -862,7 +862,6 @@ $loading-height: 16px; } .qr-dialog { - .content { width: 300px !important; max-width: none !important; diff --git a/ts/components/MainHeader.tsx b/ts/components/MainHeader.tsx index 90a9b543f..8f099dfd3 100644 --- a/ts/components/MainHeader.tsx +++ b/ts/components/MainHeader.tsx @@ -333,7 +333,7 @@ export class MainHeader extends React.Component<Props, any> { onClick: () => { trigger('showQRDialog'); }, - } + }, ]; const passItem = (type: string) => ({