aboutsummaryrefslogtreecommitdiffstats
path: root/mascara/src/app/first-time/import-account-screen.js
diff options
context:
space:
mode:
authorThomas <thomas.b.huang@gmail.com>2018-05-04 05:10:26 +0800
committerThomas <thomas.b.huang@gmail.com>2018-05-04 05:10:26 +0800
commitf900821a425ce97695034b3445effe1bbaf4a9a5 (patch)
treef426762d58f31b3c527491e7e8ba25dd11936f3a /mascara/src/app/first-time/import-account-screen.js
parent9bba97a676b47667abdd7b020cebd56a0f3b96c7 (diff)
parent096851d091385ee786ab1374e83aaf6a1aa7cbce (diff)
downloadtangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar
tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.gz
tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.bz2
tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.lz
tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.xz
tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.zst
tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.zip
Merge branch 'develop' into e2e-tests
Diffstat (limited to 'mascara/src/app/first-time/import-account-screen.js')
-rw-r--r--mascara/src/app/first-time/import-account-screen.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/mascara/src/app/first-time/import-account-screen.js b/mascara/src/app/first-time/import-account-screen.js
index ab0aca0f0..555a26386 100644
--- a/mascara/src/app/first-time/import-account-screen.js
+++ b/mascara/src/app/first-time/import-account-screen.js
@@ -70,10 +70,14 @@ class ImportAccountScreen extends Component {
switch (this.state.selectedOption) {
case OPTIONS.JSON_FILE:
return importNewAccount('JSON File', [ jsonFile, password ])
+ // JS runtime requires caught rejections but failures are handled by Redux
+ .catch()
.then(next)
case OPTIONS.PRIVATE_KEY:
default:
return importNewAccount('Private Key', [ privateKey ])
+ // JS runtime requires caught rejections but failures are handled by Redux
+ .catch()
.then(next)
}
}