Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.

1 files changed, 35 insertions, 0 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 8bf4d1c30..a5846f0d2 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -68,6 +68,10 @@ var actions = {
   showPrivateKey: showPrivateKey,
   SAVE_ACCOUNT_LABEL: 'SAVE_ACCOUNT_LABEL',
   saveAccountLabel: saveAccountLabel,
+  AGREE_TO_ETH_WARNING: 'AGREE_TO_ETH_WARNING',
+  agreeToEthWarning: agreeToEthWarning,
+  SHOW_ETH_WARNING: 'SHOW_ETH_WARNING',
+  showEthWarning: showEthWarning,
   // tx conf screen
   COMPLETED_TX: 'COMPLETED_TX',
   TRANSACTION_ERROR: 'TRANSACTION_ERROR',
@@ -108,6 +112,9 @@ var actions = {
   HIDE_LOADING: 'HIDE_LOADING_INDICATION',
   showLoadingIndication: showLoadingIndication,
   hideLoadingIndication: hideLoadingIndication,
+  // buy Eth with coinbase
+  BUY_ETH: 'BUY_ETH',
+  buyEth: buyEth,
 }
 
 module.exports = actions
@@ -578,3 +585,31 @@ function showSendPage () {
     type: actions.SHOW_SEND_PAGE,
   }
 }
+
+function agreeToEthWarning () {
+  return (dispatch) => {
+    _accountManager.agreeToEthWarning((err) => {
+      if (err) {
+        return dispatch(actions.showEthWarning(err.message))
+      }
+      dispatch({
+        type: actions.AGREE_TO_ETH_WARNING,
+      })
+    })
+  }
+}
+
+function showEthWarning () {
+  return {
+    type: actions.SHOW_ETH_WARNING,
+  }
+}
+
+function buyEth (address, amount) {
+  return (dispatch) => {
+    _accountManager.buyEth(address, amount)
+    dispatch({
+      type: actions.BUY_ETH,
+    })
+  }
+}