aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorsdtsui <szehungdanieltsui@gmail.com>2017-07-30 04:31:53 +0800
committersdtsui <szehungdanieltsui@gmail.com>2017-07-30 04:31:53 +0800
commitc0483fc230ec1893f15c6f8994f63e318474846e (patch)
treeb2dff817b3fc2fece892ce75bc9ecf845bfe091d /ui
parent8c5be547228c9801ab616beb5054b888509463f9 (diff)
downloadtangerine-wallet-browser-c0483fc230ec1893f15c6f8994f63e318474846e.tar.gz
tangerine-wallet-browser-c0483fc230ec1893f15c6f8994f63e318474846e.tar.zst
tangerine-wallet-browser-c0483fc230ec1893f15c6f8994f63e318474846e.zip
Add token logo to send screen
Diffstat (limited to 'ui')
-rw-r--r--ui/app/app.js10
-rw-r--r--ui/app/send.js24
2 files changed, 32 insertions, 2 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 6537e2f56..2eb037460 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -171,6 +171,16 @@ App.prototype.renderAppBar = function () {
]),
]),
+
+ h('.app-header', {
+ style: {
+ visibility: props.isUnlocked ? 'visible' : 'none',
+ background: '#EFEFEF', // $gallery
+ height: '38px',
+ position: 'relative',
+ zIndex: 12,
+ },
+ })
])
)
}
diff --git a/ui/app/send.js b/ui/app/send.js
index a21a219eb..1235da223 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -11,6 +11,9 @@ const isHex = require('./util').isHex
const EthBalance = require('./components/eth-balance')
const EnsInput = require('./components/ens-input')
const ethUtil = require('ethereumjs-util')
+
+const ARAGON = '960b236A07cf122663c4303350609A66A7B288C0'
+
module.exports = connect(mapStateToProps)(SendTransactionScreen)
function mapStateToProps (state) {
@@ -58,16 +61,33 @@ SendTransactionScreen.prototype.render = function () {
h('.send-screen.flex-column.flex-grow', [
+ h('div', {
+ style: {
+ position: 'fixed',
+ zIndex: 15, // token-icon-z-index
+ marginTop: '-55px',
+ marginLeft: '20%',
+ }
+ }, [
+ h(Identicon, {
+ address: ARAGON,
+ diameter: 76,
+ }),
+ ]),
+
//
// Sender Profile
//
-
h('.account-data-subsection.flex-row.flex-grow', {
style: {
margin: '0 20px',
+ width: '335px',
+ background: 'white', // $white
+ marginTop: '-15px',
+ zIndex: 13, // $send-screen-z-index
+ display: 'flex',
},
}, [
-
// header - identicon + nav
h('.flex-row.flex-space-between', {
style: {