feature: replaces instances of dialog with new bridged version

app/components/Modals/GeneratedTransactionModal/GeneratedTransactionModal.jsx

@@ -46,21 +46,20 @@ export default class GeneratedTransactionModal extends React.Component<
 
   handleSave = async () => {
     const { showSuccessNotification, showErrorNotification } = this.props
-    const { dialog, app } = electron
+    const { ipcRenderer } = electron
+    const path = await ipcRenderer.invoke('getPath', 'documents')
     try {
-      dialog.showSaveDialog(
-        {
-          defaultPath: `${app.getPath(
-            'documents',
-          )}/neon-wallet-transaction-${moment().unix()}`,
+      ipcRenderer
+        .invoke('dialog', 'showSaveDialog', {
+          defaultPath: `${path}/neon-wallet-transaction-${moment().unix()}`,
           filters: [
             {
               name: 'JSON',
               extensions: ['json'],
             },
           ],
-        },
-        fileName => {
+        })
+        .then(fileName => {
           if (fileName === undefined) {
             return
           }
@@ -82,8 +81,7 @@ export default class GeneratedTransactionModal extends React.Component<
               }
             },
           )
-        },
-      )
+        })
     } catch (err) {
       console.error(err)
       showErrorNotification({

app/components/Modals/ImportTransactionModal/ImportTransactionModal.jsx

@@ -17,7 +17,7 @@ import SaveIcon from '../../../assets/icons/save-icon.svg'
 import Button from '../../Button'
 import Loading from '../../../containers/App/Loading'
 
-const electron = require('electron')
+const { ipcRenderer } = require('electron')
 
 type Tx = {
   type: number,
@@ -113,27 +113,29 @@ export default class GeneratedTransactionModal extends React.Component<
 
   handleImport = async (isSignedRawTx: boolean = false) => {
     const { showErrorNotification } = this.props
-    const { dialog } = electron
     try {
-      dialog.showOpenDialog(fileName => {
-        if (fileName === undefined) {
-          return null
-        }
-        const rawData = fs.readFileSync(fileName[0])
+      ipcRenderer
+        .invoke('dialog', { properties: ['openFile'] })
+        .then(async fileName => {
+          if (fileName === undefined) {
+            return null
+          }
 
-        const data = isSignedRawTx
-          ? rawData.toString('utf8')
-          : JSON.parse(rawData)
-        const transaction = isSignedRawTx ? data : JSON.stringify(data)
+          const rawData = fs.readFileSync(fileName[0])
 
-        return isSignedRawTx
-          ? this.setState({
-              serializedTransactionInput: transaction,
-            })
-          : this.setState({
-              transaction,
-            })
-      })
+          const data = isSignedRawTx
+            ? rawData.toString('utf8')
+            : JSON.parse(rawData)
+          const transaction = isSignedRawTx ? data : JSON.stringify(data)
+
+          return isSignedRawTx
+            ? this.setState({
+                serializedTransactionInput: transaction,
+              })
+            : this.setState({
+                transaction,
+              })
+        })
     } catch (err) {
       console.error(err)
       showErrorNotification({
@@ -144,21 +146,20 @@ export default class GeneratedTransactionModal extends React.Component<
 
   handleSave = async (isSignedRawTx: boolean = false) => {
     const { showSuccessNotification, showErrorNotification } = this.props
-    const { dialog, app } = electron
+
+    const path = await ipcRenderer.invoke('getPath', 'documents')
     try {
-      dialog.showSaveDialog(
-        {
-          defaultPath: `${app.getPath(
-            'documents',
-          )}/neon-wallet-signed-transaction-${moment().unix()}`,
+      ipcRenderer
+        .invoke('dialog', 'showSaveDialog', {
+          defaultPath: `${path}}/neon-wallet-signed-transaction-${moment().unix()}`,
           filters: [
             {
               name: isSignedRawTx ? 'TXT' : 'JSON',
               extensions: isSignedRawTx ? ['txt'] : ['json'],
             },
           ],
-        },
-        fileName => {
+        })
+        .then(fileName => {
           if (fileName === undefined) {
             return
           }
@@ -181,8 +182,7 @@ export default class GeneratedTransactionModal extends React.Component<
               }
             },
           )
-        },
-      )
+        })
     } catch (err) {
       console.error(err)
       showErrorNotification({

app/containers/Settings/Settings.jsx

@@ -35,7 +35,7 @@ import SaveIcon from '../../assets/icons/save-icon.svg'
 import pack from '../../../package.json'
 import { LanguageSettingsIcon } from '../../components/Inputs/LanguageSelect/LanguageSelect'
 
-const { dialog, shell } = require('electron')
+const { ipcRenderer, shell } = require('electron')
 
 type Props = {
   setAccounts: (Array<Object>) => any,
@@ -76,7 +76,11 @@ export const loadWalletRecovery = async (
   setN3Accounts: (Array<Object>) => any,
   chain: string,
 ) => {
-  const { canceled, filePaths } = await dialog.showOpenDialog()
+  const { canceled, filePaths } = await ipcRenderer.invoke(
+    'dialog',
+    'showOpenDialog',
+    { properties: ['openFile'] },
+  )
   if (canceled || !filePaths) return
 
   const filepath = filePaths[0]
@@ -148,14 +152,18 @@ export default class Settings extends Component<Props, State> {
       })
       return
     }
-    const { filePath, canceled } = await dialog.showSaveDialog({
-      filters: [
-        {
-          name: 'JSON',
-          extensions: ['json'],
-        },
-      ],
-    })
+    const { filePath, canceled } = await await ipcRenderer.invoke(
+      'dialog',
+      'showSaveDialog',
+      {
+        filters: [
+          {
+            name: 'JSON',
+            extensions: ['json'],
+          },
+        ],
+      },
+    )
 
     if (filePath && !canceled) {
       fs.writeFile(filePath, content, errorWriting => {

app/containers/TransactionHistory/TransactionHistory.jsx

@@ -18,7 +18,7 @@ import {
   parseAbstractData,
 } from '../../actions/transactionHistoryActions'
 
-const { dialog, app } = require('electron')
+const { ipcRenderer, app } = require('electron')
 
 type Props = {
   chain: string,
@@ -154,10 +154,10 @@ export default class TransactionHistory extends Component<Props, State> {
         }),
       )
       hideNotification(infoNotification)
-      const result = await dialog.showSaveDialog({
-        defaultPath: `${app.getPath(
-          'documents',
-        )}/neon-wallet-activity-${moment().unix()}.csv`,
+      const path = await ipcRenderer.invoke('getPath', 'documents')
+
+      const result = await ipcRenderer.invoke('dialog', 'showSaveDialog', {
+        defaultPath: `${path}/neon-wallet-activity-${moment().unix()}.csv`,
         filters: [
           {
             name: 'CSV',

app/core/storage.js

@@ -8,7 +8,7 @@ const set = promisify(storage.set, storage)
 const ENCRYPTED_FILES_WHITELIST = ['address']
 
 export const setStorage = async (key, value, encrypt = false) => {
-  const path = await ipcRenderer.invoke('getPath')
+  const path = await ipcRenderer.invoke('getStoragePath')
   storage.setDataPath(path)
   const encryptedValue = await ipcRenderer.invoke(
     'safeStorageEncrypt',
@@ -18,25 +18,22 @@ export const setStorage = async (key, value, encrypt = false) => {
 }
 
 export const getStorage = async key => {
-  const path = await ipcRenderer.invoke('getPath')
+  const path = await ipcRenderer.invoke('getStoragePath')
   storage.setDataPath(path)
   const value = await get(key)
-
+  const encryptionIsWhitelisted = !!ENCRYPTED_FILES_WHITELIST.find(fileName =>
+    key.toLowerCase().includes(fileName),
+  )
   // If the file name being requested includes address
   // and is NOT encrypted, we encrypt the file.
-  if (
-    key &&
-    !!ENCRYPTED_FILES_WHITELIST.find(fileName =>
-      key.toLowerCase().includes(fileName),
-    )
-  ) {
+  if (key && encryptionIsWhitelisted) {
     // if the value is a valid JS object it has not been encrypted
     if (typeof value === 'object') {
       await setStorage(key, value, true)
     }
   }
   // Only encrypted values get stored as strings
-  if (typeof value === 'string') {
+  if (typeof value === 'string' && encryptionIsWhitelisted) {
     const decryptedValue = await ipcRenderer.invoke('safeStorageDecrypt', value)
     return JSON.parse(decryptedValue)
   }

main.js

@@ -7,11 +7,13 @@ const {
   session,
   ipcMain,
   safeStorage,
+  dialog,
 } = require('electron') // eslint-disable-line import/no-extraneous-dependencies
 const path = require('path')
 const url = require('url')
 const { autoUpdater } = require('electron-updater')
 const log = require('electron-log')
+const fs = require('fs')
 
 const port = process.env.PORT || 3000
 
@@ -261,7 +263,12 @@ ipcMain.on('closed', () => {
   app.quit()
 })
 
-ipcMain.handle('getPath', async () => `${app.getPath('userData')}/storage`)
+ipcMain.handle(
+  'getStoragePath',
+  async () => `${app.getPath('userData')}/storage`,
+)
+
+ipcMain.handle('getPath', async (event, folder) => app.getPath(folder))
 
 ipcMain.handle('safeStorageEncrypt', async (event, value) => {
   const buffer = safeStorage.encryptString(value)
@@ -275,6 +282,11 @@ ipcMain.handle('safeStorageDecrypt', async (event, value) => {
   return plainText
 })
 
+ipcMain.handle('dialog', async (event, method, params) => {
+  const result = await dialog[method](params)
+  return result
+})
+
 autoUpdater.logger = log
 autoUpdater.logger.transports.file.level = 'info'
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Neon",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "main": "./main.js",
   "description": "Light wallet for NEO blockchain",
   "homepage": "https://github.com/CityOfZion/neon-wallet",