Merge pull request #1485 from blockchain/fix-testnet-send

Fix send on testnet
blockchain · Mar 28, 2018 · 2dd665e · 2dd665e
2 parents a1d7c80 + 8e18f0c
commit 2dd665e
Showing 1 changed file with 11 additions and 9 deletions.
diff --git 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;
     });
   };