Merge branch 'v1.35-release' into recurring-v2-fixes

blockchain · Apr 23, 2018 · 0845a97 · 0845a97
2 parents 7191934 + b708f22
commit 0845a97
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/partials/sfox/checkout.pug b/app/partials/sfox/checkout.pug
@@ -31,7 +31,7 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
         trade-account="checkout.state.account"
         handle-quote="buyQuoteHandler(amount, baseCurr, quoteCurr)"
         on-success="buying().verificationRequired ? checkout.openSfoxSignup() : prepareBuy(quote)")
-    .flex-column.width-50.pl-30.prn.pv-10-mobile.no-margin-mobile.hidden-xs(ng-if="checkout.onStep('create') && showBuy() && !checkout.hasDismissedBuyIntro()")
+    .flex-column.width-50.pl-30.prn.pv-10-mobile.no-margin-mobile.hidden-xs(ng-if="checkout.onStep('create') && showBuy() && !checkout.hasDismissedBuyIntro() && !pendingBuyTrades().length")
       .mb-20
         .flex-between
           span.f-24.blue.f-14-mobile

diff --git a/assets/js/services/wallet.service.js b/assets/js/services/wallet.service.js
@@ -802,7 +802,7 @@ function Wallet ($http, $window, $timeout, $location, $injector, Alerts, MyWalle
       case '':
       case void 0:
         if (wallet.my.wallet.isUpgradedToHD) {
-          if (wallet.my.wallet.balanceActiveLegacy == null || wallet.my.wallet.hdwallet.balanceActiveAccounts == null) return null;
+          if (wallet.my.wallet.balanceSpendableActiveLegacy == null || wallet.my.wallet.hdwallet.balanceActiveAccounts == null) return null;
           return wallet.my.wallet.hdwallet.balanceActiveAccounts + wallet.my.wallet.balanceSpendableActiveLegacy;
         } else {
           return wallet.my.wallet.balanceSpendableActiveLegacy;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-blockchain-wallet",
-  "version": "1.35.3",
+  "version": "1.35.4",
   "description": "AngularJS front-end to My-Wallet-V3.",
   "dependencies": {
     "@uirouter/angularjs": "^1.0.3",

diff --git a/tests/services/wallet_service_spec.js b/tests/services/wallet_service_spec.js
@@ -295,7 +295,7 @@ describe('walletServices', () => {
       it('should return the sum of all accounts and addresses', inject(function (Wallet) {
 
         Wallet.my.wallet.hdwallet.balanceActiveAccounts = 3;
-        Wallet.my.wallet.balanceActiveLegacy = 1;
+        Wallet.my.wallet.balanceSpendableActiveLegacy = 1;
 
         expect(Wallet.total("")).toBeGreaterThan(0);
         expect(Wallet.total("")).toBe(4);