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

correct behavior when notification is closed when popup

Browse Source
This commit is contained in:
Esteban MIno 2018-08-16 20:19:19 -03:00
parent 2ace30bcd1
commit bb868f5834
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/controllers/preferences.js
View File

@ -237,7 +237,7 @@ class PreferencesController {
removeSuggestedTokens () { removeSuggestedTokens () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.store.updateState({ suggestedTokens: {} }) this.store.updateState({ suggestedTokens: {} })
resolve() resolve({})
}) })
} }

7
ui/app/actions.js
View File

@ -1626,7 +1626,8 @@ function addTokens (tokens) {
function removeSuggestedTokens () { function removeSuggestedTokens () {
return (dispatch) => { return (dispatch) => {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
background.removeSuggestedTokens((err) => { return new Promise((resolve, reject) => {
background.removeSuggestedTokens((err, suggestedTokens) => {
dispatch(actions.hideLoadingIndication()) dispatch(actions.hideLoadingIndication())
if (err) { if (err) {
dispatch(actions.displayWarning(err.message)) dispatch(actions.displayWarning(err.message))
@ -1635,7 +1636,11 @@ function removeSuggestedTokens () {
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION) { if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION) {
return global.platform.closeCurrentWindow() return global.platform.closeCurrentWindow()
} }
resolve(suggestedTokens)
}) })
})
.then(() => updateMetamaskStateFromBackground())
.then(suggestedTokens => dispatch(actions.updateMetamaskState({...suggestedTokens})))
} }
} }

6
ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js
View File

@ -33,7 +33,7 @@ export default class ConfirmAddSuggestedToken extends Component {
} }
render () { render () {
const { addToken, clearPendingTokens, pendingTokens, removeSuggestedTokens, history } = this.props const { addToken, pendingTokens, removeSuggestedTokens, history } = this.props
const pendingTokenKey = Object.keys(pendingTokens)[0] const pendingTokenKey = Object.keys(pendingTokens)[0]
const pendingToken = pendingTokens[pendingTokenKey] const pendingToken = pendingTokens[pendingTokenKey]
@ -96,7 +96,9 @@ export default class ConfirmAddSuggestedToken extends Component {
className="page-container__footer-button" className="page-container__footer-button"
onClick={() => { onClick={() => {
removeSuggestedTokens() removeSuggestedTokens()
.then(() => {
history.push(DEFAULT_ROUTE) history.push(DEFAULT_ROUTE)
})
}} }}
> >
{ this.context.t('cancel') } { this.context.t('cancel') }
@ -109,8 +111,10 @@ export default class ConfirmAddSuggestedToken extends Component {
addToken(pendingToken) addToken(pendingToken)
.then(() => { .then(() => {
removeSuggestedTokens() removeSuggestedTokens()
.then(() => {
history.push(DEFAULT_ROUTE) history.push(DEFAULT_ROUTE)
}) })
})
}} }}
> >
{ this.context.t('addToken') } { this.context.t('addToken') }

3
ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js
View File

@ -5,7 +5,7 @@ import { withRouter } from 'react-router-dom'
const extend = require('xtend') const extend = require('xtend')
const { addToken, clearPendingTokens, removeSuggestedTokens } = require('../../../actions') const { addToken, removeSuggestedTokens } = require('../../../actions')
const mapStateToProps = ({ metamask }) => { const mapStateToProps = ({ metamask }) => {
const { pendingTokens, suggestedTokens } = metamask const { pendingTokens, suggestedTokens } = metamask
@ -19,7 +19,6 @@ const mapStateToProps = ({ metamask }) => {
const mapDispatchToProps = dispatch => { const mapDispatchToProps = dispatch => {
return { return {
addToken: ({address, symbol, decimals, imageUrl}) => dispatch(addToken(address, symbol, decimals, imageUrl)), addToken: ({address, symbol, decimals, imageUrl}) => dispatch(addToken(address, symbol, decimals, imageUrl)),
clearPendingTokens: () => dispatch(clearPendingTokens()),
removeSuggestedTokens: () => dispatch(removeSuggestedTokens()), removeSuggestedTokens: () => dispatch(removeSuggestedTokens()),
} }
} }

1
ui/app/components/pages/home.js
View File

@ -40,7 +40,6 @@ class Home extends Component {
// suggested new tokens // suggested new tokens
if (Object.keys(suggestedTokens).length > 0) { if (Object.keys(suggestedTokens).length > 0) {
console.log('CALLING CONFIRM ADD SUGGESTED')
history.push(CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE) history.push(CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE)
} }