aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacky Chan <jchan@uber.com>2017-08-30 18:10:47 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-10-21 12:51:37 +0800
commitad647050d6ada1ff03232002e7e825fb6f52fe78 (patch)
tree4c35bdffca379f1faa1f4256865c9810d3881e4b
parenta4ad88c331eb3e9f82cd54c1608e5e6bba201594 (diff)
downloadtangerine-wallet-browser-ad647050d6ada1ff03232002e7e825fb6f52fe78.tar
tangerine-wallet-browser-ad647050d6ada1ff03232002e7e825fb6f52fe78.tar.gz
tangerine-wallet-browser-ad647050d6ada1ff03232002e7e825fb6f52fe78.tar.bz2
tangerine-wallet-browser-ad647050d6ada1ff03232002e7e825fb6f52fe78.tar.lz
tangerine-wallet-browser-ad647050d6ada1ff03232002e7e825fb6f52fe78.tar.xz
tangerine-wallet-browser-ad647050d6ada1ff03232002e7e825fb6f52fe78.tar.zst
tangerine-wallet-browser-ad647050d6ada1ff03232002e7e825fb6f52fe78.zip
Move "Skip this step" to side panel
-rw-r--r--mascara/src/app/first-time/buy-ether-screen.js19
-rw-r--r--mascara/src/app/first-time/index.css10
2 files changed, 17 insertions, 12 deletions
diff --git a/mascara/src/app/first-time/buy-ether-screen.js b/mascara/src/app/first-time/buy-ether-screen.js
index 36a18956a..8077b134c 100644
--- a/mascara/src/app/first-time/buy-ether-screen.js
+++ b/mascara/src/app/first-time/buy-ether-screen.js
@@ -47,16 +47,18 @@ class BuyEtherScreen extends Component {
setTimeout(() => this.setState({ justCopied: false }), 1000)
}
- renderSkipStep() {
+ renderSkip() {
const {showAccountDetail, address} = this.props
return (
- <button
- className="first-time-flow__button--tertiary"
+ <div
+ className="buy-ether__side-panel-exit"
onClick={() => showAccountDetail(address)}
>
- Skip this step
- </button>
+ <div className="buy-ether__side-panel-item-name">
+ Do it later
+ </div>
+ </div>
)
}
@@ -100,8 +102,6 @@ class BuyEtherScreen extends Component {
>
Buy
</button>
- <div className="buy-ether__button-separator-text">or</div>
- {this.renderSkipStep()}
</div>
</div>
)
@@ -126,8 +126,6 @@ class BuyEtherScreen extends Component {
>
Buy
</button>
- <div className="buy-ether__button-separator-text">or</div>
- {this.renderSkipStep()}
</div>
</div>
)
@@ -148,8 +146,6 @@ class BuyEtherScreen extends Component {
>
{ justCopied ? 'Copied' : 'Copy' }
</button>
- <div className="buy-ether__button-separator-text">or</div>
- {this.renderSkipStep()}
</div>
</div>
)
@@ -189,6 +185,7 @@ class BuyEtherScreen extends Component {
)}
</div>
))}
+ {this.renderSkip()}
</div>
<div className="buy-ether__action-content">
{this.renderContent()}
diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css
index f0d62679c..483bda212 100644
--- a/mascara/src/app/first-time/index.css
+++ b/mascara/src/app/first-time/index.css
@@ -361,7 +361,8 @@ button.backup-phrase__confirm-seed-option:hover {
flex-flow: column nowrap;
}
-.buy-ether__side-panel-item {
+.buy-ether__side-panel-item,
+.buy-ether__side-panel-exit {
display: flex;
flex-flow: row nowrap;
align-items: center;
@@ -372,6 +373,13 @@ button.backup-phrase__confirm-seed-option:hover {
line-height: 18px;
cursor: pointer;
min-width: 140px;
+}
+
+.buy-ether__side-panel-exit {
+ color: #FF001F;
+}
+
+.buy-ether__side-panel-item {
border-bottom: 1px solid #CDCDCD;
}