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

New-ui actions accomodates old-ui.

Browse Source
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
ui/app
actions.js
reducers
metamask.js

15
ui/app/actions.js
View File

@ -993,9 +993,10 @@ function showConfigPage (transitionForward = true) {
} }
} }
function showAddTokenPage () { function showAddTokenPage (transitionForward = true) {
return { return {
type: actions.SHOW_ADD_TOKEN_PAGE, type: actions.SHOW_ADD_TOKEN_PAGE,
value: transitionForward,
} }
} }
@ -1277,7 +1278,8 @@ function exportAccount (password, address) {
return reject(err) return reject(err)
} }
dispatch(self.exportAccountComplete()) // dispatch(self.exportAccountComplete())
dispatch(self.showPrivateKey(result))
return resolve(result) return resolve(result)
}) })
@ -1452,10 +1454,11 @@ function reshowQrCode (data, coin) {
] ]
dispatch(actions.hideLoadingIndication()) dispatch(actions.hideLoadingIndication())
return dispatch(actions.showModal({ return dispatch(actions.showQrView(data, message))
name: 'SHAPESHIFT_DEPOSIT_TX', // return dispatch(actions.showModal({
Qr: { data, message }, // name: 'SHAPESHIFT_DEPOSIT_TX',
})) // Qr: { data, message },
// }))
}) })
} }
} }

2
ui/app/reducers/metamask.js
View File

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