m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #1225 from MetaMask/i1033-spinnerfix

Browse Source 
Fix spinner issue on seed word request
This commit is contained in:
Dan Finlay 2017-03-22 15:32:39 -07:00 committed by GitHub
commit 33ba38df6e
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@
- Added an address book functionality that remembers the last 15 unique addresses sent to. - Added an address book functionality that remembers the last 15 unique addresses sent to.
- Can now change network to custom RPC URL from lock screen. - Can now change network to custom RPC URL from lock screen.
- Removed support for old, lightwallet based vault. Users who have not opened app in over a month will need to recover with their seed phrase. This will allow Firefox support sooner. - Removed support for old, lightwallet based vault. Users who have not opened app in over a month will need to recover with their seed phrase. This will allow Firefox support sooner.
- Fixed bug where spinner wouldn't disappear on incorrect password submission on seed word reveal.
- Polish the private key UI. - Polish the private key UI.
## 3.4.0 2017-3-8 ## 3.4.0 2017-3-8

7
ui/app/actions.js
View File

@ -269,11 +269,12 @@ function requestRevealSeed (password) {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
log.debug(`background.submitPassword`) log.debug(`background.submitPassword`)
background.submitPassword(password, (err) => { background.submitPassword(password, (err) => {
if (err) return dispatch(actions.displayWarning(err.message)) if (err) {
return dispatch(actions.displayWarning(err.message))
}
log.debug(`background.placeSeedWords`) log.debug(`background.placeSeedWords`)
background.placeSeedWords((err) => { background.placeSeedWords((err) => {
if (err) return dispatch(actions.displayWarning(err.message)) if (err) return dispatch(actions.displayWarning(err.message))
dispatch(actions.hideLoadingIndication())
}) })
}) })
} }
@ -296,10 +297,10 @@ function importNewAccount (strategy, args) {
dispatch(actions.showLoadingIndication('This may take a while, be patient.')) dispatch(actions.showLoadingIndication('This may take a while, be patient.'))
log.debug(`background.importAccountWithStrategy`) log.debug(`background.importAccountWithStrategy`)
background.importAccountWithStrategy(strategy, args, (err) => { background.importAccountWithStrategy(strategy, args, (err) => {
dispatch(actions.hideLoadingIndication())
if (err) return dispatch(actions.displayWarning(err.message)) if (err) return dispatch(actions.displayWarning(err.message))
log.debug(`background.getState`) log.debug(`background.getState`)
background.getState((err, newState) => { background.getState((err, newState) => {
dispatch(actions.hideLoadingIndication())
if (err) { if (err) {
return dispatch(actions.displayWarning(err.message)) return dispatch(actions.displayWarning(err.message))
} }

1
ui/app/reducers/app.js
View File

@ -426,6 +426,7 @@ function reduceApp (state, action) {
case actions.DISPLAY_WARNING: case actions.DISPLAY_WARNING:
return extend(appState, { return extend(appState, {
warning: action.value, warning: action.value,
isLoading: false,
}) })
case actions.HIDE_WARNING: case actions.HIDE_WARNING: