Merge pull request #198 from gabrielbazan7/feat/sendView

Send view contents

public/views/modals/txp-details.html

@@ -160,7 +160,7 @@
         <span translate>Delete Payment Proposal</span>
       </button>
     </div>
-    <button class="button button-block button-positive" ng-click="approve()" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && !isCordova" translate>Click to pay</button>
+    <button class="button button-block button-positive" ng-click="sign()" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && !isCordova" translate>Click to pay</button>
   </ion-content>
   <accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && isCordova"></accept>
 </ion-modal-view>

public/views/tab-send.html

@@ -4,45 +4,47 @@
   </ion-nav-bar>
 
   <ion-content>
-    <div>
-      <div class="item item-heading" translate>Recipient</div>
-      <label class="item item-input bitcoin-address">
-        <i class="icon ion-search placeholder-icon"></i>
-        <div class="qr-scan-icon" ng-style="{'width': '100%'}">
-          <qr-scanner class="qr-icon size-24" ng-style="{'top': '3px'}" on-scan="onQrCodeScanned(data)"></qr-scanner>
-          <input type="text"
-                 placeholder="Search or enter bitcoin address"
-                 ng-model="formData.search"
-                 ng-change="findContact(formData.search)"
-                 ng-model-onblur>
-        </div>
-      </label>
-    </div>
+    <div class="item item-heading" translate>Recipient</div>
+    <label class="item item-input bitcoin-address">
+      <i class="icon ion-social-bitcoin placeholder-icon"></i>
+      <div class="qr-scan-icon" ng-style="{'width': '100%'}">
+        <qr-scanner class="qr-icon size-24" ng-style="{'top': '3px'}" on-scan="onQrCodeScanned(data)"></qr-scanner>
+        <input type="text"
+               placeholder="{{'Search or enter bitcoin address' | translate}}"
+               ng-model="formData.search"
+               ng-change="findContact(formData.search)"
+               ng-model-onblur>
+      </div>
+    </label>
 
     <div class="card">
       <div class="item item-icon-right item-heading">
         <span translate>Contacts</span>
-        <a ui-sref="tabs.send.addressbook"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
+        <a ng-show="hasContacts" ui-sref="tabs.send.addressbook"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
       </div>
-      <a class="item item-icon-left ng-hide" ng-show="!hasContacts" ui-sref="tabs.send.addressbook">
+      <a class="item item-icon-left item-icon-right ng-hide" ng-show="!hasContacts" ui-sref="tabs.send.addressbook">
         <gravatar class="send-gravatar" name="" width="30" email=""></gravatar>
         <span translate>Add a Contact</span>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
-      <a class="item item-icon-left ng-hide" ng-repeat="item in list" ng-show="hasContacts && !item.isWallet" ng-click="goToAmount(item)">
+      <a class="item item-icon-left item-icon-right ng-hide" ng-repeat="item in list" ng-show="hasContacts && !item.isWallet" ng-click="goToAmount(item)">
         <gravatar class="send-gravatar" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
         {{item.name}}
+        <i class="icon nav-item-arrow-right"></i>
       </a>
+      <div class="show-more" ng-show="contactsShowMore" ng-click="showMore()" translate>
+        Show more
+      </div>
     </div>
 
-    <div class="card">
+    <div class="card" ng-show="hasWallets && !oneWallet">
       <div class="item item-heading">
         <span translate>Transfer to Wallet</span>
       </div>
-      <div class="item text-center ng-hide" ng-show="!hasWallets" translate>No Wallet</div>
-      <a class="item item-icon-left ng-hide" ng-repeat="item in list" ng-show="hasWallets && item.isWallet" ng-click="goToAmount(item)">
+      <a class="item item-icon-left item-icon-right ng-hide" ng-repeat="item in list" ng-show="hasWallets && item.isWallet" ng-click="goToAmount(item)">
         <i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
-        <gravatar class="send-gravatar" ng-show="!item.isWallet" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
         {{item.name}}
+        <i class="icon nav-item-arrow-right"></i>
       </a>
     </div>
   </ion-content>

src/js/controllers/confirm.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, gettext, txFormatService, ongoingProcess, $ionicModal, $ionicHistory, popupService) {
+angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, gettext, txFormatService, ongoingProcess, $ionicModal, popupService) {
   var cachedTxp = {};
   var isChromeApp = platformInfo.isChromeApp;
 

src/js/controllers/modals/txStatus.js

@@ -3,7 +3,7 @@
 angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $ionicHistory, $log, addressbookService) {
 
   if ($scope.cb) $timeout($scope.cb, 100);
-  $scope.fromSendTab = $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount" || "tabs.send";
+  $scope.fromSendTab = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount" ||  "tabs.send";
 
   $scope.cancel = function() {
     $scope.txStatusModal.hide();

src/js/controllers/tab-send.js

@@ -1,8 +1,10 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, addressbookService, profileService, lodash, $state, walletService, incomingData) {
+angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData) {
 
   var originalList;
+  var CONTACTS_SHOW_LIMIT = 10;
+  var currentContactsPage = 0;
 
   var updateList = function() {
     originalList = [];
@@ -11,6 +13,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
       onlyComplete: true
     });
     $scope.hasWallets = lodash.isEmpty(wallets) ? false : true;
+    $scope.oneWallet = wallets.length == 1;
 
     lodash.each(wallets, function(v) {
       originalList.push({
@@ -27,9 +30,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
       if (err) $log.error(err);
 
       $scope.hasContacts = lodash.isEmpty(ab) ? false : true;
-      var contacts = [];
+      var completeContacts = [];
       lodash.each(ab, function(v, k) {
-        contacts.push({
+        completeContacts.push({
           name: lodash.isObject(v) ? v.name : v,
           address: k,
           email: lodash.isObject(v) ? v.email : null,
@@ -39,15 +42,23 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
         });
       });
 
+      var contacts = completeContacts.slice(0, (currentContactsPage + 1) * CONTACTS_SHOW_LIMIT);
+      $scope.contactsShowMore = completeContacts.length > contacts.length;
       originalList = originalList.concat(contacts);
       $scope.list = lodash.clone(originalList);
 
       $timeout(function() {
+        $ionicScrollDelegate.resize();
         $scope.$apply();
-      }, 1);
+      }, 10);
     });
   };
 
+  $scope.showMore = function() {
+    currentContactsPage++;
+    updateList();
+  };
+
   $scope.findContact = function(search) {
 
     if (incomingData.redir(search)) {

src/js/services/profileService.js

@@ -1,6 +1,6 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('profileService', function profileServiceFactory($rootScope, $timeout, $filter, $log, sjcl, lodash, storageService, bwcService, configService, pushNotificationsService, gettext, gettextCatalog, bwcError, uxLanguage, platformInfo, $ionicHistory, txFormatService, $state) {
+  .factory('profileService', function profileServiceFactory($rootScope, $timeout, $filter, $log, sjcl, lodash, storageService, bwcService, configService, pushNotificationsService, gettext, gettextCatalog, bwcError, uxLanguage, platformInfo, txFormatService, $state) {
 
 
     var isChromeApp = platformInfo.isChromeApp;

src/sass/views/tab-send.scss

@@ -16,4 +16,11 @@
     position: absolute;
     top: 10px;
   }
+  .show-more {
+    text-align: center;
+    padding: 20px;
+    font-size: 16px;
+    color: #387ef5;
+    font-weight: bold;
+  }
 }