aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-07-08 02:38:11 +0800
committerDan Finlay <dan@danfinlay.com>2016-07-08 02:38:11 +0800
commita02f43fb7f480e786bce7a430e8bcb24ef0fb35b (patch)
tree6fe6aa5ff3752b03fb1f0f23b7717f026b38911e /app
parentec7dfe9f11d06295f7b4f58b6d1aec4c81c0ac37 (diff)
parentbbc7d222d88dd1c0cfe2b534e84592f114670866 (diff)
downloadtangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.gz
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.bz2
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.lz
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.xz
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.zst
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.zip
Merge branch 'master' into ConfirmationStyle
Diffstat (limited to 'app')
-rw-r--r--app/scripts/metamask-controller.js15
1 files changed, 7 insertions, 8 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 8a5ffb75a..63970799d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -77,14 +77,13 @@ module.exports = class MetamaskController {
// handle rpc request
this.provider.sendAsync(request, function onPayloadHandled (err, response) {
- if (err) {
- return logger(err)
- }
- logger(null, request, response)
- try {
- stream.write(response)
- } catch (err) {
- logger(err)
+ logger(err, request, response)
+ if (response) {
+ try {
+ stream.write(response)
+ } catch (err) {
+ logger(err)
+ }
}
})