diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 7188530b3..889d7c4e3 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -56,57 +56,58 @@ - -
-
-
-
- {{index.updateError|translate}} - -
- -
- Scan status finished with error -
Tap to retry -
- -
- {{index.totalBalanceStr}} - {{index.totalBalanceStr}} -
{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
-
- Pending Confirmation: - {{index.pendingAmountStr}} + pulling-icon="ion-ios-refresh" + on-refresh="index.updateAll({triggerTxUpdate: true})"> + +
+
+
+
+ {{index.updateError|translate}} +
-
-
+
+ Scan status finished with error +
Tap to retry +
+ +
+ {{index.totalBalanceStr}} + {{index.totalBalanceStr}} +
{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
+
+ Pending Confirmation: + {{index.pendingAmountStr}} +
+
+ +
[Balance Hidden]
Tap and hold to show
+
-
-
-
- ... +
+
+ ... +
-
-
+
-
- -
-
- -
-
+
+ +
+
+ +
+
- + +
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 7a99a2724..2f5b36122 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -32,21 +32,22 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi ret.sendMaxInfo = {}; var vanillaScope = ret; - $scope.collapseBalanceContent = function(val) { - if (val) return; - $scope.shouldCollapse = $ionicScrollDelegate.$getByHandle('transactions').getScrollPosition().top > 50 ? true : false; + $scope.collapseBalanceContent = function(updating) { + if (updating) return; + + var scrollPosition = $ionicScrollDelegate.$getByHandle('transactions').getScrollPosition().top; + $scope.shouldCollapse = scrollPosition > 50 ? true : false; + $timeout(function() { $scope.$apply(); }); }; $scope.freezeScroll = function() { + var scrollPosition = $ionicScrollDelegate.$getByHandle('balance').getScrollPosition().top; + var openRatio = $ionicSideMenuDelegate.getOpenRatio(); - if ($ionicScrollDelegate.$getByHandle('balance').getScrollPosition().top < -75) { - $ionicScrollDelegate.$getByHandle('balance').freezeScroll(true); - return; - } - if ($ionicSideMenuDelegate.getOpenRatio() != 0) + if (scrollPosition < -75 || openRatio != 0) $ionicScrollDelegate.$getByHandle('balance').freezeScroll(true); else $ionicScrollDelegate.$getByHandle('balance').freezeScroll(false); diff --git a/src/sass/main.scss b/src/sass/main.scss index 3961bd618..fd498079f 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -460,6 +460,10 @@ ul.manage li { } } +.fade { + transition: margin-top .2s ease; +} + .dn { display: none; } @@ -1577,6 +1581,7 @@ input.ng-invalid-match { color: #fff; height: 150px; margin-bottom: 25px; + transition: .4s all ease; } .amountcollapsed { @@ -1584,6 +1589,7 @@ input.ng-invalid-match { text-align: center; color: #fff; height: 50px; + transition: .4s all ease; } .alternative-amount {