diff --git a/.eslintignore b/.eslintignore index df49525be..bfb2163d2 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1,2 @@ app/scripts/lib/extension-instance.js +ui/app/conversion-util.js diff --git a/npm-debug.log b/npm-debug.log new file mode 100644 index 000000000..83cedbf3a --- /dev/null +++ b/npm-debug.log @@ -0,0 +1,46 @@ +0 info it worked if it ends with ok +1 verbose cli [ '/usr/bin/nodejs', '/usr/bin/npm', 'run', 'fastTest' ] +2 info using npm@3.10.3 +3 info using node@v6.3.1 +4 verbose run-script [ 'prefastTest', 'fastTest', 'postfastTest' ] +5 info lifecycle metamask-crx@0.0.0~prefastTest: metamask-crx@0.0.0 +6 silly lifecycle metamask-crx@0.0.0~prefastTest: no script for prefastTest, continuing +7 info lifecycle metamask-crx@0.0.0~fastTest: metamask-crx@0.0.0 +8 verbose lifecycle metamask-crx@0.0.0~fastTest: unsafe-perm in lifecycle true +9 verbose lifecycle metamask-crx@0.0.0~fastTest: PATH: /usr/lib/node_modules/npm/bin/node-gyp-bin:/home/zanibas/Programs/Metamask/metamask-plugin/node_modules/.bin:/usr/bin:/usr/local/heroku/bin:/home/zanibas/.rbenv/plugins/ruby-build/bin:/home/zanibas/.rbenv/shims:/home/zanibas/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/Bluemix/bin:/usr/local/Bluemix/bin +10 verbose lifecycle metamask-crx@0.0.0~fastTest: CWD: /home/zanibas/Programs/Metamask/metamask-plugin +11 silly lifecycle metamask-crx@0.0.0~fastTest: Args: [ '-c', +11 silly lifecycle 'mocha --require test/helper.js --compilers js:babel-register --recursive "test/unit/**/*.js"' ] +12 silly lifecycle metamask-crx@0.0.0~fastTest: Returned: code: 1 signal: null +13 info lifecycle metamask-crx@0.0.0~fastTest: Failed to exec fastTest script +14 verbose stack Error: metamask-crx@0.0.0 fastTest: `mocha --require test/helper.js --compilers js:babel-register --recursive "test/unit/**/*.js"` +14 verbose stack Exit status 1 +14 verbose stack at EventEmitter. (/usr/lib/node_modules/npm/lib/utils/lifecycle.js:242:16) +14 verbose stack at emitTwo (events.js:106:13) +14 verbose stack at EventEmitter.emit (events.js:191:7) +14 verbose stack at ChildProcess. (/usr/lib/node_modules/npm/lib/utils/spawn.js:40:14) +14 verbose stack at emitTwo (events.js:106:13) +14 verbose stack at ChildProcess.emit (events.js:191:7) +14 verbose stack at maybeClose (internal/child_process.js:852:16) +14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:215:5) +15 verbose pkgid metamask-crx@0.0.0 +16 verbose cwd /home/zanibas/Programs/Metamask/metamask-plugin +17 error Linux 3.13.0-83-generic +18 error argv "/usr/bin/nodejs" "/usr/bin/npm" "run" "fastTest" +19 error node v6.3.1 +20 error npm v3.10.3 +21 error code ELIFECYCLE +22 error metamask-crx@0.0.0 fastTest: `mocha --require test/helper.js --compilers js:babel-register --recursive "test/unit/**/*.js"` +22 error Exit status 1 +23 error Failed at the metamask-crx@0.0.0 fastTest script 'mocha --require test/helper.js --compilers js:babel-register --recursive "test/unit/**/*.js"'. +23 error Make sure you have the latest version of node.js and npm installed. +23 error If you do, this is most likely a problem with the metamask-crx package, +23 error not with npm itself. +23 error Tell the author that this fails on your system: +23 error mocha --require test/helper.js --compilers js:babel-register --recursive "test/unit/**/*.js" +23 error You can get information on how to open an issue for this project with: +23 error npm bugs metamask-crx +23 error Or if that isn't available, you can get their info via: +23 error npm owner ls metamask-crx +23 error There is likely additional logging output above. +24 verbose exit [ 1, true ] diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 7236a2471..190045c02 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -10,7 +10,6 @@ const valuesFor = require('./util').valuesFor const Identicon = require('./components/identicon') const AccountEtherBalance = require('./components/account-eth-balance') -const EtherBalance = require('./components/eth-balance') const TransactionList = require('./components/transaction-list') const ExportAccountView = require('./components/account-export') const ethUtil = require('ethereumjs-util') diff --git a/ui/app/actions.js b/ui/app/actions.js index 464395a82..dadf124d8 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -236,16 +236,11 @@ function revealAccount () { } } - - function setCurrentFiat (fiat) { return (dispatch) => { dispatch(this.showLoadingIndication()) _accountManager.setCurrentFiat(fiat, (data, err) => { dispatch(this.hideLoadingIndication()) - console.log("NEW THINGS") - console.log("==========") - console.log(data.currentFiat, data.conversionRate, data.conversionDate) dispatch({ type: this.SET_CURRENT_FIAT, value: { diff --git a/ui/app/components/account-eth-balance.js b/ui/app/components/account-eth-balance.js index b748ea2ea..4cdab235a 100644 --- a/ui/app/components/account-eth-balance.js +++ b/ui/app/components/account-eth-balance.js @@ -65,7 +65,7 @@ EthBalanceComponent.prototype.renderBalance = function (value, state) { h('.flex-column', [ h(Tooltip, { position: 'bottom', - title: `${balance} ${label}`, + title: `${ethNumber} ${ethSuffix}`, }, [ h('.flex-row', { style: { diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js index a5584a235..6c324c947 100644 --- a/ui/app/components/eth-balance.js +++ b/ui/app/components/eth-balance.js @@ -1,7 +1,6 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits -const connect = require('react-redux').connect const formatBalance = require('../util').formatBalance const generateBalanceObject = require('../util').generateBalanceObject const Tooltip = require('./tooltip.js') diff --git a/ui/app/config.js b/ui/app/config.js index 664bcd2a7..c86d377bb 100644 --- a/ui/app/config.js +++ b/ui/app/config.js @@ -4,7 +4,7 @@ const h = require('react-hyperscript') const connect = require('react-redux').connect const actions = require('./actions') const currencies = require('./conversion-util').availableCurrencies.rows -const Select = require('react-select') +// const Select = require('react-select') module.exports = connect(mapStateToProps)(ConfigScreen) @@ -103,27 +103,27 @@ ConfigScreen.prototype.render = function () { function currentConversionInformation (metamaskState, state) { var currentFiat = metamaskState.currentFiat - return h('div'), [ + return h('div', [ h('span', {style: { fontWeight: 'bold', paddingRight: '10px'}}, 'Current Conversion'), h('select#currentFiat', { onChange (event) { event.preventDefault() - var element = document.getElementById("currentFiat") + var element = document.getElementById('currentFiat') var newFiat = element.value state.dispatch(actions.setCurrentFiat(newFiat)) }, value: currentFiat, defaultValue: currentFiat, }, currencies.map((currency) => { - return h('option', {key: currency.code, value: currency.code}, `${currency.code} - ${currency.name}`) - }) + return h('option', {key: currency.code, value: currency.code}, `${currency.code} - ${currency.name}`) + }) // [ // h('option', {key: 'USD', value: 'USD'}, 'USD'), // h('option', {key: 'EUR', value: 'EUR'}, 'EUR'), // h('option', {key: 'JPY', value: 'JPY'}, 'JPY'), // ] ), - ] + ]) } function currentProviderDisplay (metamaskState) { diff --git a/ui/app/util.js b/ui/app/util.js index eac895ddd..e1fd6e399 100644 --- a/ui/app/util.js +++ b/ui/app/util.js @@ -145,7 +145,7 @@ function shortenBalance (balance, decimalsToKeep = 1) { } else if (convertedBalance > 1000) { truncatedValue = (balance / 1000).toFixed(decimalsToKeep) return `>${truncatedValue}k` - } else if (convertedBalance == 0) { + } else if (convertedBalance === 0) { return '0' } else if (convertedBalance < 1) { var exponent = balance.match(/\.0*/)[0].length