aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-07-08 02:13:14 +0800
committerGitHub <noreply@github.com>2016-07-08 02:13:14 +0800
commit768b049696b762ac161090286c22609c7c4d5725 (patch)
tree51a56cb9fa71acec506f739d31a34e310e23242f
parentecfe720b8bb0429c2d73b3a03d5dbf1d7cf573a7 (diff)
parent9609593f139ac6af9af5735624d4a37d31f8e43f (diff)
downloadtangerine-wallet-browser-768b049696b762ac161090286c22609c7c4d5725.tar.gz
tangerine-wallet-browser-768b049696b762ac161090286c22609c7c4d5725.tar.zst
tangerine-wallet-browser-768b049696b762ac161090286c22609c7c4d5725.zip
Merge pull request #408 from MetaMask/FixNoDeclineCallback
Fix bug where rejected tx would not call back
-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)
+ }
}
})