diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-09-14 04:00:29 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-09-14 04:00:29 +0800 |
| commit | b624155e60c713e5e1de67b51bf34083ecfed0ef (patch) | |
| tree | 2275151d2dc2ae2a847cfa7c960d6de174dbcaf6 /ui/app/actions.js | |
| parent | 3da0d61417b4ca64fb8bd93779d4c53891bb7630 (diff) | |
| parent | 194f1724f36fb6d964513aa7b364b0835af5d93d (diff) | |
| download | tangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.tar.gz tangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.tar.zst tangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.zip | |
Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin into i646-ClosePopupBug
Diffstat (limited to 'ui/app/actions.js')
| -rw-r--r-- | ui/app/actions.js | 50 |
1 files changed, 11 insertions, 39 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 57c2bf3e8..289366db0 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -134,7 +134,7 @@ var actions = { hideSubLoadingIndication: hideSubLoadingIndication, // QR STUFF: SHOW_QR: 'SHOW_QR', - getQr: getQr, + showQrView: showQrView, reshowQrCode: reshowQrCode, SHOW_QR_VIEW: 'SHOW_QR_VIEW', // FORGOT PASSWORD: @@ -739,25 +739,18 @@ function coinShiftRquest (data, marketData) { var message = ` Deposit your ${response.depositType} to the address bellow:` _accountManager.createShapeShiftTx(response.deposit, response.depositType) - dispatch(actions.getQr(response.deposit, '125x125', [message].concat(marketData))) + dispatch(actions.showQrView(response.deposit, [message].concat(marketData))) }) } } -function getQr (data, size, message) { - return (dispatch) => { - qrRequest(data, size, (response) => { - dispatch(actions.hideLoadingIndication()) - if (response.error) return dispatch(actions.showWarning(response.error)) - dispatch({ - type: actions.SHOW_QR, - value: { - qr: response, - message: message, - data: data, - }, - }) - }) +function showQrView (data, message) { + return { + type: actions.SHOW_QR_VIEW, + value: { + message: message, + data: data, + }, } } function reshowQrCode (data, coin) { @@ -772,17 +765,8 @@ function reshowQrCode (data, coin) { `Deposit Minimum:${mktResponse.minimum}`, ] - qrRequest(data, '125x125', (response) => { - dispatch(actions.hideLoadingIndication()) - dispatch({ - type: actions.SHOW_QR_VIEW, - value: { - qr: response, - message: message, - data: data, - }, - }) - }) + dispatch(actions.hideLoadingIndication()) + return dispatch(actions.showQrView(data, message)) }) } } @@ -810,15 +794,3 @@ function shapeShiftRequest (query, options, cb) { return shapShiftReq.send() } } - -function qrRequest (data, size, cb) { - var requestListner = function (request) { - cb ? cb(this.responseText) : null - return this.responseText - } - - var qrReq = new XMLHttpRequest() - qrReq.addEventListener('load', requestListner) - qrReq.open('GET', `https://api.qrserver.com/v1/create-qr-code/?size=${size}&format=svg&data=${data}`, true) - qrReq.send() -} |