thirdParty updates + shapeshift screens + merged with review transaction

src/js/services/incomingData.js

@@ -86,7 +86,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
           $state.transitionTo('tabs.send.origin', {
             amount: amount,
             toAddress: addr,
-            displayAddress: originalAddress ? originalAddress : addr,
             description: message,
             coin: coin
           });
@@ -109,6 +108,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
             // params['thirdParty']['minShapeshiftAmount'] = serviceData.minAmount;
             // params['thirdParty']['maxShapeshiftAmount'] = serviceData.maxAmount;
             // params['thirdParty']['shapeshiftOrderId'] = serviceData.orderId;
+            params['thirdParty'] = JSON.stringify(params['thirdParty']);
             $state.transitionTo('tabs.send.amount', params);
           } else {
             $state.transitionTo('tabs.send.origin', params);

src/js/services/shapeshiftService.js

@@ -1,7 +1,143 @@
 'use strict';
-angular.module('copayApp.services').factory('shapeshiftService', function($http, $log, lodash, moment, storageService, configService, platformInfo, servicesService) {
+angular.module('copayApp.services').factory('shapeshiftService', function($http, $log, lodash, moment, ongoingProcess, shapeshiftApiService, storageService, configService, platformInfo, servicesService) {
   var root = {};
-  var credentials = {};
+  root.ShiftState = 'Shift';
+  root.withdrawalAddress = ''
+  root.returnAddress = ''
+  root.amount = '';
+  root.marketData = {}
+  this.withdrawalAddress = function(address) {
+    root.withdrawalAddress = address;
+  };
+  this.returnAddress = function(address) {
+    root.returnAddress = address;
+  };
+  this.amount = function(amount) {
+    root.amount = amount;
+  };
+  this.fromWalletId = function(id) {
+    root.fromWalletId = id;
+  };
+  this.toWalletId = function(id) {
+    root.toWalletId = id;
+  };
+
+  root.getMarketDataIn = function(coin) {
+    if(coin === root.coinOut) return root.getMarketData(root.coinOut, root.coinIn);
+    return root.getMarketData(coin, root.coinOut);
+  };
+  root.getMarketDataOut = function(coin) {
+    if(coin === root.coinIn) return root.getMarketData(root.coinOut, root.coinIn);
+    return root.getMarketData(root.coinIn, coin);
+  };
+  root.getMarketData = function(coinIn, coinOut, cb) {
+    root.coinIn = coinIn;
+    root.coinOut= coinOut;
+    if(root.coinIn === undefined || root.coinOut === undefined) return;
+    shapeshiftApiService
+        .marketInfo(root.coinIn, root.coinOut)
+        .then(function(marketData){
+          root.marketData = marketData;
+          root.rateString = root.marketData.rate.toString() + ' ' + coinOut.toUpperCase() + '/' + coinIn.toUpperCase();
+          if (cb) {
+            cb(marketData);
+          }
+        });
+  };
+
+  /*shapeshiftApiService.coins().then(function(coins){
+      root.coins = coins;
+      root.coinIn = coins['BTC'].symbol;
+      root.coinOut = coins['BCH'].symbol;
+      root.getMarketData(root.coinIn, root.coinOut);
+  });*/
+
+  root.coins = {
+    'BTC': { name: 'Bitcoin', symbol: 'BTC' },
+    'BCH': { name: 'Bitcoin Cash', symbol: 'BCH' }
+  };
+
+  function checkForError(data){
+    if(data.error) return true;
+    return false;
+  }
+
+  root.shiftIt = function(){
+    ongoingProcess.set('connectingShapeshift', true);
+    var validate=shapeshiftApiService.ValidateAddress(root.withdrawalAddress, root.coinOut);
+    validate.then(function(valid){
+      //console.log(root.withdrawalAddress)
+      //console.log(valid)
+      var tx = ShapeShift();
+      tx.then(function(txData){
+        if(txData['fixedTxData']){
+          txData = txData.fixedTxData;
+          if(checkForError(txData)) return;
+          //console.log(txData)
+          var coinPair=txData.pair.split('_');
+          txData.depositType = coinPair[0].toUpperCase();
+          txData.withdrawalType = coinPair[1].toUpperCase();
+          var coin = root.coins[txData.depositType].name.toLowerCase();
+          //console.log(coin)
+          txData.depositQR = coin + ":" + txData.deposit + "?amount=" + txData.depositAmount
+          root.txFixedPending = true;
+        } else if(txData['normalTxData']){
+          txData = txData.normalTxData;
+          if(checkForError(txData)) return;
+          var coin = root.coins[txData.depositType.toUpperCase()].name.toLowerCase();
+          txData.depositQR = coin + ":" + txData.deposit;
+        } else if(txData['cancelTxData']){
+          if(checkForError(txData.cancelTxData)) return;
+          if(root.txFixedPending) {
+            $interval.cancel(root.txInterval);
+            root.txFixedPending = false;
+          }
+          root.ShiftState = 'Shift';
+          return;
+        }
+        root.depositInfo = txData;
+        //console.log(root.marketData);
+        //console.log(root.depositInfo);
+        var sendAddress = txData.depositQR;
+        if (sendAddress && sendAddress.indexOf('bitcoin cash') >= 0)
+          sendAddress = sendAddress.replace('bitcoin cash', 'bitcoincash');
+
+        var shapeshiftData = {
+          fromWalletId: root.fromWalletId,
+          minAmount: root.marketData.minimum,
+          maxAmount: root.marketData.maxLimit,
+          orderId: root.depositInfo.orderId
+        };
+
+        if (incomingData.redir(sendAddress, shapeshiftData)) {
+          ongoingProcess.set('connectingShapeshift', false);
+          return;
+        }
+
+        /*root.ShiftState = 'Cancel';
+        root.GetStatus();
+        root.txInterval=$interval(root.GetStatus, 8000);*/
+      });
+    })
+  };
+
+  function ShapeShift() {
+    if(root.ShiftState === 'Cancel') return shapeshiftApiService.CancelTx(root);
+    if(parseFloat(root.amount) > 0) return shapeshiftApiService.FixedAmountTx(root);
+    return shapeshiftApiService.NormalTx(root);
+  }
+
+  root.GetStatus = function(){
+    var address = root.depositInfo.deposit
+    shapeshiftApiService.GetStatusOfDepositToAddress(address).then(function(data){
+      root.DepositStatus = data;
+      if(root.DepositStatus.status === 'complete'){
+        $interval.cancel(root.txInterval);
+        root.depositInfo = null;
+        root.ShiftState = 'Shift'
+      }
+    });
+  };
 
   var servicesItem = {
     name: 'shapeshift',
@@ -13,7 +149,6 @@ angular.module('copayApp.services').factory('shapeshiftService', function($http,
   var register = function() {
     servicesService.register(servicesItem);
   };
-
   register();
   return root;
 });