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

Fix merge mess

Browse Source
This commit is contained in:
Frankie 2016-08-10 13:51:14 -07:00
parent ba1edc429b
commit 4ace425a9c
4 changed files with 108 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/app/account-detail.js
View File

@ -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()),

1
ui/app/actions.js
View File

@ -624,7 +624,6 @@ function buyEth (address, amount) {
})
}
}
<<<<<<< HEAD
function buyEthSubview () {
return {

7
ui/app/eth-store-warning.js
View File

@ -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', {

106
ui/app/reducers/app.js
View File

@ -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: