aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-03-07 02:32:47 +0800
committerGitHub <noreply@github.com>2018-03-07 02:32:47 +0800
commita4bd7992cd960b105f842e0e34637f2675a6665f (patch)
tree65f3afb32aa81429a6c9a4f7a5d7b32e47a75a85 /ui
parentd3a0a27c0caafb066e66e444d6fbe71243bd35f6 (diff)
parentdd9cac69aed9a16f9bcf738e90dcd2c864f07bb5 (diff)
downloadtangerine-wallet-browser-a4bd7992cd960b105f842e0e34637f2675a6665f.tar
tangerine-wallet-browser-a4bd7992cd960b105f842e0e34637f2675a6665f.tar.gz
tangerine-wallet-browser-a4bd7992cd960b105f842e0e34637f2675a6665f.tar.bz2
tangerine-wallet-browser-a4bd7992cd960b105f842e0e34637f2675a6665f.tar.lz
tangerine-wallet-browser-a4bd7992cd960b105f842e0e34637f2675a6665f.tar.xz
tangerine-wallet-browser-a4bd7992cd960b105f842e0e34637f2675a6665f.tar.zst
tangerine-wallet-browser-a4bd7992cd960b105f842e0e34637f2675a6665f.zip
Merge branch 'master' into ImportAccountMessageV2
Diffstat (limited to 'ui')
-rw-r--r--ui/app/app.js12
-rw-r--r--ui/app/components/shapeshift-form.js9
-rw-r--r--ui/app/css/itcss/components/header.scss7
3 files changed, 14 insertions, 14 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index bfa8d8aa7..4e6da24c3 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -90,6 +90,7 @@ function mapStateToProps (state) {
isMouseUser: state.appState.isMouseUser,
betaUI: state.metamask.featureFlags.betaUI,
isRevealingSeedWords: state.metamask.isRevealingSeedWords,
+ Qr: state.appState.Qr,
// state needed to get account dropdown temporarily rendering from app bar
identities,
@@ -287,10 +288,10 @@ App.prototype.renderAppBar = function () {
}),
// metamask name
- h('h1', 'MetaMask'),
-
- h('div.beta-label', 'BETA'),
-
+ h('.flex-row', [
+ h('h1', 'MetaMask'),
+ h('div.beta-label', 'BETA'),
+ ]),
]),
h('div.header__right-actions', [
@@ -368,6 +369,7 @@ App.prototype.renderPrimary = function () {
isOnboarding,
betaUI,
isRevealingSeedWords,
+ Qr,
} = props
const isMascaraOnboarding = isMascara && isOnboarding
const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords
@@ -508,7 +510,7 @@ App.prototype.renderPrimary = function () {
width: '285px',
},
}, [
- h(QrView, {key: 'qr'}),
+ h(QrView, {key: 'qr', Qr}),
]),
])
diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js
index 2270b8236..648b05049 100644
--- a/ui/app/components/shapeshift-form.js
+++ b/ui/app/components/shapeshift-form.js
@@ -51,8 +51,7 @@ ShapeshiftForm.prototype.componentWillMount = function () {
this.props.shapeShiftSubview()
}
-ShapeshiftForm.prototype.onCoinChange = function (e) {
- const coin = e.target.value
+ShapeshiftForm.prototype.onCoinChange = function (coin) {
this.setState({
depositCoin: coin,
errorMessage: '',
@@ -133,7 +132,7 @@ ShapeshiftForm.prototype.renderMarketInfo = function () {
}
ShapeshiftForm.prototype.renderQrCode = function () {
- const { depositAddress, isLoading } = this.state
+ const { depositAddress, isLoading, depositCoin } = this.state
const qrImage = qrcode(4, 'M')
qrImage.addData(depositAddress)
qrImage.make()
@@ -141,7 +140,7 @@ ShapeshiftForm.prototype.renderQrCode = function () {
return h('div.shapeshift-form', {}, [
h('div.shapeshift-form__deposit-instruction', [
- 'Deposit your BTC to the address below:',
+ `Deposit your ${depositCoin.toUpperCase()} to the address below:`,
]),
h('div', depositAddress),
@@ -182,7 +181,7 @@ ShapeshiftForm.prototype.render = function () {
h(SimpleDropdown, {
selectedOption: this.state.depositCoin,
- onSelect: this.onCoinChange,
+ onSelect: (coin) => this.onCoinChange(coin),
options: Object.entries(coinOptions).map(([coin]) => ({
value: coin.toLowerCase(),
displayValue: coin,
diff --git a/ui/app/css/itcss/components/header.scss b/ui/app/css/itcss/components/header.scss
index d91ab3c48..eeed9ee06 100644
--- a/ui/app/css/itcss/components/header.scss
+++ b/ui/app/css/itcss/components/header.scss
@@ -80,11 +80,10 @@
font-family: Roboto;
text-transform: uppercase;
font-weight: 500;
- font-size: 0.8rem;
- padding-left: 9px;
+ font-size: .8rem;
color: $buttercup;
- align-self: flex-start;
- margin-top: 10px;
+ margin-left: 5px;
+ line-height: initial;
@media screen and (max-width: 575px) {
display: none;