diff options
author | Thomas Huang <thomas.b.huang@gmail.com> | 2018-02-21 09:49:31 +0800 |
---|---|---|
committer | Thomas Huang <thomas.b.huang@gmail.com> | 2018-02-21 09:49:31 +0800 |
commit | 3fb9e04f5ff8c762c85cfc2386c555868a7b794d (patch) | |
tree | 6cabe45b24906776c91a11933a41c605daadce73 /mascara/src/app/first-time/index.js | |
parent | f2f47956973852bc055c50f226cf57e65c458855 (diff) | |
parent | b1b97727313eaa3a375541e85f43b5f2253ad6de (diff) | |
download | tangerine-wallet-browser-3fb9e04f5ff8c762c85cfc2386c555868a7b794d.tar.gz tangerine-wallet-browser-3fb9e04f5ff8c762c85cfc2386c555868a7b794d.tar.zst tangerine-wallet-browser-3fb9e04f5ff8c762c85cfc2386c555868a7b794d.zip |
Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://github.com/danjm/metamask-extension into MM-806-new-ui-first-time-import-seed-in-popup
Diffstat (limited to 'mascara/src/app/first-time/index.js')
-rw-r--r-- | mascara/src/app/first-time/index.js | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index 46b821c8b..da2f6bab9 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -7,7 +7,6 @@ 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') import { onboardingBuyEthView, unMarkPasswordForgotten, @@ -85,15 +84,9 @@ class FirstTimeFlow extends Component { address, restoreCreatePasswordScreen, forgottenPassword, - isLoading, leaveImportSeedScreenState, } = this.props - // Disable until testing bug resolved - // if (isLoading) { - // return (<Loading />) - // } - switch (this.state.screenType) { case SCREEN_TYPE.CREATE_PASSWORD: return ( @@ -164,9 +157,6 @@ export default connect( noActiveNotices, selectedAddress, forgottenPassword, - }, - appState: { - isLoading, } }) => ({ isInitialized, @@ -174,7 +164,6 @@ export default connect( noActiveNotices, address: selectedAddress, forgottenPassword, - isLoading, }), dispatch => ({ leaveImportSeedScreenState: () => dispatch(unMarkPasswordForgotten()), |