Merge pull request #1746 from cmgustavo/bug/history-scope

Bug/history send scope

css/src/main.css

@@ -1101,7 +1101,7 @@ button.gray:focus,
 }
 
 .side-nav.wallets {
-  z-index: 9999;
+  z-index: 100;
   background-color: #213140 ;
   border-bottom: 1px solid #3A4E61;
   overflow-y: auto;

js/controllers/home.js

@@ -31,18 +31,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
     identityService.open($scope, form);
   }
 
-  //TODO erase this function
-  $scope.setPayment = function() {
-    $rootScope.pendingPayment = {
-      "data": {
-        "amount": 20.3,
-        "label": "Luke-Jr",
-        "message": "Hola chango?"
-      },
-      "address": "175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"
-    };
-  }
-
   function getParam(sname) {
     var params = location.search.substr(location.search.indexOf("?") + 1);
     var sval = "";

js/services/controllerUtils.js

@@ -349,6 +349,9 @@ angular.module('copayApp.services')
       var w = $rootScope.wallet;
       if (!w) return root.onErrorDigest(); 
       var res = w.getPendingTxProposals();
+      _.each(res.txs, function(tx) {
+        root.computeAlternativeAmount(w, tx);
+      });
       $rootScope.txps = res.txs;
       if ($rootScope.pendingTxCount < res.pendingForUs) {
         $rootScope.txAlertCount = res.pendingForUs;

views/history.html

@@ -13,12 +13,19 @@
       ng-if="blockchain_txs[0].txid">
       <div class="large-12 columns">
 
-        <div class="panel oh" 
+        <div class="panel" 
-          ng-repeat="btx in blockchain_txs | orderBy: 'time':true" ng-click="btx.showDetails = !btx.showDetails">
+          ng-repeat="btx in blockchain_txs | orderBy:'-ts'" ng-click="btx.showDetails = !btx.showDetails">
           <div class="row size-14">
             <div class="large-2 medium-2 small-12 columns">
               <div class="tx-date">
-                <time ng-if="btx.ts">{{btx.ts | amCalendar}}</time>
+                <time 
+                  class="hastip"
+                  ng-if="btx.ts"
+                  data-options="disable_for_touch:true"
+                  tooltip-popup-delay='500'
+                  tooltip-placement="top"
+                  tooltip="{{btx.ts | amCalendar}}"
+                  tooltip-placement="left">{{btx.ts | amTimeAgo}}</time>
                 <span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
                   <span translate>Unconfirmed</span>
                 </span>
@@ -43,7 +50,7 @@
                   ng-class="{
                   'fi-arrow-left' : btx.action == 'received',
                   'fi-arrow-right': btx.action == 'sent', 
-                  'fi-arrow-loop': btx.action == 'moved'}"></i>
+                  'fi-loop': btx.action == 'moved'}"></i>
               </div>
             </div>
 

views/home.html

@@ -10,11 +10,6 @@
       <div ng-include="'views/includes/version.html'"></div>
     </div>
 
-
-        <a class="text-gray" translate ng-click="setPayment()">
-          Test payment
-        </a>
-
     <div class="p10 box-setup bg-success m10b text-white" ng-show="pendingPayment">
       <div class="left">
         <i class="size-36 m10r"></i>

views/includes/sidebar.html

@@ -11,13 +11,15 @@
         </div> 
       </div>
       <div class="founds size-12">
-        <!-- {{'Balance'|translate}} -->
+        <span ng-if="!$root.wallet.isReady()">Waiting for copayers...</span>
-        <span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
+        <div ng-if="$root.wallet.isReady()">
-        <div ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
+          <span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
-          <b class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
+          <div ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
-          <span ng-if="alternativeBalanceAvailable" class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
+            <b class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
-          <span ng-if="!alternativeBalanceAvailable" class="alt-currency">N/A</span>
+            <span ng-if="alternativeBalanceAvailable" class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
-        </div> 
+            <span ng-if="!alternativeBalanceAvailable" class="alt-currency">N/A</span>
+          </div> 
+        </div>
       </div>
     </div>
     <div class="col3" ng-if="wallets.0">
@@ -41,7 +43,9 @@
     </span>
     <i class="fi-info medium right text-gray size-14" 
       tooltip="{{'Balance locked in pending transaction proposals'|translate}}"
-    tooltip-placement="left"></i>
+      tooltip-placement="left"
+      data-options="disable_for_touch:true"
+      tooltip-popup-delay='500'></i>
 
   </div>
 

views/includes/transaction.html

@@ -10,7 +10,9 @@
     <div class="large-3 medium-3 small-4 columns">
       <div class="size-12">
         <span>{{out.value |noFractionNumber}} {{$root.wallet.settings.unitName}}</span>
-        <span>{{out.alternativeAmount|noFractionNumber}} {{out.alternativeIsoCode}}</span>
+        <span class="label secondary round">
+          {{out.alternativeAmount|noFractionNumber}} {{out.alternativeIsoCode}}
+        </span>
       </div>
     </div>
     <div class="large-1 medium-1 small-1 columns fi-arrow-right"></div>