aboutsummaryrefslogtreecommitdiffstats
path: root/mascara/src
diff options
context:
space:
mode:
Diffstat (limited to 'mascara/src')
-rw-r--r--mascara/src/app/first-time/import-seed-phrase-screen.js6
-rw-r--r--mascara/src/app/first-time/index.js9
2 files changed, 8 insertions, 7 deletions
diff --git a/mascara/src/app/first-time/import-seed-phrase-screen.js b/mascara/src/app/first-time/import-seed-phrase-screen.js
index a03a16329..93c3f9203 100644
--- a/mascara/src/app/first-time/import-seed-phrase-screen.js
+++ b/mascara/src/app/first-time/import-seed-phrase-screen.js
@@ -29,7 +29,7 @@ class ImportSeedPhraseScreen extends Component {
onClick = () => {
const { password, seedPhrase, confirmPassword } = this.state
- const { createNewVaultAndRestore, next, displayWarning, leaveImportSeedSreenState } = this.props
+ const { createNewVaultAndRestore, next, displayWarning, leaveImportSeedScreenState } = this.props
if (seedPhrase.split(' ').length !== 12) {
this.warning = 'Seed Phrases are 12 words long'
@@ -49,7 +49,7 @@ class ImportSeedPhraseScreen extends Component {
return
}
this.warning = null
- leaveImportSeedSreenState()
+ leaveImportSeedScreenState()
createNewVaultAndRestore(password, seedPhrase)
.then(next)
}
@@ -120,7 +120,7 @@ class ImportSeedPhraseScreen extends Component {
export default connect(
({ appState: { isLoading, warning } }) => ({ isLoading, warning }),
dispatch => ({
- leaveImportSeedSreenState: () => {
+ leaveImportSeedScreenState: () => {
dispatch(unMarkPasswordForgotten())
},
createNewVaultAndRestore: (pw, seed) => dispatch(createNewVaultAndRestore(pw, seed)),
diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js
index 883342d16..a05e0aa96 100644
--- a/mascara/src/app/first-time/index.js
+++ b/mascara/src/app/first-time/index.js
@@ -7,7 +7,7 @@ import NoticeScreen from './notice-screen'
import BackupPhraseScreen from './backup-phrase-screen'
import ImportAccountScreen from './import-account-screen'
import ImportSeedPhraseScreen from './import-seed-phrase-screen'
-const Loading = require('../../../../ui/app//components/loading')
+const Loading = require('../../../../ui/app/components/loading')
import {
onboardingBuyEthView,
unMarkPasswordForgotten,
@@ -86,10 +86,11 @@ class FirstTimeFlow extends Component {
restoreCreatePasswordScreen,
forgottenPassword,
isLoading,
+ leaveImportSeedScreenState,
} = this.props
if (isLoading) {
- return h(Loading)
+ return (<Loading />)
}
switch (this.state.screenType) {
@@ -112,7 +113,7 @@ class FirstTimeFlow extends Component {
return (
<ImportSeedPhraseScreen
back={() => {
- leaveImportSeedSreenState()
+ leaveImportSeedScreenState()
this.setScreenType(SCREEN_TYPE.CREATE_PASSWORD)
}}
next={() => {
@@ -175,7 +176,7 @@ export default connect(
isLoading,
}),
dispatch => ({
- leaveImportSeedSreenState: () => dispatch(unMarkPasswordForgotten()),
+ leaveImportSeedScreenState: () => dispatch(unMarkPasswordForgotten()),
goToBuyEtherView: address => dispatch(onboardingBuyEthView(address)),
})
)(FirstTimeFlow)