From 8e18f0c7067b84e13a5f087ae229923652da769c Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Tue, 27 Mar 2018 18:06:38 -0400 Subject: [PATCH] fix(Testnet): fix send on testnet --- assets/js/services/wallet.service.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/assets/js/services/wallet.service.js b/assets/js/services/wallet.service.js index d2a209b1de..cc07e91859 100644 --- a/assets/js/services/wallet.service.js +++ b/assets/js/services/wallet.service.js @@ -291,18 +291,20 @@ function Wallet ($http, $window, $timeout, $location, $injector, Alerts, MyWalle let history = []; history.push(wallet.my.wallet.getHistory()); - let Ethereum = $injector.get('Ethereum'); - if (Ethereum.eth) history.push(Ethereum.fetchHistory()); - - let BitcoinCash = $injector.get('BitcoinCash'); - if (BitcoinCash.bch) history.push(BitcoinCash.getHistory()); + if (BlockchainConstants.NETWORK === 'testnet') { + didFetchTransactions() + } else { + let Ethereum = $injector.get('Ethereum'); + if (Ethereum.eth) history.push(Ethereum.fetchHistory()); - let ShapeShift = $injector.get('ShapeShift'); - if (ShapeShift.shapeshift) ShapeShift.checkForCompletedTrades(); + let BitcoinCash = $injector.get('BitcoinCash'); + if (BitcoinCash.bch) history.push(BitcoinCash.getHistory()); - $q.all(history).then(didFetchTransactions); + let ShapeShift = $injector.get('ShapeShift'); + if (ShapeShift.shapeshift) ShapeShift.checkForCompletedTrades(); + $q.all(history).then(didFetchTransactions); + } } - return result.guid; }); };