diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-03-29 04:21:53 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-29 04:23:50 +0800 |
| commit | 58f52b2b8de9efd43896e23ab0ac9972f45bb278 (patch) | |
| tree | cb1cca580f1ea1986eeb82b3271a5f013b3e6498 /mascara/src/app/first-time/notice-screen.js | |
| parent | 6f367a5a6b4fb8918405f233293dc3f4840b4a3d (diff) | |
| download | tangerine-wallet-browser-58f52b2b8de9efd43896e23ab0ac9972f45bb278.tar tangerine-wallet-browser-58f52b2b8de9efd43896e23ab0ac9972f45bb278.tar.gz tangerine-wallet-browser-58f52b2b8de9efd43896e23ab0ac9972f45bb278.tar.bz2 tangerine-wallet-browser-58f52b2b8de9efd43896e23ab0ac9972f45bb278.tar.lz tangerine-wallet-browser-58f52b2b8de9efd43896e23ab0ac9972f45bb278.tar.xz tangerine-wallet-browser-58f52b2b8de9efd43896e23ab0ac9972f45bb278.tar.zst tangerine-wallet-browser-58f52b2b8de9efd43896e23ab0ac9972f45bb278.zip | |
Fix merge conflicts. Refactor onboarding flow.
Diffstat (limited to 'mascara/src/app/first-time/notice-screen.js')
| -rw-r--r-- | mascara/src/app/first-time/notice-screen.js | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/mascara/src/app/first-time/notice-screen.js b/mascara/src/app/first-time/notice-screen.js index caba71866..90213fe16 100644 --- a/mascara/src/app/first-time/notice-screen.js +++ b/mascara/src/app/first-time/notice-screen.js @@ -70,27 +70,29 @@ class NoticeScreen extends Component { isLoading ? <LoadingScreen /> : ( - <div className="first-view-main-wrapper"> - <div className="first-view-main"> - <div - className="tou" - onScroll={this.onScroll} - > - <Identicon address={address} diameter={70} /> - <div className="tou__title">{title}</div> - <Markdown - className="tou__body markdown" - source={body} - skipHtml - /> - <button - className="first-time-flow__button" - onClick={atBottom && this.acceptTerms} - disabled={!atBottom} + <div className="first-time-flow"> + <div className="first-view-main-wrapper"> + <div className="first-view-main"> + <div + className="tou" + onScroll={this.onScroll} > - Accept - </button> - <Breadcrumbs total={3} currentIndex={2} /> + <Identicon address={address} diameter={70} /> + <div className="tou__title">{title}</div> + <Markdown + className="tou__body markdown" + source={body} + skipHtml + /> + <button + className="first-time-flow__button" + onClick={atBottom && this.acceptTerms} + disabled={!atBottom} + > + Accept + </button> + <Breadcrumbs total={3} currentIndex={2} /> + </div> </div> </div> </div> |