Fix merge mess

4 files changed, 108 insertions, 14 deletions

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 814d8bab0..cf65cbb7d 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -172,27 +172,19 @@ AccountDetailScreen.prototype.render = function () {
           }),
 
           h('button', {
-<<<<<<< HEAD
             onClick: this.buyButtonDeligator.bind(this),
-=======
-            onClick: () => props.dispatch(actions.buyEth(selected)),
->>>>>>> master
             style: {
               marginBottom: '20px',
               marginRight: '8px',
               position: 'absolute',
               left: '219px',
             },
-<<<<<<< HEAD
           }, props.accountDetail.subview === 'buyForm' ? [h('i.fa.fa-arrow-left', {
             style: {
               width: '22.641px',
               height: '14px',
             },
           })] : 'BUY'),
-=======
-          }, 'BUY'),
->>>>>>> master
 
           h('button', {
             onClick: () => props.dispatch(actions.showSendPage()),
diff --git a/ui/app/actions.js b/ui/app/actions.js
index bdf100040..52c03f16f 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -624,7 +624,6 @@ function buyEth (address, amount) {
     })
   }
 }
-<<<<<<< HEAD
 
 function buyEthSubview () {
   return {
diff --git a/ui/app/eth-store-warning.js b/ui/app/eth-store-warning.js
index 7fe54a309..55274996b 100644
--- a/ui/app/eth-store-warning.js
+++ b/ui/app/eth-store-warning.js
@@ -35,9 +35,10 @@ EthStoreWarning.prototype.render = function () {
           margin: '10px 10px 10px 10px',
         },
       },
-        `MetaMask is currently in beta -
-        exercise caution while handling
-        and storing your ether.
+        `The MetaMask team would like to
+        remind you that MetaMask is currently in beta - so
+        don't store large
+        amounts of ether in MetaMask.
         `),
 
       h('i.fa.fa-exclamation-triangle.fa-4', {
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index a9d6e4ff0..3b23ce005 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -317,6 +317,15 @@ function reduceApp (state, action) {
         isLoading: false,
       })
 
+    case actions.SHOW_SUB_LOADING_INDICATION:
+      return extend(appState, {
+        isSubLoading: true,
+      })
+
+    case actions.HIDE_SUB_LOADING_INDICATION:
+      return extend(appState, {
+        isSubLoading: false,
+      })
     case actions.CLEAR_SEED_WORD_CACHE:
       return extend(appState, {
         transForward: true,
@@ -369,7 +378,7 @@ function reduceApp (state, action) {
         },
       })
 
-    case actions.SHOW_ETH_WARNING:
+    case actions.BUY_ETH_SUBVIEW:
       return extend(appState, {
         transForward: true,
         currentView: {
@@ -377,7 +386,100 @@ function reduceApp (state, action) {
           context: appState.currentView.context,
         },
         accountDetail: {
-          subview: 'buy-eth-warning',
+          subview: 'buyForm',
+          amount: '5.00',
+          buyAddress: appState.currentView.context,
+          formView: {
+            coinbase: true,
+            shapeshift: false,
+          },
+        },
+      })
+
+    case actions.UPDATE_BUY_ADDRESS:
+      return extend(appState, {
+        accountDetail: {
+          subview: 'buyForm',
+          formView: {
+            coinbase: true,
+            shapeshift: false,
+          },
+          buyAddress: action.value,
+          amount: appState.accountDetail.amount,
+        },
+      })
+
+    case actions.UPDATE_COINBASE_AMOUNT:
+      return extend(appState, {
+        accountDetail: {
+          subview: 'buyForm',
+          formView: {
+            coinbase: true,
+            shapeshift: false,
+          },
+          buyAddress: appState.accountDetail.buyAddress,
+          amount: action.value,
+        },
+      })
+
+    case actions.COINBASE_SUBVIEW:
+      return extend(appState, {
+        accountDetail: {
+          subview: 'buyForm',
+          formView: {
+            coinbase: true,
+            shapeshift: false,
+          },
+          buyAddress: appState.accountDetail.buyAddress,
+          amount: appState.accountDetail.amount,
+        },
+      })
+
+    case actions.SHAPESHIFT_SUBVIEW:
+      return extend(appState, {
+        accountDetail: {
+          subview: 'buyForm',
+          formView: {
+            coinbase: false,
+            shapeshift: true,
+            marketinfo: action.value.marketinfo,
+            coinOptions: action.value.coinOptions,
+          },
+          buyAddress: appState.accountDetail.buyAddress,
+          amount: appState.accountDetail.amount,
+        },
+      })
+
+    case actions.PAIR_UPDATE:
+      return extend(appState, {
+        accountDetail: {
+          subview: 'buyForm',
+          formView: {
+            coinbase: false,
+            shapeshift: true,
+            marketinfo: action.value.marketinfo,
+            coinOptions: appState.accountDetail.formView.coinOptions,
+          },
+          buyAddress: appState.accountDetail.buyAddress,
+          amount: appState.accountDetail.amount,
+          warning: null,
+        },
+      })
+
+    case actions.COIN_SHIFT_REQUEST:
+      return extend(appState, {
+        accountDetail: {
+          subview: 'buyForm',
+          formView: {
+            coinbase: false,
+            shapeshift: true,
+            marketinfo: appState.accountDetail.formView.marketinfo,
+            coinOptions: appState.accountDetail.formView.coinOptions,
+            response: action.value.response,
+          },
+          buyAddress: appState.accountDetail.buyAddress,
+          amount: appState.accountDetail.amount,
+          warning: null,
         },
       })
     default: