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

Broke the close notification window logic out into it's own action. (#6864)

Browse Source
This commit is contained in:
Terry Smith 2019-07-16 05:55:52 -03:00 committed by Dan J Miller
parent 721215973a
commit 5cc4a5c6b7
1 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
ui/app/store/actions.js
View File

@ -26,6 +26,9 @@ var actions = {
MODAL_CLOSE: 'UI_MODAL_CLOSE', MODAL_CLOSE: 'UI_MODAL_CLOSE',
showModal: showModal, showModal: showModal,
hideModal: hideModal, hideModal: hideModal,
// notification state
CLOSE_NOTIFICATION_WINDOW: 'CLOSE_NOTIFICATION_WINDOW',
closeNotifacationWindow: closeNotifacationWindow,
// sidebar state // sidebar state
SIDEBAR_OPEN: 'UI_SIDEBAR_OPEN', SIDEBAR_OPEN: 'UI_SIDEBAR_OPEN',
SIDEBAR_CLOSE: 'UI_SIDEBAR_CLOSE', SIDEBAR_CLOSE: 'UI_SIDEBAR_CLOSE',
@ -913,7 +916,7 @@ function setCurrentCurrency (currencyCode) {
function signMsg (msgData) { function signMsg (msgData) {
log.debug('action - signMsg') log.debug('action - signMsg')
return (dispatch, getState) => { return (dispatch) => {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
window.onbeforeunload = null window.onbeforeunload = null
@ -931,11 +934,7 @@ function signMsg (msgData) {
} }
dispatch(actions.completedTx(msgData.metamaskId)) dispatch(actions.completedTx(msgData.metamaskId))
dispatch(closeCurrentNotificationWindow())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) {
return global.platform.closeCurrentWindow()
}
return resolve(msgData) return resolve(msgData)
}) })
@ -945,7 +944,7 @@ function signMsg (msgData) {
function signPersonalMsg (msgData) { function signPersonalMsg (msgData) {
log.debug('action - signPersonalMsg') log.debug('action - signPersonalMsg')
return (dispatch, getState) => { return (dispatch) => {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
window.onbeforeunload = null window.onbeforeunload = null
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -962,11 +961,7 @@ function signPersonalMsg (msgData) {
} }
dispatch(actions.completedTx(msgData.metamaskId)) dispatch(actions.completedTx(msgData.metamaskId))
dispatch(closeCurrentNotificationWindow())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) {
return global.platform.closeCurrentWindow()
}
return resolve(msgData) return resolve(msgData)
}) })
@ -976,7 +971,7 @@ function signPersonalMsg (msgData) {
function signTypedMsg (msgData) { function signTypedMsg (msgData) {
log.debug('action - signTypedMsg') log.debug('action - signTypedMsg')
return (dispatch, getState) => { return (dispatch) => {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
window.onbeforeunload = null window.onbeforeunload = null
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -993,11 +988,7 @@ function signTypedMsg (msgData) {
} }
dispatch(actions.completedTx(msgData.metamaskId)) dispatch(actions.completedTx(msgData.metamaskId))
dispatch(closeCurrentNotificationWindow())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) {
return global.platform.closeCurrentWindow()
}
return resolve(msgData) return resolve(msgData)
}) })
@ -1255,7 +1246,7 @@ function updateTransaction (txData) {
function updateAndApproveTx (txData) { function updateAndApproveTx (txData) {
log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData)) log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData))
return (dispatch, getState) => { return (dispatch) => {
log.debug(`actions calling background.updateAndApproveTx`) log.debug(`actions calling background.updateAndApproveTx`)
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
window.onbeforeunload = null window.onbeforeunload = null
@ -1280,11 +1271,7 @@ function updateAndApproveTx (txData) {
dispatch(actions.clearSend()) dispatch(actions.clearSend())
dispatch(actions.completedTx(txData.id)) dispatch(actions.completedTx(txData.id))
dispatch(actions.hideLoadingIndication()) dispatch(actions.hideLoadingIndication())
dispatch(closeCurrentNotificationWindow())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) {
return global.platform.closeCurrentWindow()
}
return txData return txData
}) })
@ -1318,7 +1305,7 @@ function txError (err) {
} }
function cancelMsg (msgData) { function cancelMsg (msgData) {
return (dispatch, getState) => { return (dispatch) => {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
window.onbeforeunload = null window.onbeforeunload = null
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -1332,11 +1319,7 @@ function cancelMsg (msgData) {
} }
dispatch(actions.completedTx(msgData.id)) dispatch(actions.completedTx(msgData.id))
dispatch(closeCurrentNotificationWindow())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) {
return global.platform.closeCurrentWindow()
}
return resolve(msgData) return resolve(msgData)
}) })
@ -1345,7 +1328,7 @@ function cancelMsg (msgData) {
} }
function cancelPersonalMsg (msgData) { function cancelPersonalMsg (msgData) {
return (dispatch, getState) => { return (dispatch) => {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
window.onbeforeunload = null window.onbeforeunload = null
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -1359,11 +1342,7 @@ function cancelPersonalMsg (msgData) {
} }
dispatch(actions.completedTx(id)) dispatch(actions.completedTx(id))
dispatch(closeCurrentNotificationWindow())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) {
return global.platform.closeCurrentWindow()
}
return resolve(msgData) return resolve(msgData)
}) })
@ -1372,7 +1351,7 @@ function cancelPersonalMsg (msgData) {
} }
function cancelTypedMsg (msgData) { function cancelTypedMsg (msgData) {
return (dispatch, getState) => { return (dispatch) => {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
window.onbeforeunload = null window.onbeforeunload = null
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -1386,11 +1365,7 @@ function cancelTypedMsg (msgData) {
} }
dispatch(actions.completedTx(id)) dispatch(actions.completedTx(id))
dispatch(closeCurrentNotificationWindow())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) {
return global.platform.closeCurrentWindow()
}
return resolve(msgData) return resolve(msgData)
}) })
@ -1399,7 +1374,7 @@ function cancelTypedMsg (msgData) {
} }
function cancelTx (txData) { function cancelTx (txData) {
return (dispatch, getState) => { return (dispatch) => {
log.debug(`background.cancelTransaction`) log.debug(`background.cancelTransaction`)
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
window.onbeforeunload = null window.onbeforeunload = null
@ -1418,11 +1393,7 @@ function cancelTx (txData) {
dispatch(actions.clearSend()) dispatch(actions.clearSend())
dispatch(actions.completedTx(txData.id)) dispatch(actions.completedTx(txData.id))
dispatch(actions.hideLoadingIndication()) dispatch(actions.hideLoadingIndication())
dispatch(closeCurrentNotificationWindow())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) {
return global.platform.closeCurrentWindow()
}
return txData return txData
}) })
@ -2097,6 +2068,23 @@ function hideModal (payload) {
} }
} }
function closeCurrentNotificationWindow () {
return (dispatch, getState) => {
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) {
global.platform.closeCurrentWindow()
dispatch(closeNotifacationWindow())
}
}
}
function closeNotifacationWindow () {
return {
type: actions.CLOSE_NOTIFICATION_WINDOW,
}
}
function showSidebar ({ transitionName, type, props }) { function showSidebar ({ transitionName, type, props }) {
return { return {
type: actions.SIDEBAR_OPEN, type: actions.SIDEBAR_OPEN,