aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-08-19 22:57:51 +0800
committerGitHub <noreply@github.com>2016-08-19 22:57:51 +0800
commit30af7e96cba7a88d46d3376097e4d44b715f834c (patch)
treec2bb2a52f309be3b781ac0ba6ef8df0b287d991c /app/scripts/lib
parent9c29328085fbad82ce7bce4659ce6968405a7b3c (diff)
parent9cd85aea2f858cb79f82cde57e53096756092503 (diff)
downloadtangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.tar
tangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.tar.gz
tangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.tar.bz2
tangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.tar.lz
tangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.tar.xz
tangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.tar.zst
tangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.zip
Merge pull request #559 from MetaMask/shapeshiftTx
Shapeshift tx
Diffstat (limited to 'app/scripts/lib')
-rw-r--r--app/scripts/lib/config-manager.js35
-rw-r--r--app/scripts/lib/idStore.js1
2 files changed, 36 insertions, 0 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index c56f52e48..6f5cb3a4a 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -332,3 +332,38 @@ ConfigManager.prototype.getShouldntShowWarning = function () {
var data = this.getData()
return ('isEthConfirmed' in data) && data.isEthConfirmed
}
+
+ConfigManager.prototype.getShapeShiftTxList = function () {
+ var data = this.getData()
+ var shapeShiftTxList = data.shapeShiftTxList ? data.shapeShiftTxList : []
+ shapeShiftTxList.forEach((tx) => {
+ if (tx.response.status !== 'complete') {
+ var requestListner = function (request) {
+ tx.response = JSON.parse(this.responseText)
+ if (tx.response.status === 'complete') {
+ tx.time = new Date().getTime()
+ }
+ }
+
+ var shapShiftReq = new XMLHttpRequest()
+ shapShiftReq.addEventListener('load', requestListner)
+ shapShiftReq.open('GET', `https://shapeshift.io/txStat/${tx.depositAddress}`, true)
+ shapShiftReq.send()
+ }
+ })
+ this.setData(data)
+ return shapeShiftTxList
+}
+
+ConfigManager.prototype.createShapeShiftTx = function (depositAddress, depositType) {
+ var data = this.getData()
+
+ var shapeShiftTx = {depositAddress, depositType, key: 'shapeshift', time: new Date().getTime(), response: {}}
+ if (!data.shapeShiftTxList) {
+ data.shapeShiftTxList = [shapeShiftTx]
+ } else {
+ data.shapeShiftTxList.push(shapeShiftTx)
+ }
+ this.setData(data)
+}
+
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 3272f2d1a..7ac71e409 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -100,6 +100,7 @@ IdentityStore.prototype.getState = function () {
unconfMsgs: messageManager.unconfirmedMsgs(),
messages: messageManager.getMsgList(),
selectedAddress: configManager.getSelectedAccount(),
+ shapeShiftTxList: configManager.getShapeShiftTxList(),
currentFiat: configManager.getCurrentFiat(),
conversionRate: configManager.getConversionRate(),
conversionDate: configManager.getConversionDate(),