aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-04-10 17:05:51 +0800
committerGitHub <noreply@github.com>2018-04-10 17:05:51 +0800
commit224e6e1696723e7db18e8db7aa47b98987270c0a (patch)
tree1da213faa0185bf0b42d290c0d5fa3ac57c6edef
parent50dfa2b7d301121b7a314426b651562230c7e1ce (diff)
parent077fc5eab6a835c687360b3935cfd394fd9f1cea (diff)
downloadtangerine-wallet-browser-224e6e1696723e7db18e8db7aa47b98987270c0a.tar
tangerine-wallet-browser-224e6e1696723e7db18e8db7aa47b98987270c0a.tar.gz
tangerine-wallet-browser-224e6e1696723e7db18e8db7aa47b98987270c0a.tar.bz2
tangerine-wallet-browser-224e6e1696723e7db18e8db7aa47b98987270c0a.tar.lz
tangerine-wallet-browser-224e6e1696723e7db18e8db7aa47b98987270c0a.tar.xz
tangerine-wallet-browser-224e6e1696723e7db18e8db7aa47b98987270c0a.tar.zst
tangerine-wallet-browser-224e6e1696723e7db18e8db7aa47b98987270c0a.zip
Merge pull request #3894 from danjm/i3696-disablefirsttimeimportloading
Disable the first time flow import button while isLoading is true.
-rw-r--r--mascara/src/app/first-time/import-seed-phrase-screen.js7
1 files changed, 4 insertions, 3 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 5c2b21b0a..5834919de 100644
--- a/mascara/src/app/first-time/import-seed-phrase-screen.js
+++ b/mascara/src/app/first-time/import-seed-phrase-screen.js
@@ -76,8 +76,9 @@ class ImportSeedPhraseScreen extends Component {
render () {
const { seedPhrase, password, confirmPassword } = this.state
- const { warning } = this.props
- const importDisabled = warning || !seedPhrase || !password || !confirmPassword
+ const { warning, isLoading } = this.props
+ const importDisabled = warning || !seedPhrase || !password || !confirmPassword || isLoading
+
return (
<div className="first-view-main-wrapper">
<div className="first-view-main">
@@ -152,7 +153,7 @@ class ImportSeedPhraseScreen extends Component {
}
export default connect(
- ({ appState: { warning } }) => ({ warning }),
+ ({ appState: { warning, isLoading } }) => ({ warning, isLoading }),
dispatch => ({
leaveImportSeedScreenState: () => {
dispatch(unMarkPasswordForgotten())