Merge e8e6825 into a917527

blockchain · Mar 13, 2018 · 6029be7 · 6029be7
2 parents a917527 + e8e6825
commit 6029be7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/assets/js/controllers/home.controller.js b/assets/js/controllers/home.controller.js
@@ -61,7 +61,7 @@ function HomeCtrl ($rootScope, $scope, MyWallet, Wallet, Ethereum, BitcoinCash,
   // ensure all recent transactions are reflected in activity widget
   $rootScope.$emit('updateActivityFeed');
 
-  $scope.exchange = MyWallet.wallet.external.sfox;
+  $scope.exchange = MyWallet.wallet && MyWallet.wallet.external && MyWallet.wallet.external.sfox;
 
   // SFOX signup
   $scope.steps = enumify('create', 'verify', 'upload', 'link');

diff --git a/assets/js/services/sfox.service.js b/assets/js/services/sfox.service.js
@@ -248,7 +248,6 @@ function sfox ($q, MyWallet, MyWalletHelpers, Alerts, modals, Env, Exchange, cur
                       : trade.receiveAmount * 1e8;
 
       let tradingFee = quote ? parseFloat(quote.feeAmount) : parseFloat(trade.feeAmount);
-
       let fiatAmount = quote
                         ? quote.baseCurrency === 'USD' ? quote.baseAmount - tradingFee : quote.quoteAmount - tradingFee
                         : trade.inAmount / 1e8 - trade.feeAmount;