Merge pull request #4582 from cmgustavo/bug/scrolling-proposal-desktop2

Fix scrolling when there are many txp s on OSX

cordova/build.sh

@@ -155,6 +155,8 @@ if [ ! -d $PROJECT ]; then
   cordova plugin add cordova-plugin-disable-bitcode
   checkOK
 
+  ## Fix plugin android-fingerprint
+  rm -rf $PROJECT/platforms/android/res/values-es
   cordova plugin add cordova-plugin-android-fingerprint-auth
   checkOK
 

public/views/includes/transaction.html

@@ -1,4 +1,4 @@
-<div class="ng-animate-disabled row collapse last-transactions-content line-b"
+<div class="row collapse last-transactions-content line-b"
   ng-class="{'text-gray':!tx.pendingForUs}"
   ng-click="home.openTxpModal(tx, index.copayers, !!index.glideraStatus)">
   <div class="large-6 medium-6 small-6 columns size-14">
@@ -7,19 +7,21 @@
       <img src="img/icon-proposal.svg" alt="sync" width="40">
     </div>
     <div class="m10t">
-      <span ng-if="!tx.merchant">
+      <div ng-show="!tx.merchant">
-        {{index.addressbook[tx.toAddress]}}
+        <span ng-show="index.addressbook[tx.toAddress] && !tx.message">
-        <span ng-show="!index.addressbook[tx.toAddress] && tx.message">
+          {{index.addressbook[tx.toAddress]}}
-          <span class="ellipsis">{{tx.message}}</span>
         </span>
-        <span ng-show="!index.addressbook[tx.toAddress] && !tx.message">
+        <span class="ellipsis" ng-show="!index.addressbook[tx.toAddress] && tx.message">
-          <span translate> Sending</span>
+          {{tx.message}}
         </span>
-      </span>
+        <span ng-show="!index.addressbook[tx.toAddress] && !tx.message" translate>
-      <span ng-if="tx.merchant">
+          Sending
+        </span>
+      </div>
+      <div ng-show="tx.merchant">
         <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
         <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
-      </span>
+      </div>
     </div>
   </div>
   <div class="large-5 medium-5 small-5 columns text-right">

public/views/walletHome.html

@@ -34,8 +34,9 @@
 
     -->
 
-    <ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false">
+    <div id="walletHome" class="walletHome tab-view tab-in">
-      <ion-content on-release="index.allowSideBar = true; index.allowPullToRefresh = true;" on-drag-right="index.allowRefresher()" delegate-handle="my-handle">
+      <ion-content on-release="index.allowSideBar = true; index.allowPullToRefresh = true;"
+        on-drag-right="index.allowRefresher()" delegate-handle="my-handle" overflow-scroll="true">
         <ion-refresher
           ng-if="index.allowPullToRefresh && index.isCordova"
           on-pulling="index.allowSideBar = false"
@@ -86,7 +87,7 @@
           </div>
         </div> <!-- oh -->
 
-        <div class="m50b">
+        <div class="p60b">
           <div class="oh pr m20t" ng-show="index.incorrectDerivation">
             <div class="text-center text-warning">
               <i class="fi-alert"></i>
@@ -117,12 +118,11 @@
             <span>{{newRelease}}</span><i class="icon-arrow-right3 right size-18"></i>
           </div>
 
-          <div class="oh pr" ng-if="index.txps[0]">
+          <div ng-if="index.txps[0]">
             <h4 ng-show="index.requiresMultipleSignatures" class="title m0" translate>Payment Proposals</h4>
             <h4 ng-show="!index.requiresMultipleSignatures" class="title m0" translate>Unsent transactions</h4>
             <div ng-repeat="tx in index.txps">
-              <div ng-include="index.txTemplateUrl">
+              <div ng-include="index.txTemplateUrl"></div>
-              </div>
             </div>
 
             <div class="text-gray text-center size-12 p10t"
@@ -239,12 +239,6 @@
               </div>
             </div>
 
-            <div class="text-gray text-center size-12 p10t" ng-if="index.historyShowMore">
-              <span class="size-12" translate>{{index.completeHistory.length - index.txHistory.length}} more</span>
-              &nbsp;
-              <i class="icon-arrow-down4"></i>
-            </div>
-
             <ion-infinite-scroll
               ng-if="index.historyShowMore"
               on-infinite="index.showMore()"
@@ -255,7 +249,7 @@
 
       </ion-content>
       <div class="extra-margin-bottom"></div>
-    </ion-content> <!-- END WalletHome -->
+    </div> <!-- END WalletHome -->
 
     <!--
 

src/css/mobile.css

@@ -50,6 +50,9 @@ input {
 body {
   overflow: hidden;
   -ms-content-zooming: none;
+  /* removes 300ms in IE */
+  -ms-touch-action: manipulation; /* IE10 */
+  touch-action: manipulation; /* IE11+ */
 }
 
 /* Fix IE 10 */
@@ -114,10 +117,7 @@ _:-ms-fullscreen, :root .main {
   min-zoom:1;
 }
 
-body, html {
+.disable-user-behavior {
-  -ms-overflow-style: none !important;
+  -ms-touch-action: cross-slide-y !important;
+  touch-action: cross-slide-y !important;
 }
-
-/* removes 300ms in IE */
--ms-touch-action: manipulation; /* IE10 /
-touch-action: manipulation; /* IE11+ */

src/js/services/fingerprintService.js

@@ -5,7 +5,7 @@ angular.module('copayApp.services').factory('fingerprintService', function($log,
 
   var _isAvailable = false;
 
-  if (platformInfo.isCordova) {
+  if (platformInfo.isCordova && !platformInfo.isWP) {
     window.plugins.touchid = window.plugins.touchid || {};
     window.plugins.touchid.isAvailable(
       function(msg) {

src/sass/main.scss

@@ -753,6 +753,10 @@ ul.manage li {
   padding-top: 60px;
 }
 
+.p60b {
+  padding-bottom: 60px;
+}
+
 .m60t {
   margin-top: 60px;
 }