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

Add multi message capability to Qr view for market info

Browse Source
This commit is contained in:
Frankie 2016-08-12 17:43:24 -07:00
parent b72c00a6c1
commit 99a788a6f0
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/app/actions.js
View File

@ -692,13 +692,14 @@ function shapeShiftSubview (network) {
} }
} }
function coinShiftRquest (data) { function coinShiftRquest (data, marketData) {
return (dispatch) => { return (dispatch) => {
dispatch(actions.showLoadingIndication()) dispatch(actions.showLoadingIndication())
shapeShiftRequest('shift', { method: 'POST', data}, (response) => { shapeShiftRequest('shift', { method: 'POST', data}, (response) => {
if (response.error) return dispatch(actions.showWarning(response.error)) if (response.error) return dispatch(actions.showWarning(response.error))
var message = `Deposit your ${response.depositType} to the address bellow:` var message = `
dispatch(actions.getQr(response.deposit, '125x125', message)) Deposit your ${response.depositType} to the address bellow:`
dispatch(actions.getQr(response.deposit, '125x125', [message].concat(marketData)))
}) })
} }
} }

8
ui/app/components/qr-code.js
View File

@ -29,7 +29,7 @@ QrCodeView.prototype.render = function () {
alignItems: 'center', alignItems: 'center',
}, },
}, [ }, [
h('h3', Qr.message), Array.isArray(Qr.message) ? h('.message-container', this.renderMultiMessage()) : h('h3', Qr.message),
h('#qr-container.flex-column', { h('#qr-container.flex-column', {
key: 'qr', key: 'qr',
style: { style: {
@ -48,3 +48,9 @@ QrCodeView.prototype.render = function () {
]), ]),
]) ])
} }
QrCodeView.prototype.renderMultiMessage = function () {
var Qr = this.props.Qr
var multiMessage = Qr.message.map((message) => h('.qr-message', message))
return multiMessage
}

8
ui/app/components/shapeshift-form.js
View File

@ -194,6 +194,7 @@ ShapeshiftForm.prototype.renderMain = function () {
} }
ShapeshiftForm.prototype.shift = function () { ShapeshiftForm.prototype.shift = function () {
var props = this.props
var withdrawal = this.props.buyView.buyAddress var withdrawal = this.props.buyView.buyAddress
var returnAddress = document.getElementById('fromCoinAddress').value var returnAddress = document.getElementById('fromCoinAddress').value
var pair = this.props.buyView.formView.marketinfo.pair var pair = this.props.buyView.formView.marketinfo.pair
@ -202,9 +203,12 @@ ShapeshiftForm.prototype.shift = function () {
'pair': pair, 'pair': pair,
'returnAddress': returnAddress, 'returnAddress': returnAddress,
} }
var message = [
`Deposit Limit: ${props.buyView.formView.marketinfo.limit}`,
`Deposit Minimum:${props.buyView.formView.marketinfo.minimum}`,
]
if (isValidAddress(withdrawal)) { if (isValidAddress(withdrawal)) {
this.props.dispatch(actions.coinShiftRquest(data)) this.props.dispatch(actions.coinShiftRquest(data, message))
} }
} }

10
ui/app/css/index.css
View File

@ -582,3 +582,13 @@ input.large-input {
font-family: "Montserrat Light"; font-family: "Montserrat Light";
margin-left: 5px; margin-left: 5px;
} }
.qr-message {
font-size: 12px;
color: #F7861C;
}
div.message-container > div:first-child {
font-size: 15px;
color: #4D4D4D;
}