aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/first-time-flow/welcome
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2019-02-27 22:46:41 +0800
committerWhymarrh Whitby <whymarrh.whitby@gmail.com>2019-02-27 22:46:41 +0800
commitcb2698d20eae273d372d03e11fa765a91c330c17 (patch)
treef23b852b074dad770bfd970799220b63c40459b7 /ui/app/components/pages/first-time-flow/welcome
parenta2320c76fef084b7ec01839ab9c17b474839b3c0 (diff)
downloadtangerine-wallet-browser-cb2698d20eae273d372d03e11fa765a91c330c17.tar.gz
tangerine-wallet-browser-cb2698d20eae273d372d03e11fa765a91c330c17.tar.zst
tangerine-wallet-browser-cb2698d20eae273d372d03e11fa765a91c330c17.zip
First time flow updates (#6192)
* Action select step of onboarding flow added. * Update navigation on create and import password screens. * Adds terms of service checkbox to create and import account screens. * Add security warning to jazzicon intro step * Update and streamline unique image to confirm seed steps of first time flow. * UI touch ups to welcome screen. * UI touch up on select action page * Fix first time import flow. * Add end of flow screen to first time flow * Replace unique image screen with updated fishing warning screen. * Update e2e tests for onboarding flow changes. * Add required translations to onboarding flow. * Update design of select action screen to emphasize create new wallet option. * Clean up onboarding flow code. * Remove notice related code from first-time-flow directory. * Use updater function argument in new-account.component
Diffstat (limited to 'ui/app/components/pages/first-time-flow/welcome')
-rw-r--r--ui/app/components/pages/first-time-flow/welcome/index.scss31
-rw-r--r--ui/app/components/pages/first-time-flow/welcome/welcome.component.js16
2 files changed, 23 insertions, 24 deletions
diff --git a/ui/app/components/pages/first-time-flow/welcome/index.scss b/ui/app/components/pages/first-time-flow/welcome/index.scss
index 7527ceb35..3b5071480 100644
--- a/ui/app/components/pages/first-time-flow/welcome/index.scss
+++ b/ui/app/components/pages/first-time-flow/welcome/index.scss
@@ -1,43 +1,42 @@
.welcome-page {
display: flex;
flex-direction: column;
- justify-content: center;
+ justify-content: flex-start;
align-items: center;
- width: 400px;
+ max-width: 442px;
padding: 0 18px;
+ color: black;
&__wrapper {
display: flex;
flex-direction: row;
justify-content: center;
- align-items: center;
+ align-items: flex-start;
height: 100%;
+ margin-top: 110px;
}
&__header {
- font-size: 1.5rem;
- margin-bottom: 14px;
+ font-size: 28px;
+ margin-bottom: 22px;
+ margin-top: 50px;
}
&__description {
text-align: center;
+ div {
+ font-size: 16px;
+ }
+
@media screen and (max-width: 575px) {
font-size: .9rem;
}
}
- &__button {
- height: 54px;
- width: 198px;
- font-family: Roboto;
- box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .14);
- color: $white;
- font-size: 1.25rem;
+ .first-time-flow__button {
+ width: 184px;
font-weight: 500;
- text-transform: uppercase;
- margin: 35px 0 14px;
- transition: 200ms ease-in-out;
- background-color: rgba(247, 134, 28, .9);
+ margin-top: 44px;
}
}
diff --git a/ui/app/components/pages/first-time-flow/welcome/welcome.component.js b/ui/app/components/pages/first-time-flow/welcome/welcome.component.js
index f28a8210d..08eb86939 100644
--- a/ui/app/components/pages/first-time-flow/welcome/welcome.component.js
+++ b/ui/app/components/pages/first-time-flow/welcome/welcome.component.js
@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react'
import PropTypes from 'prop-types'
import Mascot from '../../../mascot'
import Button from '../../../button'
-import { INITIALIZE_CREATE_PASSWORD_ROUTE, INITIALIZE_NOTICE_ROUTE } from '../../../../routes'
+import { INITIALIZE_SELECT_ACTION_ROUTE, INITIALIZE_UNIQUE_IMAGE_ROUTE } from '../../../../routes'
export default class Welcome extends PureComponent {
static propTypes = {
@@ -25,12 +25,12 @@ export default class Welcome extends PureComponent {
const { history, isInitialized } = this.props
if (isInitialized) {
- history.push(INITIALIZE_NOTICE_ROUTE)
+ history.push(INITIALIZE_UNIQUE_IMAGE_ROUTE)
}
}
handleContinue = () => {
- this.props.history.push(INITIALIZE_CREATE_PASSWORD_ROUTE)
+ this.props.history.push(INITIALIZE_SELECT_ACTION_ROUTE)
}
render () {
@@ -41,22 +41,22 @@ export default class Welcome extends PureComponent {
<div className="welcome-page">
<Mascot
animationEventEmitter={this.animationEventEmitter}
- width="225"
- height="225"
+ width="125"
+ height="125"
/>
<div className="welcome-page__header">
{ t('welcome') }
</div>
<div className="welcome-page__description">
<div>{ t('metamaskDescription') }</div>
- <div>{ t('holdEther') }</div>
+ <div>{ t('happyToSeeYou') }</div>
</div>
<Button
- type="first-time"
+ type="confirm"
className="first-time-flow__button"
onClick={this.handleContinue}
>
- { t('continue') }
+ { t('getStarted') }
</Button>
</div>
</div>