diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-03-27 05:55:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 05:55:50 +0800 |
| commit | e001c0900b5256c0c8769f0c3eb5d2007f5b18d3 (patch) | |
| tree | e4d0d583df9f25972a629b177d617b079d80314c /mascara/src/app | |
| parent | b0fae2ca392f38952cd01f26bfc4886b601baf17 (diff) | |
| parent | c9e3e99385571a5b296453798d4be0061feca883 (diff) | |
| download | tangerine-wallet-browser-e001c0900b5256c0c8769f0c3eb5d2007f5b18d3.tar.gz tangerine-wallet-browser-e001c0900b5256c0c8769f0c3eb5d2007f5b18d3.tar.zst tangerine-wallet-browser-e001c0900b5256c0c8769f0c3eb5d2007f5b18d3.zip | |
Merge pull request #3680 from danjm/i3517-popup-newui-onboarding
Popup uses new ui onboarding when in beta.
Diffstat (limited to 'mascara/src/app')
| -rw-r--r-- | mascara/src/app/first-time/index.css | 9 | ||||
| -rw-r--r-- | mascara/src/app/first-time/index.js | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css index d7b146e51..5f8bbd4be 100644 --- a/mascara/src/app/first-time/index.css +++ b/mascara/src/app/first-time/index.css @@ -122,6 +122,10 @@ width: calc(100vw - 80px); } + .unique-image { + width: auto; + } + .create-password__title, .unique-image__title, .tou__title, @@ -221,10 +225,6 @@ max-width: 46rem; } -.backup-phrase { - width: 100%; -} - .create-password__title, .unique-image__title, .tou__title, @@ -674,7 +674,6 @@ button.backup-phrase__confirm-seed-option:hover { } .buy-ether__action-content-wrapper { - width: 360px; display: flex; flex-flow: column nowrap; } diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index da2f6bab9..c0bba53d6 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -10,6 +10,7 @@ import ImportSeedPhraseScreen from './import-seed-phrase-screen' import { onboardingBuyEthView, unMarkPasswordForgotten, + showModal, } from '../../../../ui/app/actions' class FirstTimeFlow extends Component { @@ -80,7 +81,7 @@ class FirstTimeFlow extends Component { renderScreen () { const {SCREEN_TYPE} = FirstTimeFlow const { - goToBuyEtherView, + openBuyEtherModal, address, restoreCreatePasswordScreen, forgottenPassword, @@ -131,7 +132,7 @@ class FirstTimeFlow extends Component { case SCREEN_TYPE.BACK_UP_PHRASE: return ( <BackupPhraseScreen - next={() => goToBuyEtherView(address)} + next={() => openBuyEtherModal()} /> ) default: @@ -167,7 +168,7 @@ export default connect( }), dispatch => ({ leaveImportSeedScreenState: () => dispatch(unMarkPasswordForgotten()), - goToBuyEtherView: address => dispatch(onboardingBuyEthView(address)), + openBuyEtherModal: () => dispatch(showModal({ name: 'DEPOSIT_ETHER'})), }) )(FirstTimeFlow) |