diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-07-07 08:59:00 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-07-07 08:59:00 +0800 |
| commit | 15afbe5b1f77df36fb348ab272a7b6a6818bf017 (patch) | |
| tree | 392f3319641ab2e9722fc26ddc238bdb6b71add8 /app | |
| parent | 7058dc4ee3d00f4d4e407c656cf671b2d4fd62f2 (diff) | |
| parent | 9d54f10dc5bd42f9103ff6c9f2094d5af81b2342 (diff) | |
| download | tangerine-wallet-browser-15afbe5b1f77df36fb348ab272a7b6a6818bf017.tar tangerine-wallet-browser-15afbe5b1f77df36fb348ab272a7b6a6818bf017.tar.gz tangerine-wallet-browser-15afbe5b1f77df36fb348ab272a7b6a6818bf017.tar.bz2 tangerine-wallet-browser-15afbe5b1f77df36fb348ab272a7b6a6818bf017.tar.lz tangerine-wallet-browser-15afbe5b1f77df36fb348ab272a7b6a6818bf017.tar.xz tangerine-wallet-browser-15afbe5b1f77df36fb348ab272a7b6a6818bf017.tar.zst tangerine-wallet-browser-15afbe5b1f77df36fb348ab272a7b6a6818bf017.zip | |
Merge branch 'master' into ConfirmationStyle
Diffstat (limited to 'app')
| -rw-r--r-- | app/fonts/Montserrat/Montserrat-Light.ttf | bin | 0 -> 43940 bytes | |||
| -rw-r--r-- | app/fonts/Montserrat/Montserrat-Light.woff | bin | 0 -> 22964 bytes | |||
| -rw-r--r-- | app/fonts/Montserrat/Montserrat-UltraLight.ttf | bin | 0 -> 67344 bytes | |||
| -rw-r--r-- | app/fonts/Montserrat/Montserrat-UltraLight.woff | bin | 0 -> 29684 bytes | |||
| -rw-r--r-- | app/scripts/metamask-controller.js | 6 |
5 files changed, 4 insertions, 2 deletions
diff --git a/app/fonts/Montserrat/Montserrat-Light.ttf b/app/fonts/Montserrat/Montserrat-Light.ttf Binary files differnew file mode 100644 index 000000000..cd8f62d7e --- /dev/null +++ b/app/fonts/Montserrat/Montserrat-Light.ttf diff --git a/app/fonts/Montserrat/Montserrat-Light.woff b/app/fonts/Montserrat/Montserrat-Light.woff Binary files differnew file mode 100644 index 000000000..d8aa6e103 --- /dev/null +++ b/app/fonts/Montserrat/Montserrat-Light.woff diff --git a/app/fonts/Montserrat/Montserrat-UltraLight.ttf b/app/fonts/Montserrat/Montserrat-UltraLight.ttf Binary files differnew file mode 100644 index 000000000..16d2dbf15 --- /dev/null +++ b/app/fonts/Montserrat/Montserrat-UltraLight.ttf diff --git a/app/fonts/Montserrat/Montserrat-UltraLight.woff b/app/fonts/Montserrat/Montserrat-UltraLight.woff Binary files differnew file mode 100644 index 000000000..156ff32c8 --- /dev/null +++ b/app/fonts/Montserrat/Montserrat-UltraLight.woff diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 470591323..8a5ffb75a 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -89,10 +89,12 @@ module.exports = class MetamaskController { }) function logger (err, request, response) { - if (err) return console.error(err.stack) + if (err) return console.error(err) if (!request.isMetamaskInternal) { console.log(`RPC (${originDomain}):`, request, '->', response) - if (response.error) console.error('Error in RPC response:\n' + response.error.message) + if (response.error) { + console.error('Error in RPC response:\n', response.error) + } } } } |