diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2017-07-01 01:55:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 01:55:01 +0800 |
| commit | 7de87154e829581c4f97d77294863af204ddf15c (patch) | |
| tree | be2e94d02e85a5e9574fdeaa0a4b8075e545912d | |
| parent | 8abd592034649ee0ad47eaaa33859b99d206df1f (diff) | |
| parent | 6a502b9170ff269c0e1502d2798bcf7aa6652eb1 (diff) | |
| download | tangerine-wallet-browser-7de87154e829581c4f97d77294863af204ddf15c.tar.gz tangerine-wallet-browser-7de87154e829581c4f97d77294863af204ddf15c.tar.zst tangerine-wallet-browser-7de87154e829581c4f97d77294863af204ddf15c.zip | |
Merge branch 'master' into NoPopularTOkens
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | ui/app/components/token-cell.js | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 46a093b8d..9943a8e15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## Current Master - Temporarily disabled loading popular tokens by default to improve performance. +- Remove SEND token button until a better token sending form can be built, due to some precision issues. +- Fix precision bug in token balances. +- Cache token symbol and precisions to reduce network load. +- Transpile some newer JavaScript, restores compatibility with some older browsers. ## 3.8.0 2017-6-28 diff --git a/package.json b/package.json index a8aec2f04..3b608af0e 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.1.1", "eth-simple-keyring": "^1.1.1", - "eth-token-tracker": "^1.0.9", + "eth-token-tracker": "^1.1.2", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", diff --git a/ui/app/components/token-cell.js b/ui/app/components/token-cell.js index 48f46934a..19d7139bb 100644 --- a/ui/app/components/token-cell.js +++ b/ui/app/components/token-cell.js @@ -31,9 +31,11 @@ TokenCell.prototype.render = function () { h('span', { style: { flex: '1 0 auto' } }), + /* h('button', { onClick: this.send.bind(this, address), }, 'SEND'), + */ ]) ) |