Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

Commit

Permalink
update dependency and fix ESLint
Browse files Browse the repository at this point in the history
  • Loading branch information
Luca Zeug committed Jan 17, 2017
1 parent f9fe5c6 commit 5ccec23
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
15 changes: 8 additions & 7 deletions modules/ipcCommunicator.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ ipc.on('backendAction_importWalletFile', (e, path, pw) => {
error = true;
e.sender.send('uiAction_importedWalletFile', 'Couldn\'t start the "geth wallet import <file.json>" process.');
});
nodeProcess.stdout.on('data', (data) => {
data = data.toString();
nodeProcess.stdout.on('data', (_data) => {
const data = _data.toString();
if (data) {
log.info('Imported presale: ', data);
}
Expand All @@ -189,11 +189,12 @@ ipc.on('backendAction_importWalletFile', (e, path, pw) => {

// if imported, return the address
} else if (data.indexOf('Address:') !== -1) {
var find = data.match(/\{([a-f0-9]+)\}/i);
if (find.length && find[1])
e.sender.send('uiAction_importedWalletFile', null, '0x' + find[1]);
else
const find = data.match(/\{([a-f0-9]+)\}/i);
if (find.length && find[1]) {
e.sender.send('uiAction_importedWalletFile', null, `0x${find[1]}`);
} else {
e.sender.send('uiAction_importedWalletFile', data);
}

// if not stop, so we don't kill the process
} else {
Expand All @@ -209,7 +210,7 @@ ipc.on('backendAction_importWalletFile', (e, path, pw) => {
setTimeout(() => {
if (!error) {
nodeProcess.stdin.write(`${pw}\n`);
pw = null;
pw = null; // eslint-disable-line no-param-reassign
}
}, 2000);
});
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"bluebird": "^3.3.5",
"electron-squirrel-startup": "^1.0.0",
"ethereum-client-binaries": "^1.6.1",
"ethereum-keyfile-recognizer": "^1.0.1",
"ethereum-keyfile-recognizer": "^1.0.2",
"ethereumjs-abi": "^0.6.3",
"got": "^6.3.0",
"i18next": "^2.3.4",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@ ethereum-client-binaries@^1.6.1:
node-unzip-2 "^0.2.1"
tmp "0.0.29"

ethereum-keyfile-recognizer@^1.0.1:
ethereum-keyfile-recognizer@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/ethereum-keyfile-recognizer/-/ethereum-keyfile-recognizer-1.0.2.tgz#c0315f91c77e076621e9f6b5f8099fd370f7a11d"
dependencies:
Expand Down

0 comments on commit 5ccec23

Please sign in to comment.