From de8df20062b0068384afa637c34fbb6417177401 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 25 Aug 2016 19:05:50 -0300
Subject: [PATCH] activity

---
 public/views/confirm.html      | 8 +++-----
 public/views/tab-home.html     | 5 ++++-
 src/js/controllers/confirm.js  | 9 +--------
 src/js/controllers/tab-home.js | 1 +
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/public/views/confirm.html b/public/views/confirm.html
index 115c8824d..def430623 100644
--- a/public/views/confirm.html
+++ b/public/views/confirm.html
@@ -39,10 +39,9 @@
           </div>
         </div>
 
-        <div class="item item-icon-left">
-          <i class="icon ion-briefcase size-21"></i>
+        <div class="item">
           <label translate>From</label>
-          <span class="badge badge-assertive" ng-show="notAvailable" translate>Not available</span>
+          <span class="badge badge-assertive" ng-show="notAvailable" translate>No wallet with enough funds</span>
         </div>
 
         <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
@@ -56,8 +55,7 @@
       </div>
 
       <button class="item button button-block button-balanced" ng-click="approve()" ng-disabled="!txp">
-        <span ng-show="wallet.canSign()" translate>Approve</span>
-        <span ng-show="!wallet.canSign()" translate>Send</span>
+        <span translate>Send</span>
       </button>
     </ion-content>
 </ion-view>
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 502d87cc2..4d7072da5 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -5,7 +5,8 @@
   </ion-nav-bar>
 
   <ion-content class="padding" ng-controller="tabHomeController">
-    <h3 class="title" translate>Recent Activity</h3>
+    <h3 class="title" translate>Recent Activity
+    </h3>
 
     <div ng-if="fetchingNotifications" class="updatingHistory">
       <div class="text-center">
@@ -20,7 +21,9 @@
         </div>
 
         <a class="item text-center" ui-sref="activity" ng-show="notificationsMore">
+
           <span translate>More</span> ({{notificationsMore}})
+(ToDo: 1-1 no here yet)
         </a>
 
         <div class="item" ng-show="!notifications[0]">
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index ae183bc93..4ec35031e 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -33,9 +33,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       $scope.description = description;
       $scope.txp = null;
 
-      ongoingProcess.set('creatingTx', true);
       createTx($scope.wallet, function(err, txp) {
-        ongoingProcess.set('creatingTx', false);
         if (err) return;
         cachedTxp[$scope.wallet.id] = txp;
         apply(txp);
@@ -124,8 +122,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     var filteredWallets = [];
     var index = 0;
 
-    ongoingProcess.set('scanning', true);
-
     lodash.each(wallets, function(w) {
       walletService.getStatus(w, {}, function(err, status) {
         if (err) $log.error(err);
@@ -133,7 +129,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
         if (status.availableBalanceSat > amount) filteredWallets.push(w);
 
         if (++index == wallets.length) {
-          ongoingProcess.set('scanning', false);
 
           if (!lodash.isEmpty(filteredWallets)) {
             $scope.wallets = lodash.clone(filteredWallets);
@@ -183,10 +178,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     if (cachedTxp[wallet.id]) {
       apply(cachedTxp[wallet.id]);
     } else {
-      ongoingProcess.set('creatingTx', true);
       stop = $timeout(function() {
         createTx(wallet, function(err, txp) {
-          ongoingProcess.set('creatingTx', false);
           if (err) return;
           cachedTxp[wallet.id] = txp;
           apply(txp);
@@ -205,7 +198,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     $scope.$apply();
   };
 
-  var createTx = function(wallet, cb) {
+  var createTx = function(wallet,  cb) {
     var config = configService.getSync().wallet;
     var currentSpendUnconfirmed = config.spendUnconfirmed;
     var outputs = [];
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index e536ba718..0d2929670 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -37,6 +37,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           walletService.getNotifications(wallet, {
             timeSpan: timeSpan
           }, function(err, n) {
+console.log('[tab-home.js.39]', wallet.name, n); //TODO
             if (err) {
               console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
               return;