diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-04-03 06:03:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 06:03:54 +0800 |
| commit | fa66b78b8b2c2b8519e818744941cfb6dece92f8 (patch) | |
| tree | 0b0611471b57f48e868b423c66e0e524d375b081 /ui/app | |
| parent | f0e4097972342ea9b8f0e40ef24a1b9ea33d1812 (diff) | |
| parent | 331b62a6a2450aa5be6881877f5312a70ea92e63 (diff) | |
| download | tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.gz tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.bz2 tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.lz tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.xz tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.tar.zst tangerine-wallet-browser-fa66b78b8b2c2b8519e818744941cfb6dece92f8.zip | |
Merge branch 'master' into lint-sys-fix
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/components/identicon.js | 5 | ||||
| -rw-r--r-- | ui/app/send-v2.js | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ui/app/components/identicon.js b/ui/app/components/identicon.js index 7cc5a4de0..dce9b0449 100644 --- a/ui/app/components/identicon.js +++ b/ui/app/components/identicon.js @@ -105,9 +105,8 @@ IdenticonComponent.prototype.componentDidUpdate = function () { function _generateBlockie (container, address, diameter) { const img = new Image() img.src = toDataUrl(address) - const dia = !diameter || diameter < 50 ? 50 : diameter - img.height = dia * 1.25 - img.width = dia * 1.25 + img.height = diameter + img.width = diameter container.appendChild(img) } diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js index bcc5cb03d..0f2997fb2 100644 --- a/ui/app/send-v2.js +++ b/ui/app/send-v2.js @@ -635,6 +635,10 @@ SendTransactionScreen.prototype.onSubmit = function (event) { txParams.to = to } + Object.keys(txParams).forEach(key => { + txParams[key] = ethUtil.addHexPrefix(txParams[key]) + }) + selectedToken ? signTokenTx(selectedToken.address, to, amount, txParams) : signTx(txParams) |