diff --git a/src/main/index.js b/src/main/index.js index 0da679b09..016d7d9f6 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -64,7 +64,7 @@ if (isDev) { } app.on('ready', async () => { - const processListArgs = process.platform === 'win32' ? 'lbrynet' : 'lbrynet start'; + const processListArgs = process.platform === 'win32' ? 'lbrynet.exe' : 'lbrynet start'; const processList = await findProcess('name', processListArgs); const isDaemonRunning = processList.length > 0; diff --git a/src/renderer/component/transactionList/view.jsx b/src/renderer/component/transactionList/view.jsx index ab69264dc..0f3790b89 100644 --- a/src/renderer/component/transactionList/view.jsx +++ b/src/renderer/component/transactionList/view.jsx @@ -82,7 +82,7 @@ class TransactionList extends React.PureComponent {

{emptyMessage || __('No transactions to list.')}

)} {!slim && - !!transactionList.length && ( + !!transactions.length && (
{ - Lbryio.call( - 'user', - 'new', - { - auth_token: '', - language: 'en', - app_id: status.installation_id, - }, - 'post' - ).then(response => { - if (!response.auth_token) { - throw new Error(__('auth_token is missing from response')); - } +// We keep a local variable for authToken beacuse `ipcRenderer.send` does not +// contain a response, so there is no way to know when it's been set +let authToken; +Lbryio.setOverride( + 'setAuthToken', + status => + new Promise(resolve => { + Lbryio.call( + 'user', + 'new', + { + auth_token: '', + language: 'en', + app_id: status.installation_id, + }, + 'post' + ).then(response => { + if (!response.auth_token) { + throw new Error(__('auth_token is missing from response')); + } - ipcRenderer.send('set-auth-token', response.auth_token); - }); -}); + const newAuthToken = response.auth_token; + authToken = newAuthToken; + ipcRenderer.send('set-auth-token', authToken); + resolve(); + }); + }) +); Lbryio.setOverride( 'getAuthToken', () => new Promise(resolve => { - ipcRenderer.once('auth-token-response', (event, token) => { - Lbryio.authToken = token; - resolve(token); - }); + if (authToken) { + resolve(authToken); + } else { + ipcRenderer.once('auth-token-response', (event, token) => { + Lbryio.authToken = token; + resolve(token); + }); - ipcRenderer.send('get-auth-token'); + ipcRenderer.send('get-auth-token'); + } }) ); diff --git a/src/renderer/scss/component/_markdown-preview.scss b/src/renderer/scss/component/_markdown-preview.scss index 62e5bb390..ad4d57d97 100644 --- a/src/renderer/scss/component/_markdown-preview.scss +++ b/src/renderer/scss/component/_markdown-preview.scss @@ -77,6 +77,10 @@ } // Code + pre { + white-space: normal; + } + code { margin: 16px 0; padding: 8px;