Merge pull request #90 from loeck/master

Add preload window, add simple Menu (for OSX)

package.json

@@ -1,5 +1,6 @@
 {
   "name": "ledger-wallet-desktop",
+  "productName": "Ledger Wallet Desktop",
   "description": "Ledger Wallet Desktop",
   "repository": "https://github.com/LedgerHQ/ledger-wallet-desktop",
   "version": "0.1.0",
@@ -27,6 +28,7 @@
     ]
   },
   "electronWebpack": {
+    "title": true,
     "renderer": {
       "webpackConfig": "./webpack/renderer.config.js"
     },

src/components/SettingsPage/Display.js

@@ -44,10 +44,6 @@ class TabProfile extends PureComponent<Props, State> {
         },
       ],
       orderAccounts: [
-        {
-          key: 'custom',
-          name: t('orderAccounts.custom'),
-        },
         {
           key: 'name',
           name: t('orderAccounts.name'),

src/components/Wrapper.js

@@ -1,6 +1,7 @@
 // @flow
 
 import React, { Fragment, Component } from 'react'
+import { ipcRenderer } from 'electron'
 import { Route } from 'react-router'
 import { translate } from 'react-i18next'
 
@@ -11,23 +12,34 @@ import GrowScroll from 'components/base/GrowScroll'
 import AccountPage from 'components/AccountPage'
 import DashboardPage from 'components/DashboardPage'
 import SettingsPage from 'components/SettingsPage'
-import UpdateNotifier from 'components/UpdateNotifier'
 
 import AppRegionDrag from 'components/AppRegionDrag'
+import DevToolbar from 'components/DevToolbar'
 import IsUnlocked from 'components/IsUnlocked'
 import SideBar from 'components/SideBar'
 import TopBar from 'components/TopBar'
-import DevToolbar from 'components/DevToolbar'
+import UpdateNotifier from 'components/UpdateNotifier'
 
 class Wrapper extends Component<{}> {
+  componentDidMount() {
+    window.requestAnimationFrame(
+      () => (this._timeout = setTimeout(() => ipcRenderer.send('app-finish-rendering'), 300)),
+    )
+  }
+
+  componentWillUnmount() {
+    clearTimeout(this._timeout)
+  }
+
+  _timeout = undefined
+
   render() {
     return (
       <Fragment>
         {process.platform === 'darwin' && <AppRegionDrag />}
+        {__DEV__ && <DevToolbar />}
 
         <IsUnlocked>
-          {__DEV__ && <DevToolbar />}
-
           {Object.entries(modals).map(([name, ModalComponent]: [string, any]) => (
             <ModalComponent key={name} />
           ))}

src/internals/index.js

@@ -1,10 +1,11 @@
 // @flow
 
 import objectPath from 'object-path'
+import capitalize from 'lodash/capitalize'
 
 const { FORK_TYPE } = process.env
 
-process.title = `ledger-wallet-desktop-${FORK_TYPE}`
+process.title = `Ledger Wallet Desktop ${capitalize(FORK_TYPE)}`
 
 function sendEvent(type: string, data: any, options: Object = { kill: true }) {
   process.send({ type, data, options })

src/main/app.js

@@ -1,31 +1,44 @@
 // @flow
 
-import { app, BrowserWindow } from 'electron'
+import { app, BrowserWindow, Menu, ipcMain } from 'electron'
+
+import menu from 'main/menu'
 
 // necessary to prevent win from being garbage collected
 let mainWindow
+let preloadWindow
+
+let forceClose = false
 
-const MIN_HEIGHT = 768
+const devTools = __DEV__
-const MIN_WIDTH = 1024
+
+const defaultWindowOptions = {
+  backgroundColor: '#fff',
+  center: true,
+  webPreferences: {
+    devTools,
+  },
+}
 
 function createMainWindow() {
+  const MIN_HEIGHT = 768
+  const MIN_WIDTH = 1024
+
   const windowOptions = {
+    ...defaultWindowOptions,
     ...(process.platform === 'darwin'
       ? {
           frame: false,
           titleBarStyle: 'hiddenInset',
         }
       : {}),
-    center: true,
-    show: true,
     height: MIN_HEIGHT,
-    width: MIN_WIDTH,
     minHeight: MIN_HEIGHT,
     minWidth: MIN_WIDTH,
+    show: false,
+    width: MIN_WIDTH,
     webPreferences: {
-      // Disable auxclick event
+      ...defaultWindowOptions.webPreferences,
-      // See https://developers.google.com/web/updates/2016/10/auxclick
-      disableBlinkFeatures: 'Auxclick',
       // Enable, among other things, the ResizeObserver
       experimentalFeatures: true,
     },
@@ -37,18 +50,20 @@ function createMainWindow() {
     ? `http://localhost:${process.env.ELECTRON_WEBPACK_WDS_PORT || ''}`
     : `file://${__dirname}/index.html`
 
-  if (__DEV__) {
+  if (devTools) {
     window.webContents.openDevTools()
   }
 
   window.loadURL(url)
 
-  window.on('close', () => {
+  window.on('close', e => {
-    mainWindow = null
+    if (!forceClose) {
-  })
+      e.preventDefault()
 
-  window.once('ready-to-show', () => {
+      if (mainWindow !== null) {
-    window.show()
+        mainWindow.hide()
+      }
+    }
   })
 
   window.webContents.on('devtools-opened', () => {
@@ -61,17 +76,55 @@ function createMainWindow() {
   return window
 }
 
+function createPreloadWindow() {
+  // Preload renderer of main windows
+  mainWindow = createMainWindow()
+
+  const HEIGHT = 144
+  const WIDTH = 256
+
+  const windowOptions = {
+    ...defaultWindowOptions,
+    closable: false,
+    frame: false,
+    fullscreenable: false,
+    height: HEIGHT,
+    resizable: false,
+    show: false,
+    skipTaskbar: true,
+    width: WIDTH,
+  }
+
+  const window = new BrowserWindow(windowOptions)
+
+  window.loadURL(`file://${__static}/preload-window.html`)
+
+  window.on('ready-to-show', () => {
+    window.show()
+  })
+
+  return window
+}
+
+app.on('before-quit', () => {
+  forceClose = true
+})
+
 app.on('window-all-closed', () => {
   // On macOS it is common for applications to stay open
   // until the user explicitly quits
-  if (process.platform !== 'darwin') app.quit()
+  if (process.platform !== 'darwin') {
+    app.quit()
+  }
 })
 
 app.on('activate', () => {
   // On macOS it is common to re-create a window
   // even after all windows have been closed
-  if (mainWindow === null) {
+  if (mainWindow === null && preloadWindow === null) {
-    mainWindow = createMainWindow()
+    preloadWindow = createPreloadWindow()
+  } else if (mainWindow !== null) {
+    mainWindow.show()
   }
 })
 
@@ -91,5 +144,19 @@ app.on('ready', async () => {
     await installExtensions()
   }
 
-  mainWindow = createMainWindow()
+  Menu.setApplicationMenu(menu)
+
+  preloadWindow = createPreloadWindow()
+})
+
+ipcMain.on('app-finish-rendering', () => {
+  if (preloadWindow !== null) {
+    preloadWindow.destroy()
+    preloadWindow = null
+  }
+
+  if (mainWindow !== null) {
+    mainWindow.show()
+    setImmediate(() => mainWindow !== null && mainWindow.focus())
+  }
 })

src/main/index.js

@@ -5,9 +5,10 @@ require('env')
 process.setMaxListeners(0)
 
 require('../globals')
-require('./bridge')
 require('./app')
 
+setImmediate(() => require('./bridge')) // eslint-disable-line global-require
+
 if (__PROD__ && __SENTRY_URL__) {
   const Raven = require('raven') // eslint-disable-line global-require
   const ravenConfig = { captureUnhandledRejections: true }

src/main/menu.js

@@ -0,0 +1,30 @@
+import { app, Menu } from 'electron'
+
+const template = [
+  ...(process.platform === 'darwin'
+    ? [
+        {
+          label: app.getName(),
+          submenu: [
+            { role: 'hide' },
+            { role: 'hideothers' },
+            { role: 'unhide' },
+            { type: 'separator' },
+            { role: 'quit' },
+          ],
+        },
+        {
+          role: 'window',
+          submenu: [
+            { role: 'close' },
+            { role: 'minimize' },
+            { role: 'zoom' },
+            { type: 'separator' },
+            { role: 'front' },
+          ],
+        },
+      ]
+    : []),
+]
+
+export default Menu.buildFromTemplate(template)

src/renderer/index.js

@@ -45,8 +45,6 @@ if (!locked) {
   store.dispatch(fetchAccounts())
 }
 
-events({ store, locked })
-
 function r(Comp) {
   if (rootNode) {
     render(<AppContainer>{Comp}</AppContainer>, rootNode)
@@ -55,6 +53,8 @@ function r(Comp) {
 
 r(<App store={store} history={history} language={language} />)
 
+events({ store, locked })
+
 if (module.hot) {
   module.hot.accept('../components/App', () => {
     const NewApp = require('../components/App').default // eslint-disable-line global-require

static/i18n/en/translation.yml

@@ -9,7 +9,6 @@ language:
   fr: French
 
 orderAccounts:
-  custom: Custom
   name: By name
   balance: By balance
   type: By type

static/i18n/fr/translation.yml

@@ -9,7 +9,6 @@ language:
   fr: Français
 
 orderAccounts:
-  custom: Personnalisé
   name: Par nom
   balance: Par solde
   type: Par type

static/preload-window.html

@@ -0,0 +1,36 @@
+<html>
+  <head>
+    <style>
+      * {
+        box-sizing: border-box;
+        cursor: default;
+        margin: 0;
+        padding: 0;
+        user-select: none;
+      }
+
+      body {
+        background: white;
+      }
+
+      #app {
+        -webkit-app-region: drag;
+        align-items: center;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        min-height: 100vh;
+      }
+
+      #app video {
+        height: 100%;
+        width: 100%;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="app">
+      <video autoplay loop muted src="./videos/loader.mp4" />
+    </div>
+  </body>
+</html>