Merge branch 'master' into shapeshiftTx

1 files changed, 19 insertions, 0 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 48a425d50..9b99a05c1 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -55,6 +55,8 @@ var actions = {
   SHOW_CONF_MSG_PAGE: 'SHOW_CONF_MSG_PAGE',
   REVEAL_ACCOUNT: 'REVEAL_ACCOUNT',
   revealAccount: revealAccount,
+  SET_CURRENT_FIAT: 'SET_CURRENT_FIAT',
+  setCurrentFiat: setCurrentFiat,
   // account detail screen
   SHOW_SEND_PAGE: 'SHOW_SEND_PAGE',
   showSendPage: showSendPage,
@@ -236,6 +238,23 @@ function revealAccount () {
   }
 }
 
+function setCurrentFiat (fiat) {
+  return (dispatch) => {
+    dispatch(this.showLoadingIndication())
+    _accountManager.setCurrentFiat(fiat, (data, err) => {
+      dispatch(this.hideLoadingIndication())
+      dispatch({
+        type: this.SET_CURRENT_FIAT,
+        value: {
+          currentFiat: data.currentFiat,
+          conversionRate: data.conversionRate,
+          conversionDate: data.conversionDate,
+        },
+      })
+    })
+  }
+}
+
 function signMsg (msgData) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())