aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-11-16 01:39:03 +0800
committerDan <danjm.com@gmail.com>2017-12-05 10:38:23 +0800
commitce14ee2ffcc784849ab42797d5c999b76ed57a78 (patch)
treedf3b0165c508a0ed35894c81fb849d259e36b9e0 /ui
parentf7ad015f5bd3b037b73d7792d0a09d7e0382a511 (diff)
downloadtangerine-wallet-browser-ce14ee2ffcc784849ab42797d5c999b76ed57a78.tar.gz
tangerine-wallet-browser-ce14ee2ffcc784849ab42797d5c999b76ed57a78.tar.zst
tangerine-wallet-browser-ce14ee2ffcc784849ab42797d5c999b76ed57a78.zip
New-ui actions accomodates old-ui.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/actions.js17
-rw-r--r--ui/app/reducers/metamask.js2
2 files changed, 11 insertions, 8 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 745b8779e..bdacf3092 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -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 },
+ // }))
})
}
}
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 6d6068d05..c496625c7 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -311,7 +311,7 @@ function reduceMetamask (state, action) {
return extend(metamaskState, {
tokenExchangeRates: {
...metamaskState.tokenExchangeRates,
- [marketinfo.pair]: ssMarketInfo,
+ [ssMarketInfo.pair]: ssMarketInfo,
},
coinOptions,
})