From 1af5d6dd5f9469d7b2ae4d61af61e342a76e677a Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 10 Oct 2016 13:57:25 -0300
Subject: [PATCH 1/2] better message for "no enough funds"

---
 src/js/controllers/confirm.js | 21 ++++++++++++++++-----
 www/views/confirm.html        | 14 ++++++++++----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 868a45856..870febb2d 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -41,14 +41,20 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     var networkName = (new bitcore.Address($scope.toAddress)).network.name;
     $scope.network = networkName;
 
-    $scope.notAvailable = false;
+    $scope.insuffientFunds = false;
+    $scope.noMatchingWallet = false;
+
     var wallets = profileService.getWallets({
       onlyComplete: true,
       network: networkName,
     });
 
+    if (!wallets || !wallets.length) {
+      $scope.noMatchingWallet = true;
+    }
+
     var filteredWallets = [];
-    var index = 0;
+    var index = 0, enoughFunds = false;
 
     lodash.each(wallets, function(w) {
       walletService.getStatus(w, {}, function(err, status) {
@@ -56,15 +62,20 @@ angular.module('copayApp.controllers').controller('confirmController', function(
           $log.error(err);
         } else {
           if (!status.availableBalanceSat) $log.debug('No balance available in: ' + w.name);
-          if (status.availableBalanceSat > $scope.toAmount) filteredWallets.push(w);
+          if (status.availableBalanceSat > $scope.toAmount) {
+            filteredWallets.push(w);
+            enoughFunds = true;
+          }
         }
 
         if (++index == wallets.length) {
           if (!lodash.isEmpty(filteredWallets)) {
             $scope.wallets = lodash.clone(filteredWallets);
-            $scope.notAvailable = false;
           } else {
-            $scope.notAvailable = true;
+
+            if (!enoughFunds)
+              $scope.insuffientFunds = true;
+
             $log.warn('No wallet available to make the payment');
           }
         }
diff --git a/www/views/confirm.html b/www/views/confirm.html
index aa039f4b4..0577b8ab6 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -45,13 +45,19 @@
       </div>
     </div>
 
-    <div class="text-center" ng-show="notAvailable">
-      <span class="badge badge-assertive" translate>No wallet with enough funds</span>
+    <div class="text-center" ng-show="noMatchingWallet">
+      <span class="badge badge-assertive" translate>No appropiate wallet to make this payment</span>
+    </div>
+
+
+
+    <div class="text-center" ng-show="insuffientFunds">
+      <span class="badge badge-assertive" translate>Insufficient funds</span>
     </div>
 
     <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
 
-    <div class="list card">
+    <div ng-show="wallets[0]" class="list card">
       <div class="item item-icon-left item-icon-right" ng-click="showDescriptionPopup()">
         <i class="icon ion-ios-chatbubble-outline size-21"></i>
         <span ng-show="!description" translate>Add description</span>
@@ -59,7 +65,7 @@
         <i ng-show="!description" class="icon ion-ios-plus-empty size-21"></i>
       </div>
     </div>
-    <button class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
+    <button  ng-show="wallets[0]"  class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
   </ion-content>
   <accept class="accept-slide" ng-if="isCordova"></accept>
 </ion-view>

From 52f8888a949627e98c91262e43279cc0e56940e1 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 10 Oct 2016 14:12:25 -0300
Subject: [PATCH 2/2] fix arrow direction

---
 www/views/tab-home.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/views/tab-home.html b/www/views/tab-home.html
index b43869c56..35b92c244 100644
--- a/www/views/tab-home.html
+++ b/www/views/tab-home.html
@@ -126,8 +126,8 @@
          ng-show="nextStepEnabled && wallets[0]">
       <div class="item item-icon-right item-heading" ng-click="shouldHideNextSteps()" translate>
         Next steps
-        <i class="icon bp-arrow-down" ng-show="!hideNextSteps"></i>
-        <i class="icon bp-arrow-up" ng-show="hideNextSteps"></i>
+        <i class="icon bp-arrow-up" ng-show="!hideNextSteps"></i>
+        <i class="icon bp-arrow-down" ng-show="hideNextSteps"></i>
       </div>
       <div ng-show="!hideNextSteps">
         <a ui-sref="tabs.bitpayCard" ng-show="!externalServices.BitpayCard && bitpayCardEnabled" class="item item-icon-left item-big-icon-left item-icon-right next-step">