diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-08-19 11:24:17 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-08-19 11:24:17 +0800 |
| commit | e3e5538ddcf79ce0db6e7469a1c0b6c4847de276 (patch) | |
| tree | 651f54224c75b6f77a47a985eddb632e00176857 | |
| parent | 5b9f7a92886307fe9f3fdbfe6b120c0f2023d06f (diff) | |
| download | tangerine-wallet-browser-e3e5538ddcf79ce0db6e7469a1c0b6c4847de276.tar tangerine-wallet-browser-e3e5538ddcf79ce0db6e7469a1c0b6c4847de276.tar.gz tangerine-wallet-browser-e3e5538ddcf79ce0db6e7469a1c0b6c4847de276.tar.bz2 tangerine-wallet-browser-e3e5538ddcf79ce0db6e7469a1c0b6c4847de276.tar.lz tangerine-wallet-browser-e3e5538ddcf79ce0db6e7469a1c0b6c4847de276.tar.xz tangerine-wallet-browser-e3e5538ddcf79ce0db6e7469a1c0b6c4847de276.tar.zst tangerine-wallet-browser-e3e5538ddcf79ce0db6e7469a1c0b6c4847de276.zip | |
Remove "+" from shapeshift tx and change wording in CHANGELOG
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | ui/app/components/shift-list-item.js | 28 |
2 files changed, 8 insertions, 22 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 493612fef..1d0f3f001 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## Current Master - Added ShapeShift to the transaction history -- Added PUB.KEY too ShapeShift request for affiliate program +- Added affiliate key to Shapeshift requests - Added feature to reflect current conversion rates of current vault balance. ## 2.8.0 2016-08-15 diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js index 6e41a2ec3..9d5340447 100644 --- a/ui/app/components/shift-list-item.js +++ b/ui/app/components/shift-list-item.js @@ -95,29 +95,15 @@ ShiftListItem.prototype.renderUtilComponents = function () { h(CopyButton, { value: this.props.response.transaction, }), - h('.flex-row', { + h(EtherBalance, { + value: `${props.response.outgoingCoin}`, + width: '55px', + shorten: true, style: { - alignItems: 'baseline', + fontSize: '15px', + color: '#01888C', }, - }, [ - h('div', { - style: { - fontFamily: 'Montserrat Light', - position: 'relative', - left: '6px', - color: '#01888C', - }, - }, '+'), - h(EtherBalance, { - value: `${props.response.outgoingCoin}`, - width: '55px', - shorten: true, - style: { - fontSize: '15px', - color: '#01888C', - }, - }), - ]), + }), ]) case 'failed': |