From 6ccc1c1127d9ea451c79432597ce114e271bf53e Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Fri, 20 May 2016 13:21:58 -0300
Subject: [PATCH] fix amount UI over activity UI

---
 public/views/includes/topbar.html |  3 +--
 public/views/walletHome.html      |  9 +++++----
 src/css/ionic-migration.css       |  8 ++++----
 src/js/controllers/walletHome.js  |  5 ++---
 src/sass/main.scss                | 26 ++++++++++++++------------
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html
index 9759a1860..d17cdec65 100644
--- a/public/views/includes/topbar.html
+++ b/public/views/includes/topbar.html
@@ -1,6 +1,5 @@
 <nav ng-controller="topbarController as topbar"
-  class="tab-bar"
-  ng-style="{'background-color': noColor ? '#4B6178' : index.backgroundColor}">
+  class="tab-bar" ng-class="{'fade-all': !index.isCordova}" ng-style="{'background-color': noColor ? '#4B6178' : index.backgroundColor}">
   <section class="left-small">
     <a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome  && !index.noFocusedWallet"
       ng-click="index.toggleLeftMenu()"><i class="fi-list size-24"></i>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 889d7c4e3..d93195c41 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -54,13 +54,14 @@
     -->
 
     <ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false">
-      <ion-content delegate-handle="balance" on-scroll="freezeScroll()">
+      <ion-scroll delegate-handle="balance" on-scroll="freezeScroll()" scrollbar-y="false">
         <ion-refresher
           pulling-icon="ion-ios-refresh"
+          spinner="none"
           on-refresh="index.updateAll({triggerTxUpdate: true})">
         </ion-refresher>
         <div class="oh pr">
-          <div ng-style="{'background-color':index.backgroundColor}" ng-class="{amount: !shouldCollapse, amountcollapsed: shouldCollapse}">
+          <div ng-style="{'background-color':index.backgroundColor}" ng-class="{amount: !shouldCollapse, amountcollapsed: shouldCollapse, 'fade-all': !index.isCordova}">
             <div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
               <div class="m15t" ng-show="index.updateError && !shouldCollapse" ng-click='index.updateAll({triggerTxUpdate: true})'>
                 <span class="size-12 db m10b">{{index.updateError|translate}}</span>
@@ -105,9 +106,9 @@
             <qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
           </div>
         </div> <!-- oh -->
-      </ion-content>
+      </ion-scroll>
 
-      <ion-content overflow-scroll="false" class="fade" ng-class="{m150t: !shouldCollapse, m50t: shouldCollapse}" delegate-handle="transactions" on-scroll="collapseBalanceContent(index.updatingTxHistory && index.txProgress > 5)">
+      <ion-content overflow-scroll="false" class="behind" ng-class="{t150: !shouldCollapse, t50: shouldCollapse, 'fade-t': !index.isCordova}" delegate-handle="transactions" on-scroll="collapseBalanceContent(index.updatingTxHistory && index.txProgress > 5)">
         <div class="m50b">
           <div class="oh pr m20t" ng-show="index.incorrectDerivation">
             <div class="text-center text-warning">
diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css
index ee71cad73..8d25ca3ff 100644
--- a/src/css/ionic-migration.css
+++ b/src/css/ionic-migration.css
@@ -16,6 +16,10 @@
 	display: inherit;
 }
 
+.behind {
+	z-index: -1;
+}
+
 .bct {
  	background-color: transparent !important;
 	margin-top: -25px;
@@ -67,10 +71,6 @@ button, .button {
   padding: 0;
 }
 
-.scroll-view {
-  height: 100% !important;
-}
-
 /* Override the default modal size for large devices */
 @media (min-width: 680px) {
   .modal {
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index f98f3d1c4..0586594d9 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -33,7 +33,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   var vanillaScope = ret;
 
   $scope.collapseBalanceContent = function(updating) {
-    if (updating) return;
+    if (updating || isCordova) return;
 
     var scrollPosition = $ionicScrollDelegate.$getByHandle('transactions').getScrollPosition().top;
     $scope.shouldCollapse = scrollPosition > 50 ? true : false;
@@ -44,10 +44,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   $scope.freezeScroll = function() {
-    var scrollPosition = $ionicScrollDelegate.$getByHandle('balance').getScrollPosition().top;
     var openRatio = $ionicSideMenuDelegate.getOpenRatio();
 
-    if (scrollPosition < -75 || openRatio != 0)
+    if (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 fd498079f..88b767055 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -460,8 +460,12 @@ ul.manage li {
   }
 }
 
-.fade {
-  transition: margin-top .2s ease;
+.fade-t {
+  transition: top .2s ease;
+}
+
+.fade-all {
+  transition: .4s all ease;
 }
 
 .dn {
@@ -624,14 +628,6 @@ ul.manage li {
   margin-top: 20px;
 }
 
-.m50t {
-  margin-top: 50px;
-}
-
-.m150t {
-  margin-top: 150px;
-}
-
 .m20tp {
   margin-top: 20%;
 }
@@ -640,6 +636,14 @@ ul.manage li {
   margin-top: 30%;
 }
 
+.t50 {
+  top: 50px;
+}
+
+.t150 {
+  top: 150px;
+}
+
 .m15 {
   margin: 15px;
 }
@@ -1581,7 +1585,6 @@ input.ng-invalid-match {
   color: #fff;
   height: 150px;
   margin-bottom: 25px;
-  transition: .4s all ease;
 }
 
 .amountcollapsed {
@@ -1589,7 +1592,6 @@ input.ng-invalid-match {
   text-align: center;
   color: #fff;
   height: 50px;
-  transition: .4s all ease;
 }
 
 .alternative-amount {