diff options
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | package.json | 18 | ||||
| -rw-r--r-- | ui/app/util.js | 2 | ||||
| -rw-r--r-- | ui/test/unit/util_test.js | 2 |
7 files changed, 29 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..77772408e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: node_js +env: + - CXX=g++-4.8 +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 +node_js: + - "5.1" +before_script: + - npm install -g mocha diff --git a/CHANGELOG.md b/CHANGELOG.md index 25b59193b..e74a095dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,13 @@ ## Current Master +# 1.5.1 2016-04-15 + - Corrected text above account list. Selected account is visible to all sites, not just the current domain. - Merged the UI codebase into the main plugin codebase for simpler maintenance. - Fix Ether display rounding error. Now rendering to four decimal points. +- Fix some inpage synchronous methods +- Change account rendering to show four decimals and a leading zero. ## 1.5.0 2016-04-13 @@ -1,4 +1,4 @@ -# Metamask Plugin +# Metamask Plugin [](https://travis-ci.com/MetaMask/metamask-plugin) ## Development diff --git a/app/manifest.json b/app/manifest.json index 129c6b687..695451635 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "Metamask", - "version": "1.5.0", + "version": "1.5.1", "manifest_version": 2, "description": "__MSG_appDescription__", "icons": { diff --git a/package.json b/package.json index e871d8721..db0e2823a 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,10 @@ "private": true, "scripts": { "start": "gulp dev", - "test": "mocha --require test/helper.js --compilers js:babel-register --recursive", + "test": "npm run testUi", + "testPlugin": "mocha --require test/helper.js --compilers js:babel-register --recursive", "watch": "mocha watch --compilers js:babel-register --recursive", - "testUi": "mocha ui/test/**/*test.js", + "testUi": "mocha ui/test/**/**/*test.js", "watchUi": "mocha watch ui/test/**/*test.js" }, "browserify": { @@ -33,7 +34,7 @@ "eth-lightwallet": "^2.2.2", "eth-store": "^1.1.0", "ethereumjs-tx": "^1.0.0", - "ethereumjs-util": "^2.6.0", + "ethereumjs-util": "^4.3.0", "faux-jax": "git+https://github.com/kumavis/faux-jax.git#c3648de04804f3895c5b4972750cae5b51ddb103", "hat": "0.0.3", "inject-css": "^0.1.1", @@ -41,15 +42,11 @@ "multiplex": "^6.7.0", "pojo-migrator": "^2.1.0", "pumpify": "^1.3.4", - "react": "^15.0.1", - "react-addons-css-transition-group": "^15.0.1", - "react-dom": "^15.0.1", - "react-hyperscript": "^2.4.0", - "readable-stream": "^2.0.5", "react": "^0.14.3", "react-addons-css-transition-group": "^0.14.7", "react-dom": "^0.14.3", "react-hyperscript": "^2.2.2", + "readable-stream": "^2.0.5", "react-redux": "^4.0.3", "redux": "^3.0.5", "redux-logger": "^2.3.1", @@ -62,11 +59,11 @@ "xtend": "^4.0.1" }, "devDependencies": { - "brfs": "^1.4.3", "babel-preset-es2015": "^6.6.0", - "babelify": "^7.2.0", "babel-register": "^6.7.2", + "babelify": "^7.2.0", "beefy": "^2.1.5", + "brfs": "^1.4.3", "browserify": "^13.0.0", "chai": "^3.5.0", "deep-freeze-strict": "^1.1.1", @@ -84,6 +81,7 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^1.1.5", "sinon": "^1.17.3", + "tape": "^4.5.1", "uglifyify": "^3.0.1", "vinyl-buffer": "^1.0.0", "vinyl-source-stream": "^1.1.0", diff --git a/ui/app/util.js b/ui/app/util.js index 67b7c8f67..18862fade 100644 --- a/ui/app/util.js +++ b/ui/app/util.js @@ -71,7 +71,7 @@ function formatBalance(balance) { var padded = wei.toString(10) var len = padded.length var nonZeroIndex = padded.match(/[^0]/) && padded.match(/[^0]/).index - var beforeDecimal = padded.substr(nonZeroIndex ? nonZeroIndex : 0, len - 18) + var beforeDecimal = padded.substr(nonZeroIndex ? nonZeroIndex : 0, len - 18) || '0' var afterDecimal = padded.substr(len - 18, decimalsToKeep) return `${beforeDecimal}.${afterDecimal} ETH` } diff --git a/ui/test/unit/util_test.js b/ui/test/unit/util_test.js index 7e34bba1c..b35d60812 100644 --- a/ui/test/unit/util_test.js +++ b/ui/test/unit/util_test.js @@ -71,7 +71,7 @@ describe('util', function() { it('should return eth as string followed by ETH', function() { var input = new ethUtil.BN(ethInWei, 10).div(new ethUtil.BN('2', 10)).toJSON() var result = util.formatBalance(input) - assert.equal(result, '.5000 ETH') + assert.equal(result, '0.5000 ETH') }) it('should display four decimal points', function() { |