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

New-ui actions accomodates old-ui.

This commit is contained in:
Dan 2017-11-15 14:09:03 -03:30
parent f7ad015f5b
commit ce14ee2ffc
2 changed files with 11 additions and 8 deletions

View File

@ -993,9 +993,10 @@ function showConfigPage (transitionForward = true) {
}
}
function showAddTokenPage () {
function showAddTokenPage (transitionForward = true) {
return {
type: actions.SHOW_ADD_TOKEN_PAGE,
value: transitionForward,
}
}
@ -1277,7 +1278,8 @@ function exportAccount (password, address) {
return reject(err)
}
dispatch(self.exportAccountComplete())
// dispatch(self.exportAccountComplete())
dispatch(self.showPrivateKey(result))
return resolve(result)
})
@ -1444,7 +1446,7 @@ function reshowQrCode (data, coin) {
dispatch(actions.showLoadingIndication())
shapeShiftRequest('marketinfo', {pair: `${coin.toLowerCase()}_eth`}, (mktResponse) => {
if (mktResponse.error) return dispatch(actions.displayWarning(mktResponse.error))
var message = [
`Deposit your ${coin} to the address bellow:`,
`Deposit Limit: ${mktResponse.limit}`,
@ -1452,10 +1454,11 @@ function reshowQrCode (data, coin) {
]
dispatch(actions.hideLoadingIndication())
return dispatch(actions.showModal({
name: 'SHAPESHIFT_DEPOSIT_TX',
Qr: { data, message },
}))
return dispatch(actions.showQrView(data, message))
// return dispatch(actions.showModal({
// name: 'SHAPESHIFT_DEPOSIT_TX',
// Qr: { data, message },
// }))
})
}
}

View File

@ -311,7 +311,7 @@ function reduceMetamask (state, action) {
return extend(metamaskState, {
tokenExchangeRates: {
...metamaskState.tokenExchangeRates,
[marketinfo.pair]: ssMarketInfo,
[ssMarketInfo.pair]: ssMarketInfo,
},
coinOptions,
})