From fac553eb1483f11d5d8b3628170f7f41f8aaa2a8 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 22 Sep 2016 18:24:46 -0300
Subject: [PATCH 01/47] Return cached address while BWS returns main address
 GAP reached

---
 src/js/controllers/tab-receive.js |  5 +----
 src/js/services/walletService.js  | 25 ++++++-------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 26e71e57c..763253d95 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -51,10 +51,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     $timeout(function() {
       walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
         $scope.generatingAddress = false;
-        if (err || lodash.isEmpty(addr)) {
-          popupService.showAlert(gettextCatalog.getString('Error'), err || gettextCatalog.getString('Address is empty'));
-          return;
-        }
+        if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
         $scope.addr = addr;
         $scope.$apply();
       });
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index 0c9d00583..aedd12eb3 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -791,29 +791,16 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
 
   root.getAddress = function(wallet, forceNew, cb) {
 
-    var firstStep;
-    if (forceNew) {
-      firstStep = storageService.clearLastAddress;
-    } else {
-      firstStep = function(walletId, cb) {
-        return cb();
-      };
-    }
-
-    firstStep(wallet.id, function(err) {
+    storageService.getLastAddress(wallet.id, function(err, addr) {
       if (err) return cb(err);
 
-      storageService.getLastAddress(wallet.id, function(err, addr) {
-        if (err) return cb(err);
+      if (!forceNew && addr) return cb(null, addr);
 
-        if (addr) return cb(null, addr);
-
-        createAddress(wallet, function(err, addr) {
+      createAddress(wallet, function(err, _addr) {
+        if (err) return cb(err, addr);
+        storageService.storeLastAddress(wallet.id, _addr, function() {
           if (err) return cb(err);
-          storageService.storeLastAddress(wallet.id, addr, function() {
-            if (err) return cb(err);
-            return cb(null, addr);
-          });
+          return cb(null, _addr);
         });
       });
     });

From f82ea8502fb0e237dfd5a0b9bd24094021caacd3 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Fri, 23 Sep 2016 09:50:17 -0400
Subject: [PATCH 02/47] started new address book styling

---
 public/views/addressbook.add.html | 4 ++--
 src/sass/main.scss                | 1 +
 src/sass/views/address-book.scss  | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 src/sass/views/address-book.scss

diff --git a/public/views/addressbook.add.html b/public/views/addressbook.add.html
index f7f575305..11e528f5a 100644
--- a/public/views/addressbook.add.html
+++ b/public/views/addressbook.add.html
@@ -1,4 +1,4 @@
-<ion-view>
+<ion-view id="add-address">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>
       <span translate>Add Contact</span>
@@ -16,7 +16,7 @@
 
     <form name="addressbookForm" no-validate>
 
-      <div class="card list">
+      <div class="list">
         <label class="item item-input item-stacked-label">
           <span class="input-label" translate>Name</span>
           <input type="text"
diff --git a/src/sass/main.scss b/src/sass/main.scss
index f8c178211..d8047b908 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -994,6 +994,7 @@ input[type=number] {
 @import "views/walletDetails";
 @import "views/bitpayCard";
 @import "views/wallet-backup-phrase";
+@import "views/address-book";
 @import 'views/onboarding/onboarding';
 @import "views/includes/walletActivity";
 @import "views/includes/wallets";
diff --git a/src/sass/views/address-book.scss b/src/sass/views/address-book.scss
new file mode 100644
index 000000000..e47aec255
--- /dev/null
+++ b/src/sass/views/address-book.scss
@@ -0,0 +1,5 @@
+#add-address{
+  .list{
+    background: #ffffff;
+  }
+}
\ No newline at end of file

From ee10ebff9c633023c443133fb67c056feec25432 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Fri, 23 Sep 2016 10:10:17 -0400
Subject: [PATCH 03/47] updated address book add and no address for user

---
 public/views/addressbook.add.html |  3 ++-
 public/views/addressbook.html     | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/public/views/addressbook.add.html b/public/views/addressbook.add.html
index 11e528f5a..fdccb8dae 100644
--- a/public/views/addressbook.add.html
+++ b/public/views/addressbook.add.html
@@ -29,11 +29,12 @@
           <span class="input-label" translate>Email</span>
           <input type="text"
                  id="email"
+                 placeholder="name@example.com" 
                  name="email"
                  ng-model="addressbookEntry.email">
         </label>
         <label class="item item-input item-stacked-label">
-          <span class="input-label" translate>Address</span>
+          <span class="input-label" translate>Bitcoin Address</span>
           <div class="input-notification">
             <i class="icon ion-checkmark-circled balanced"
                ng-show="!addressbookForm.address.$invalid"></i>
diff --git a/public/views/addressbook.html b/public/views/addressbook.html
index dbc5f9648..ee69d6fb7 100644
--- a/public/views/addressbook.html
+++ b/public/views/addressbook.html
@@ -1,4 +1,4 @@
-<ion-view>
+<ion-view id="view-address-book">
   <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
     </ion-nav-back-button>
@@ -39,12 +39,13 @@
 
       </ion-item>
     </ion-list>
-    <div class="list" ng-show="isEmptyList">
-      <a class="item item-icon-left" ui-sref="tabs.addressbook.add">
-        <i class="icon ion-person-add"></i>
-        <span translate>Add a new entry</span>
-      </a>
+    <div class="row text-center absolute-center" ng-show="isEmptyList">
+      <div id="add-contact" class="col col-80 center-block">
+        <img class="col" src="img/item-ico-contact.svg">
+        <a class="col col-40 center-block" ui-sref="tabs.addressbook.add">
+          Add Contact
+        </a>
+      </div>
     </div>
-
   </ion-content>
 </ion-view>

From 4ecfb6636bb8a5438fba6ac0496abd9a94618daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 26 Sep 2016 09:55:16 -0300
Subject: [PATCH 04/47] fix ionichistory not defined

---
 src/js/controllers/join.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index f983e25c5..872b15462 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('joinController',
-  function($scope, $rootScope, $timeout, $state, profileService, configService, storageService, applicationService, gettext, gettextCatalog, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService) {
+  function($scope, $rootScope, $timeout, $state, $ionicHistory, profileService, configService, storageService, applicationService, gettext, gettextCatalog, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService) {
 
     var isChromeApp = platformInfo.isChromeApp;
     var isDevel = platformInfo.isDevel;

From 477409ee8256f2022ab6668bc1fc8444d83da831 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Mon, 26 Sep 2016 10:35:33 -0400
Subject: [PATCH 05/47] somewhat styled delete wallet view

---
 public/views/preferencesDeleteWallet.html | 16 ++++++++++------
 src/js/controllers/preferencesDelete.js   |  2 +-
 src/sass/common.scss                      |  5 +++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html
index 351e03519..f9de95220 100644
--- a/public/views/preferencesDeleteWallet.html
+++ b/public/views/preferencesDeleteWallet.html
@@ -5,13 +5,17 @@
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
-    <div class="card">
-      <h1 class="text-center" translate>Warning!</h2>
-      <div class="assertive padding" translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div>
-      <div class="text-center padding">
-        <span ng-show="alias">{{alias}}</span>{{walletName}}
+    <div class="white-bg padding">
+      <h1 class="text-center assertive" translate>Warning!</h2>
+      <div class="padding text-center">
+        <p translate>
+          Permanently delete this wallet.
+        </p>
+        <p translate class="bold-text">
+          THIS ACTION CANNOT BE REVERSED
+        </p>
       </div>
     </div>
-    <button class="button button-block button-assertive" ng-click="showDeletePopup()"translate>Delete</button>
+    <button class="button button-block button-assertive" ng-click="showDeletePopup()"translate>Delete <span ng-show="alias">{{alias}}</span>{{walletName}}</button>
   </ion-content>
 </ion-view>
diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js
index 5aff687c2..e970d5182 100644
--- a/src/js/controllers/preferencesDelete.js
+++ b/src/js/controllers/preferencesDelete.js
@@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
   function($scope, $stateParams, $ionicHistory, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService) {
     var wallet = profileService.getWallet($stateParams.walletId);
     $scope.alias = lodash.isEqual(wallet.name, wallet.credentials.walletName) ? null : wallet.name + ' ';
-    $scope.walletName = '[' + wallet.credentials.walletName + ']';
+    $scope.walletName = wallet.credentials.walletName;
 
     $scope.showDeletePopup = function() {
       var title = gettextCatalog.getString('Warning!');
diff --git a/src/sass/common.scss b/src/sass/common.scss
index 40eb910a0..86e619887 100644
--- a/src/sass/common.scss
+++ b/src/sass/common.scss
@@ -45,6 +45,11 @@
     }
   }
 }
+
+.white-bg{
+  background: #fff;
+}
+
 .overlay {
   position: absolute;
   top:0;

From 3c7df9e51f8b169f392f8d59a3eb26fbd0156205 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Mon, 26 Sep 2016 12:12:32 -0400
Subject: [PATCH 06/47] added iPhone 7 into range

---
 src/sass/views/wallet-backup-phrase.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sass/views/wallet-backup-phrase.scss b/src/sass/views/wallet-backup-phrase.scss
index 0defd9af5..18739039e 100644
--- a/src/sass/views/wallet-backup-phrase.scss
+++ b/src/sass/views/wallet-backup-phrase.scss
@@ -84,7 +84,7 @@
       }
     }
 
-    @media (min-width : 320px) and (max-width : 340px) and (orientation : portrait), (min-width : 650px) and (max-width : 770px) and (orientation : portrait){
+    @media (min-width : 320px) and (max-width : 380px) and (orientation : portrait), (min-width : 650px) and (max-width : 770px) and (orientation : portrait){
       #wallet-backup-phrase{
         .cta-buttons,#select-phrase{
           bottom: 64px;

From 49301d7069c6aa9b313fdc0d131fcf65f4f9c08b Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Mon, 26 Sep 2016 12:35:10 -0400
Subject: [PATCH 07/47] added fix for iPhone plus devices

---
 src/sass/views/wallet-backup-phrase.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sass/views/wallet-backup-phrase.scss b/src/sass/views/wallet-backup-phrase.scss
index 18739039e..057dea5f0 100644
--- a/src/sass/views/wallet-backup-phrase.scss
+++ b/src/sass/views/wallet-backup-phrase.scss
@@ -84,7 +84,7 @@
       }
     }
 
-    @media (min-width : 320px) and (max-width : 380px) and (orientation : portrait), (min-width : 650px) and (max-width : 770px) and (orientation : portrait){
+    @media (min-width : 320px) and (max-width : 415px) and (orientation : portrait), (min-width : 650px) and (max-width : 770px) and (orientation : portrait){
       #wallet-backup-phrase{
         .cta-buttons,#select-phrase{
           bottom: 64px;

From ac3dc80bd0afa1ab85889a82ad4ac7c07a4737e0 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 26 Sep 2016 14:31:36 -0300
Subject: [PATCH 08/47] Fix title bar when changing tabs

---
 public/views/preferencesAbout.html     |   1 +
 src/js/controllers/copayers.js         |   2 +-
 src/js/controllers/preferencesAbout.js |   6 +-
 src/js/controllers/walletDetails.js    |   8 +-
 src/js/services/swipe.js               | 150 -------------------------
 5 files changed, 7 insertions(+), 160 deletions(-)
 delete mode 100644 src/js/services/swipe.js

diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html
index 8bda60d32..072746127 100644
--- a/public/views/preferencesAbout.html
+++ b/public/views/preferencesAbout.html
@@ -1,5 +1,6 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{title}}</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
diff --git a/src/js/controllers/copayers.js b/src/js/controllers/copayers.js
index 186c23ae1..765db7d52 100644
--- a/src/js/controllers/copayers.js
+++ b/src/js/controllers/copayers.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('copayersController',
-  function($scope, $log, $ionicNavBarDelegate, $timeout, $stateParams, $state, $rootScope, $ionicHistory, lodash, profileService, walletService, popupService, platformInfo, gettextCatalog, ongoingProcess) {
+  function($scope, $log, $timeout, $stateParams, $state, $rootScope, $ionicHistory, lodash, profileService, walletService, popupService, platformInfo, gettextCatalog, ongoingProcess) {
 
     $scope.$on("$ionicView.beforeEnter", function(event, data) {
       init();
diff --git a/src/js/controllers/preferencesAbout.js b/src/js/controllers/preferencesAbout.js
index 79bc23cdf..64f10de54 100644
--- a/src/js/controllers/preferencesAbout.js
+++ b/src/js/controllers/preferencesAbout.js
@@ -1,11 +1,9 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesAbout',
-  function($scope, $window, $ionicNavBarDelegate, gettextCatalog, externalLinkService) {
-    $scope.$on("$ionicView.beforeEnter", function(event, data){
-      $ionicNavBarDelegate.title(gettextCatalog.getString('About') + ' ' + $window.appConfig.nameCase);
-    });
+  function($scope, $window, gettextCatalog, externalLinkService) {
 
+    $scope.title = gettextCatalog.getString('About') + ' ' + $window.appConfig.nameCase;
     $scope.version = $window.version;
     $scope.commitHash = $window.commitHash;
     $scope.name = $window.appConfig.gitHubRepoName;
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index b6a51f331..c51a99f37 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $ionicNavBarDelegate, $state, $stateParams, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService, $ionicPopup, txpModalService, externalLinkService) {
+angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService, $ionicPopup, txpModalService, externalLinkService) {
   var isCordova = platformInfo.isCordova;
   var isWP = platformInfo.isWP;
   var isAndroid = platformInfo.isAndroid;
@@ -204,15 +204,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     wallet = profileService.getWallet($stateParams.walletId);
 
     /* Set color for header bar */
-    $rootScope.walletDetailsColor = wallet.color;
-    $rootScope.walletDetailsName = wallet.name;
+    $scope.walletDetailsColor = wallet.color;
+    $scope.walletDetailsName = wallet.name;
     $scope.wallet = wallet;
 
     $scope.requiresMultipleSignatures = wallet.credentials.m > 1;
     $scope.newTx = false;
 
-    $ionicNavBarDelegate.title(wallet.name);
-
     $scope.updateAll(function() {
       if ($stateParams.txid) {
         var tx = lodash.find($scope.completeTxHistory, {
diff --git a/src/js/services/swipe.js b/src/js/services/swipe.js
deleted file mode 100644
index 57a210c4c..000000000
--- a/src/js/services/swipe.js
+++ /dev/null
@@ -1,150 +0,0 @@
-'use strict';
-
-/*  
- * This is a modification from https://github.com/angular/angular.js/blob/master/src/ngTouch/swipe.js
- */
-
-
-angular.module('copayApp.services')
-  .factory('$swipe', [
-  function() {
-    // The total distance in any direction before we make the call on swipe vs. scroll.
-    var MOVE_BUFFER_RADIUS = 10;
-
-    var POINTER_EVENTS = {
-      'touch': {
-        start: 'touchstart',
-        move: 'touchmove',
-        end: 'touchend',
-        cancel: 'touchcancel'
-      }
-    };
-
-    function getCoordinates(event) {
-      var originalEvent = event.originalEvent || event;
-      var touches = originalEvent.touches && originalEvent.touches.length ? originalEvent.touches : [originalEvent];
-      var e = (originalEvent.changedTouches && originalEvent.changedTouches[0]) || touches[0];
-
-      return {
-        x: e.clientX,
-        y: e.clientY
-      };
-    }
-
-    function getEvents(pointerTypes, eventType) {
-      var res = [];
-      angular.forEach(pointerTypes, function(pointerType) {
-        var eventName = POINTER_EVENTS[pointerType][eventType];
-        if (eventName) {
-          res.push(eventName);
-        }
-      });
-      return res.join(' ');
-    }
-
-    return {
-      /**
-       * @ngdoc method
-       * @name $swipe#bind
-       *
-       * @description
-       * The main method of `$swipe`. It takes an element to be watched for swipe motions, and an
-       * object containing event handlers.
-       * The pointer types that should be used can be specified via the optional
-       * third argument, which is an array of strings `'mouse'` and `'touch'`. By default,
-       * `$swipe` will listen for `mouse` and `touch` events.
-       *
-       * The four events are `start`, `move`, `end`, and `cancel`. `start`, `move`, and `end`
-       * receive as a parameter a coordinates object of the form `{ x: 150, y: 310 }`.
-       *
-       * `start` is called on either `mousedown` or `touchstart`. After this event, `$swipe` is
-       * watching for `touchmove` or `mousemove` events. These events are ignored until the total
-       * distance moved in either dimension exceeds a small threshold.
-       *
-       * Once this threshold is exceeded, either the horizontal or vertical delta is greater.
-       * - If the horizontal distance is greater, this is a swipe and `move` and `end` events follow.
-       * - If the vertical distance is greater, this is a scroll, and we let the browser take over.
-       *   A `cancel` event is sent.
-       *
-       * `move` is called on `mousemove` and `touchmove` after the above logic has determined that
-       * a swipe is in progress.
-       *
-       * `end` is called when a swipe is successfully completed with a `touchend` or `mouseup`.
-       *
-       * `cancel` is called either on a `touchcancel` from the browser, or when we begin scrolling
-       * as described above.
-       *
-       */
-      bind: function(element, eventHandlers, pointerTypes) {
-        // Absolute total movement, used to control swipe vs. scroll.
-        var totalX, totalY;
-        // Coordinates of the start position.
-        var startCoords;
-        // Last event's position.
-        var lastPos;
-        // Whether a swipe is active.
-        var active = false;
-
-        pointerTypes = pointerTypes || ['touch'];
-        element.on(getEvents(pointerTypes, 'start'), function(event) {
-          startCoords = getCoordinates(event);
-          active = true;
-          totalX = 0;
-          totalY = 0;
-          lastPos = startCoords;
-          eventHandlers['start'] && eventHandlers['start'](startCoords, event);
-        });
-        var events = getEvents(pointerTypes, 'cancel');
-        if (events) {
-          element.on(events, function(event) {
-            active = false;
-            eventHandlers['cancel'] && eventHandlers['cancel'](event);
-          });
-        }
-
-        element.on(getEvents(pointerTypes, 'move'), function(event) {
-          if (!active) return;
-
-          // Android will send a touchcancel if it thinks we're starting to scroll.
-          // So when the total distance (+ or - or both) exceeds 10px in either direction,
-          // we either:
-          // - On totalX > totalY, we send preventDefault() and treat this as a swipe.
-          // - On totalY > totalX, we let the browser handle it as a scroll.
-
-          if (!startCoords) return;
-          var coords = getCoordinates(event);
-
-          totalX += Math.abs(coords.x - lastPos.x);
-          totalY += Math.abs(coords.y - lastPos.y);
-
-          lastPos = coords;
-
-          if (totalX < MOVE_BUFFER_RADIUS && totalY < MOVE_BUFFER_RADIUS) {
-            return;
-          }
-
-          // One of totalX or totalY has exceeded the buffer, so decide on swipe vs. scroll.
-          if (totalY > totalX) {
-            // Allow native scrolling to take over.
-            active = false;
-            eventHandlers['cancel'] && eventHandlers['cancel'](event);
-            return;
-          } else {
-
-            // Prevent the browser from scrolling.
-            event.preventDefault();
-            eventHandlers['move'] && eventHandlers['move'](coords, event);
-          }
-        });
-
-        element.on(getEvents(pointerTypes, 'end'), function(event) {
-          if (!active) return;
-          active = false;
-          eventHandlers['end'] && eventHandlers['end'](getCoordinates(event), event);
-        });
-      }
-    };
-  }
-]);
-
-

From c40c43505f4ed4e0cab64e2459c415d575b1211a Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Mon, 26 Sep 2016 15:26:36 -0400
Subject: [PATCH 09/47] updated notifications cta image size for tablet sizes,
 set max width for disclaimer checkbox items

---
 public/views/onboarding/disclaimer.html       |  8 +--
 .../views/onboarding/onboard-disclaimer.scss  |  8 +++
 .../onboard-push-notifications.scss           | 49 +++++++++++--------
 src/sass/views/onboarding/onboarding.scss     |  6 ++-
 4 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/public/views/onboarding/disclaimer.html b/public/views/onboarding/disclaimer.html
index f31a0b082..d00df84e9 100644
--- a/public/views/onboarding/disclaimer.html
+++ b/public/views/onboarding/disclaimer.html
@@ -13,9 +13,11 @@
       <ion-checkbox ng-model="accept2"><span translate>I understand if this app moved to another device or deleted, my bitcoin can only be recovered with the backup phrase</span></ion-checkbox>
     </ion-list>
     <div id="agree-to-terms" ng-if="accept1 && accept2">
-      <ion-checkbox ng-model="terms.accept3"></ion-checkbox>
-      <p translate>I have read, understood, and agree with the <a ng-click="openTermsModal()" translate>Terms of use</a>.</p>
-      <button ng-disabled="!accept1 || !accept2 || !terms.accept3" class="button button-block button-positive" ng-click="confirm()" translate>Confirm & Finish</button>
+      <div id="agree-to-terms-content" class="center-block">
+        <ion-checkbox ng-model="terms.accept3"></ion-checkbox>
+        <p translate>I have read, understood, and agree with the <a ng-click="openTermsModal()" translate>Terms of use</a>.</p>
+        <button ng-disabled="!accept1 || !accept2 || !terms.accept3" class="button button-block button-positive" ng-click="confirm()" translate>Confirm & Finish</button>
+      </div>
     </div>
   </ion-content>
 </ion-view>
diff --git a/src/sass/views/onboarding/onboard-disclaimer.scss b/src/sass/views/onboarding/onboard-disclaimer.scss
index 11491fd87..3bf455da5 100644
--- a/src/sass/views/onboarding/onboard-disclaimer.scss
+++ b/src/sass/views/onboarding/onboard-disclaimer.scss
@@ -10,6 +10,10 @@
       margin-top:1.5rem;
     }
   }
+  .list{
+    max-width: 600px;
+    @include center-block();
+  }
   .item {
     background: transparent;
     border: none;
@@ -55,6 +59,10 @@
     position: absolute;
     bottom: 0;
     width: 100%;
+    &-content{
+      max-width: 600px;
+      @include center-block();
+    }
     .item{
       color:rgb(58,58,58);
       padding-bottom: 2.5rem;
diff --git a/src/sass/views/onboarding/onboard-push-notifications.scss b/src/sass/views/onboarding/onboard-push-notifications.scss
index 1132317e7..30ff9b4a2 100644
--- a/src/sass/views/onboarding/onboard-push-notifications.scss
+++ b/src/sass/views/onboarding/onboard-push-notifications.scss
@@ -1,40 +1,49 @@
-#onboarding-push-notifications{
-  h2{
-    margin-top:2rem;
+#onboarding-push-notifications {
+  h2 {
+    margin-top: 2rem;
   }
-  #cta{
+  #cta {
     background-image: url('../img/onboarding-push-notifications.svg');
     height: 15rem;
     margin-top: .75rem;
   }
-  .cta-buttons{
-    float:none;
-    bottom:0;
+  .cta-buttons {
+    float: none;
+    bottom: 0;
     position: absolute;
-    width:100%;
-    button{
+    width: 100%;
+    button {
       max-width: 400px;
     }
   }
 }
 
-@media (max-width: 400px){
-  #onboarding-push-notifications{
-    .cta-buttons{
-      float:none;
-      bottom:0;
+@media (max-width: 400px) {
+  #onboarding-push-notifications {
+    .cta-buttons {
+      float: none;
+      bottom: 0;
       position: absolute;
     }
   }
 }
-@media (max-height: 540px){
-  #onboarding-push-notifications{
-    #cta{
+
+@media (max-height: 540px) {
+  #onboarding-push-notifications {
+    #cta {
       margin-bottom: 0;
     }
-    .cta-buttons{
-      float:left;
+    .cta-buttons {
+      float: left;
       position: relative;
     }
   }
-}
\ No newline at end of file
+}
+
+@media (min-width: 450px) {
+  #onboarding-push-notifications {
+    #cta {
+      height: 26rem;
+    }
+  }
+}
diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss
index 22cbf9452..c44f79878 100644
--- a/src/sass/views/onboarding/onboarding.scss
+++ b/src/sass/views/onboarding/onboarding.scss
@@ -91,7 +91,11 @@
   .onboarding{
     ion-content{
       h2{
-        font-size: 1.2rem;
+        font-size: 2rem;
+      }
+      p{
+        font-size: 1.4rem;
+        line-height: 1.9rem;
       }
       p,h2,h3{
         max-width: 600px !important;

From 5fc36dce2df8a150f7fd22e190274312e662a0e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 26 Sep 2016 16:44:47 -0300
Subject: [PATCH 10/47] next steps card should be collapsable

---
 public/views/tab-home.html     | 62 ++++++++++++++++++----------------
 src/js/controllers/tab-home.js |  5 +++
 src/sass/common.scss           | 12 +++++++
 3 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 24cb50598..1f7a26f2b 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -116,37 +116,41 @@
 
     <div class="list card"
          ng-show="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]">
-      <div class="item item-heading" translate>
+      <div class="item item-icon-right item-heading" ng-click="shouldHideNextSteps()" translate>
         Next steps
+        <i class="icon nav-item-arrow-down" ng-show="!hideNextSteps"></i>
+        <i class="icon nav-item-arrow-up" ng-show="hideNextSteps"></i>
+      </div>
+      <div ng-show="hideNextSteps">
+        <a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
+         <i class="icon big-icon-svg">
+           <div class="bg icon-create-wallet"></div>
+         </i>
+          <span translate>Create a bitcoin wallet</span>
+          <i class="icon nav-item-arrow-right"></i>
+        </a>
+        <a ui-sref="bitpayCard.main" ng-if="!externalServices.BitpayCard" class="item item-icon-left item-big-icon-left item-icon-right next-step">
+         <i class="icon big-icon-svg">
+           <div class="bg icon-bitpay-card"></div>
+         </i>
+          <span translate>Add BitPay Card</span>
+          <i class="icon nav-item-arrow-right"></i>
+        </a>
+        <a ng-if="!externalServices.BuyAndSell" ui-sref="tabs.buyandsell" class="item item-icon-left item-big-icon-left item-icon-right next-step">
+         <i class="icon big-icon-svg">
+           <div class="bg icon-buy-bitcoin"></div>
+         </i>
+          <span translate>Buy or Sell Bitcoin</span>
+          <i class="icon nav-item-arrow-right"></i>
+        </a>
+        <a ui-sref="tabs.giftcards.amazon" ng-if="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right next-step">
+          <i class="icon big-icon-svg">
+            <div class="bg icon-gift"></div>
+          </i>
+          <span translate>Buy Amazon.com Gift Card</span>
+          <i class="icon nav-item-arrow-right"></i>
+        </a>
       </div>
-      <a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
-       <i class="icon big-icon-svg">
-         <div class="bg icon-create-wallet"></div>
-       </i>
-        <span translate>Create a bitcoin wallet</span>
-        <i class="icon nav-item-arrow-right"></i>
-      </a>
-      <a ui-sref="bitpayCard.main" ng-if="!externalServices.BitpayCard" class="item item-icon-left item-big-icon-left item-icon-right next-step">
-       <i class="icon big-icon-svg">
-         <div class="bg icon-bitpay-card"></div>
-       </i>
-        <span translate>Add BitPay Card</span>
-        <i class="icon nav-item-arrow-right"></i>
-      </a>
-      <a ng-if="!externalServices.BuyAndSell" ui-sref="tabs.buyandsell" class="item item-icon-left item-big-icon-left item-icon-right next-step">
-       <i class="icon big-icon-svg">
-         <div class="bg icon-buy-bitcoin"></div>
-       </i>
-        <span translate>Buy or Sell Bitcoin</span>
-        <i class="icon nav-item-arrow-right"></i>
-      </a>
-      <a ui-sref="tabs.giftcards.amazon" ng-if="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right next-step">
-        <i class="icon big-icon-svg">
-          <div class="bg icon-gift"></div>
-        </i>
-        <span translate>Buy Amazon.com Gift Card</span>
-        <i class="icon nav-item-arrow-right"></i>
-      </a>
     </div>
 
     <p class="padding" style="text-align:center; color:#999">
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 67f93c1fe..f58bb7ca0 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -180,6 +180,11 @@ angular.module('copayApp.controllers').controller('tabHomeController',
       });
     };
 
+    $scope.shouldHideNextSteps = function() {
+      $scope.hideNextSteps = !$scope.hideNextSteps;
+      $ionicScrollDelegate.resize();
+    };
+
     var listeners = [
       $rootScope.$on('bwsEvent', function(e, walletId, type, n) {
         var wallet = profileService.getWallet(walletId);
diff --git a/src/sass/common.scss b/src/sass/common.scss
index 86e619887..5be328775 100644
--- a/src/sass/common.scss
+++ b/src/sass/common.scss
@@ -4,6 +4,18 @@
   @extend .ion-ios-arrow-right;
 }
 
+.icon.nav-item-arrow-down {
+  color: #666;
+  font-size: 26px;
+  @extend .ion-ios-arrow-down;
+}
+
+.icon.nav-item-arrow-up {
+  color: #666;
+  font-size: 26px;
+  @extend .ion-ios-arrow-up;
+}
+
 .item.item-heading {
   font-weight: bold;
 }

From 34f337d7b665688169eee4936603258a6187ff8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 26 Sep 2016 18:03:00 -0300
Subject: [PATCH 11/47] add qr scanner to send tab

---
 public/views/tab-send.html     | 13 ++++++++-----
 src/js/controllers/tab-send.js | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/public/views/tab-send.html b/public/views/tab-send.html
index 29af3f48b..d23a0731f 100644
--- a/public/views/tab-send.html
+++ b/public/views/tab-send.html
@@ -8,11 +8,14 @@
       <div class="item item-heading" translate>Recipient</div>
       <label class="item item-input bitcoin-address">
         <i class="icon ion-search placeholder-icon"></i>
-        <input type="text"
-               placeholder="Search or enter bitcoin address"
-               ng-model="formData.search"
-               ng-change="findContact(formData.search)"
-               ng-model-onblur>
+        <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>
 
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index ce2fb7bd6..18cafd1d1 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -86,8 +86,18 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
     });
   };
 
-  $scope.$on("$ionicView.beforeEnter", function(event, data){
-    $scope.formData = { search: null };
+  $scope.onQrCodeScanned = function(data) {
+    if (!incomingData.redir(data)) {
+      $ionicPopup.alert({
+        title: 'Invalid data',
+      });
+    }
+  };
+
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+    $scope.formData = {
+      search: null
+    };
     updateList();
   });
 

From ec875f7b1b69d2fdcd4499a358d7f487ddeff609 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 26 Sep 2016 18:26:41 -0300
Subject: [PATCH 12/47] Hide nav-bar on amount/confirm and addressbook views

---
 public/views/tabs.html               |  8 ++++----
 src/js/controllers/amount.js         |  4 ++--
 src/js/controllers/tabsController.js | 26 ++++++++++++++++++++++++--
 src/js/routes.js                     |  1 +
 src/sass/views/address-book.scss     |  2 --
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/public/views/tabs.html b/public/views/tabs.html
index 66d9a2bc5..b1d26e8fc 100644
--- a/public/views/tabs.html
+++ b/public/views/tabs.html
@@ -3,13 +3,13 @@ Create tabs with an icon and label, using the tabs-positive style.
 Each tab's child <ion-nav-view> directive will have its own
 navigation history that also transitions its views in and out.
 -->
-<ion-tabs class="tabs-icon-top tabs-color-active-positive" ng-controller="tabsController">
+<ion-tabs class="tabs-icon-top tabs-color-active-positive" ng-class="{'tabs-item-hide': hideTabs}">
 
-  <ion-tab title="Home" icon-off="ico-home" icon-on="ico-home-selected" href="#/tabs/home">
+  <ion-tab title="Home" icon-off="ico-home" icon-on="ico-home-selected" ui-sref="tabs.home">
     <ion-nav-view name="tab-home"></ion-nav-view>
   </ion-tab>
 
-  <ion-tab title="Receive" icon-off="ico-receive" icon-on="ico-receive-selected" href="#/tabs/receive">
+  <ion-tab title="Receive" icon-off="ico-receive" icon-on="ico-receive-selected" ui-sref="tabs.receive">
     <ion-nav-view name="tab-receive"></ion-nav-view>
   </ion-tab>
 
@@ -21,7 +21,7 @@ navigation history that also transitions its views in and out.
   <ion-tab title="Scan" icon-off="ico-scan" ng-click="scan()" >
   </ion-tab>
 
-  <ion-tab title="Send" icon-off="ico-send" icon-on="ico-send-selected" href="#/tabs/send">
+  <ion-tab title="Send" icon-off="ico-send" icon-on="ico-send-selected" ui-sref="tabs.send">
     <ion-nav-view name="tab-send"></ion-nav-view>
   </ion-tab>
 
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 590fa55d4..48daafb38 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -15,11 +15,11 @@ angular.module('copayApp.controllers').controller('amountController', function($
   $scope.toName = $stateParams.toName;
   $scope.toEmail = $stateParams.toEmail;
 
-  $scope.$on('$ionicView.beforeLeave', function() {
+  $scope.$on('$ionicView.leave', function() {
     angular.element($window).off('keydown');
   });
 
-  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+  $scope.$on("$ionicView.enter", function(event, data) {
 
     if (!$stateParams.toAddress) {
       $log.error('Bad params at amount')
diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js
index ccd1b1e88..6d1a7116f 100644
--- a/src/js/controllers/tabsController.js
+++ b/src/js/controllers/tabsController.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabsController', function($log, $scope, $stateParams, $ionicModal, $timeout, incomingData) {
+angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, incomingData, lodash) {
 
   $scope.onScan = function(data) {
     if (!incomingData.redir(data)) {
@@ -22,6 +22,28 @@ angular.module('copayApp.controllers').controller('tabsController', function($lo
     $timeout(function() {
       $scope.$apply();
     }, 1);
-  }
+  };
+
+  var hideTabsViews = [
+    'tabs.send.amount',
+    'tabs.send.confirm',
+    'tabs.send.addressbook',
+    'tabs.addressbook',
+    'tabs.addressbook.add',
+    'tabs.addressbook.view',
+  ];
+
+  $rootScope.$on('$ionicView.beforeEnter', function() {
+
+    $rootScope.hideTabs = false;
+
+    var currentState = $state.current.name;
+
+    lodash.each(hideTabsViews, function(view) {
+      if (currentState === view) {
+        $rootScope.hideTabs = true;
+      }
+    });
+  });
 
 });
diff --git a/src/js/routes.js b/src/js/routes.js
index dea85a6e8..93e1774f1 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -191,6 +191,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
     .state('tabs', {
         url: '/tabs',
         abstract: true,
+        controller: 'tabsController',
         templateUrl: 'views/tabs.html'
       })
       .state('tabs.home', {
diff --git a/src/sass/views/address-book.scss b/src/sass/views/address-book.scss
index 730a5571a..ec6167165 100644
--- a/src/sass/views/address-book.scss
+++ b/src/sass/views/address-book.scss
@@ -15,8 +15,6 @@
     .item {
       color: #444;
       border-top: none;
-      padding-top: 1.5rem;
-      padding-bottom: 1.5rem;
       &:before {
         display: block;
         position: absolute;

From 3a1129e1f8901410428361f9f1ff81c985e5c2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 26 Sep 2016 11:26:10 -0300
Subject: [PATCH 13/47] add incomplete wallets to receive tab

---
 public/views/includes/wallets.html |  4 --
 public/views/tab-receive.html      | 74 +++++++++++++++++++-----------
 src/js/controllers/tab-receive.js  | 22 +++++++--
 src/sass/views/tab-receive.scss    | 14 ++++++
 4 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/public/views/includes/wallets.html b/public/views/includes/wallets.html
index 1c2a7a569..75f8b9efc 100644
--- a/public/views/includes/wallets.html
+++ b/public/views/includes/wallets.html
@@ -8,10 +8,6 @@
           <span class="item-note m10l" ng-show="wallet.n > 1 && wallet.isComplete()">
             {{wallet.m}}-of-{{wallet.n}}
           </span>
-          <span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>
-            Incomplete
-          </span>
-          <!-- <i ng-show="wallet.needsBackup" class="icon ion-android-warning assertive"></i> -->
         </div>
       </div>
     </ion-slide-page>
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index 7a1283d4b..c445a2624 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -8,42 +8,62 @@
     </ion-nav-buttons>
   </ion-nav-bar>
   <ion-content>
-    <article id="address">
-      <div class="row">
-        <div class="m15t text-center col center-block" copy-to-clipboard="addr">
-          <qrcode ng-if="addr" size="220" data="bitcoin:{{addr}}"></qrcode>
-          <div ng-if="!addr" style="height:220px; width:220px; margin:auto; background: white; padding-top: 20%;">
-            ...
+    <div id="address">
+      <article class="text-center" ng-if="!wallet.isComplete()">
+        <div class="incomplete">
+          <div class="title">
+            <span translate>Incomplete wallet</span>
           </div>
-          <div ng-if="wallet.needsBackup" class="assertive m10t" translate>
-            Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup.
+          <div class="subtitle">
+            <span translate>All signing devices must be added to this multisig wallet before bitcoin addresses can be created.</span>
+          </div>
+          <div>
+            <button class="button button-block button-positive" ng-click="goCopayers()" translate>Open wallet</button>
           </div>
         </div>
-      </div>
-      <div class="row">
-        <div class="col" ng-show="isCordova && addr">
-          <div class="item item-icon-left" ng-click="shareAddress(addr)">
-            <i class="icon ion-ios-upload-outline"></i>
-            <span translate>Share</span>
+        <div class="row border-top">
+          <div class="col col-90 center-block bit-address text-center">
+            <div class="item item-icon-left">
+              <i class="icon ion-social-bitcoin-outline"></i>
+              <span class="bit-address-gen-address" ng-if="!generatingAddress" translate>address not yet available</span>
+            </div>
           </div>
         </div>
-        <div class="col" ng-class="{'center-block col-50': !isCordova || !addr}">
-          <div class="item item-icon-left" ng-click="setAddress(true)">
-            <i class="icon ion-ios-loop"></i>
-            <span translate>Next Address</span>
+      </article>
+      <article ng-if="wallet.isComplete()">
+        <div class="row">
+          <div class="m15t text-center col center-block" copy-to-clipboard="addr">
+            <qrcode ng-if="addr" size="220" data="bitcoin:{{addr}}"></qrcode>
+            <div ng-if="!addr" style="height:220px; width:220px; margin:auto; background: white; padding-top: 20%;">
+              ...
+            </div>
           </div>
         </div>
-      </div>
-      <div class="row border-top">
-        <div class="col col-90 center-block bit-address text-center">
-          <div class="item item-icon-left">
-            <i class="icon ion-social-bitcoin-outline"></i>
-            <span ng-if="generatingAddress">...</span>
-            <span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
+        <div class="row">
+          <div class="col" ng-show="isCordova && addr">
+            <div class="item item-icon-left" ng-click="shareAddress(addr)">
+              <i class="icon ion-ios-upload-outline"></i>
+              <span translate>Share</span>
+            </div>
+          </div>
+          <div class="col" ng-class="{'center-block col-50': !isCordova || !addr}">
+            <div class="item item-icon-left" ng-click="setAddress(true)">
+              <i class="icon ion-ios-loop"></i>
+              <span translate>Next Address</span>
+            </div>
           </div>
         </div>
-      </div>
-    </article>
+        <div class="row border-top">
+          <div class="col col-90 center-block bit-address text-center">
+            <div class="item item-icon-left">
+              <i class="icon ion-social-bitcoin-outline"></i>
+              <span ng-if="generatingAddress">...</span>
+              <span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
+            </div>
+          </div>
+        </div>
+      </article>
+    </div>
     <article id="wallets">
       <div class="list card padding text-center" ng-if="!wallets[0]">
         <span translate>No Wallet</span>
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 5849cd77b..5cb57dcb2 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabReceiveController', function($scope, $timeout, $log, $ionicModal, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService) {
+angular.module('copayApp.controllers').controller('tabReceiveController', function($scope, $timeout, $log, $ionicModal, $state, $ionicHistory, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService) {
 
   $scope.isCordova = platformInfo.isCordova;
   $scope.isNW = platformInfo.isNW;
@@ -29,7 +29,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
   };
 
   $scope.setAddress = function(forceNew) {
-    if ($scope.generatingAddress) return;
+    if ($scope.generatingAddress || !$scope.wallet.isComplete()) return;
 
     $scope.addr = null;
     $scope.generatingAddress = true;
@@ -46,9 +46,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     if (!$scope.isCordova) $scope.checkTips();
-    $scope.wallets = profileService.getWallets({
-      onlyComplete: true
-    });
+    $scope.wallets = profileService.getWallets();
     $scope.$on('Wallet/Changed', function(event, wallet) {
       if (!wallet) {
         $log.debug('No wallet provided');
@@ -59,4 +57,18 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
       $scope.setAddress();
     });
   });
+
+  $scope.goCopayers = function() {
+    $ionicHistory.removeBackView();
+    $ionicHistory.nextViewOptions({
+      disableAnimate: true
+    });
+    $state.go('tabs.home');
+    $timeout(function() {
+      $state.transitionTo('tabs.copayers', {
+        walletId: $scope.wallet.credentials.walletId
+      });
+    }, 100);
+  };
+
 });
diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss
index aa66bc642..baa2099d0 100644
--- a/src/sass/views/tab-receive.scss
+++ b/src/sass/views/tab-receive.scss
@@ -9,6 +9,20 @@
   }
   #address {
     background: #fff;
+    .incomplete {
+      padding: 50px;
+      .title {
+        padding: 20px;
+        font-size: 25px;
+        color: #444;
+      }
+      .subtitle {
+        padding: 20px;
+        color: #444;
+      }
+      .button {
+      }
+    }
     .item {
       border: none;
       font-size: .8rem;

From 7969a40645cb6e15bcd8215b8da3796a84064e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 26 Sep 2016 13:05:15 -0300
Subject: [PATCH 14/47] backup needed modal

---
 public/views/includes/backupNeededPopup.html | 27 ++++++++++++++++++++
 public/views/tab-receive.html                |  7 ++++-
 src/js/controllers/backup.js                 | 10 +-------
 src/js/controllers/tab-receive.js            | 24 +++++++++++++++++
 src/js/routes.js                             | 20 +++++++++++++--
 src/sass/views/includes/modals/modals.scss   | 20 +++++++++++++--
 src/sass/views/tab-receive.scss              | 10 ++++++++
 7 files changed, 104 insertions(+), 14 deletions(-)
 create mode 100644 public/views/includes/backupNeededPopup.html

diff --git a/public/views/includes/backupNeededPopup.html b/public/views/includes/backupNeededPopup.html
new file mode 100644
index 000000000..c74742e06
--- /dev/null
+++ b/public/views/includes/backupNeededPopup.html
@@ -0,0 +1,27 @@
+<div id="backup-needed-modal" class="popup-modal">
+  <div class="popup-modal-header popup-modal-header-warning">
+    <div class="popup-modal-header-img-warning popup-modal-header-img"></div>
+  </div>
+  <div class="popup-modal-content popup-modal-content-warning">
+    <div class="text-center">
+      <h5 translate>Backup Needed</h5>
+      <p translate>Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup.</p>
+      <div class="row">
+        <div class="col">
+          <button
+            class="button button-clear expand"
+            ng-click="closeBackupNeededModal()"
+            translate>Not now
+          </button>
+        </div>
+        <div class="col">
+          <button
+            class="button button-clear expand"
+            ng-click="goToBackupFlow()"
+            translate>Backup wallet now
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index c445a2624..3ab6158aa 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -31,7 +31,12 @@
         </div>
       </article>
       <article ng-if="wallet.isComplete()">
-        <div class="row">
+        <div class="row backup" ng-click="openBackupNeededPopup()">
+          <div class="m15t text-center col center-block">
+            <i class="icon ion-alert"></i><span translate>Wallet not backed up</span><i class="icon ion-ios-arrow-thin-right"></i>
+          </div>
+        </div>
+        <div class="row qr">
           <div class="m15t text-center col center-block" copy-to-clipboard="addr">
             <qrcode ng-if="addr" size="220" data="bitcoin:{{addr}}"></qrcode>
             <div ng-if="!addr" style="height:220px; width:220px; margin:auto; background: white; padding-top: 20%;">
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index ea28fdaad..62170a6c7 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -49,15 +49,6 @@ angular.module('copayApp.controllers').controller('backupController',
       }, 10);
     };
 
-    $scope.goBack = function() {
-      if ($scope.step == 1) {
-        if ($stateParams.fromOnboarding) $state.go('onboarding.backupRequest');
-        else $state.go('wallet.preferences');
-      } else {
-        $scope.goToStep($scope.step - 1);
-      }
-    };
-
     var backupError = function(err) {
       ongoingProcess.set('validatingWords', false);
       $log.debug('Failed to verify backup: ', err);
@@ -198,6 +189,7 @@ angular.module('copayApp.controllers').controller('backupController',
         walletId: $stateParams.walletId,
         fromOnboarding: true
       });
+      else if ($stateParams.fromReceive) $state.go('tabs.receive');
       else $state.go('tabs.preferences', {
         walletId: $stateParams.walletId
       });
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 5cb57dcb2..b17468ae5 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -71,4 +71,28 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     }, 100);
   };
 
+  $scope.openBackupNeededPopup = function() {
+    $ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', {
+      scope: $scope,
+      backdropClickToClose: false,
+      hardwareBackButtonClose: false
+    }).then(function(modal) {
+      $scope.BackupNeededPopup = modal;
+      $scope.BackupNeededPopup.show();
+    });
+  };
+
+  $scope.closeBackupNeededModal = function() {
+    $scope.BackupNeededPopup.hide();
+    $scope.BackupNeededPopup.remove();
+  };
+
+  $scope.goToBackupFlow = function() {
+    $scope.BackupNeededPopup.hide();
+    $scope.BackupNeededPopup.remove();
+    $state.go('tabs.receive.backup', {
+      fromReceive: true,
+      walletId: $scope.wallet.credentials.walletId
+    });
+  };
 });
diff --git a/src/js/routes.js b/src/js/routes.js
index dea85a6e8..6dde26bca 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -236,7 +236,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      *
      */
 
-      .state('tabs.send.amount', {
+    .state('tabs.send.amount', {
         url: '/amount/:isWallet/:toAddress/:toName/:toEmail',
         views: {
           'tab-send@tabs': {
@@ -551,7 +551,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
 
     /*
      *
-     *TO DO
+     * Copayers
      *
      */
 
@@ -565,6 +565,22 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       }
     })
 
+    /*
+     *
+     * Back flow from receive
+     *
+     */
+
+    .state('tabs.receive.backup', {
+      url: '/backup/:fromReceive/:walletId',
+      views: {
+        'tab-receive@tabs': {
+          controller: 'backupController',
+          templateUrl: 'views/backup.html'
+        }
+      }
+    })
+
     /*
      *
      * Onboarding
diff --git a/src/sass/views/includes/modals/modals.scss b/src/sass/views/includes/modals/modals.scss
index 63b8af5fe..7c3aca25f 100644
--- a/src/sass/views/includes/modals/modals.scss
+++ b/src/sass/views/includes/modals/modals.scss
@@ -9,7 +9,12 @@
   transform: translate(-50%, -50%);
   border-radius: .25rem;
   &-header {
-    background: rgb(1, 209, 162);
+    &-success {
+      background: rgb(1, 209, 162);
+    }
+    &-warning {
+      background: orange;
+    }
     padding: 1rem;
     border-radius: .25rem .25rem 0 0;
     min-height: 120px;
@@ -26,6 +31,12 @@
       background-size: contain;
       margin-top: .3rem;
     }
+    &-img-warning {
+      background-image: url('../img/onboarding-success.svg');
+      height: 6rem;
+      background-size: contain;
+      margin-top: .3rem;
+    }
   }
   &-content {
     padding: .5rem .8rem;
@@ -42,11 +53,16 @@
       font-weight: 200;
     }
   }
-  &-content-success{
+  &-content-success {
     button{
       color:rgb(23, 174, 140) !important;
     }
   }
+  &-content-warning {
+    button{
+      color: orange !important;
+    }
+  }
 }
 
 .modal-backdrop.active {
diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss
index baa2099d0..e24ba8739 100644
--- a/src/sass/views/tab-receive.scss
+++ b/src/sass/views/tab-receive.scss
@@ -43,6 +43,16 @@
       }
       &-gen-address {}
     }
+    .qr {
+      padding: 30px;
+    }
+    .backup {
+      background-color: orange;
+      color: #fff;
+      i {
+        padding: 10px;
+      }
+    }
   }
   #wallets {
     position: relative;

From 82211a5812a179cf4a0777f0c078773b1abfeadb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 26 Sep 2016 14:16:17 -0300
Subject: [PATCH 15/47] fixes

---
 src/js/controllers/tab-receive.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index b17468ae5..aec3c8b20 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -34,14 +34,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     $scope.addr = null;
     $scope.generatingAddress = true;
 
-    $timeout(function() {
-      walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
-        $scope.generatingAddress = false;
-        if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
-        $scope.addr = addr;
-        $scope.$apply();
-      });
-    }, 1);
+    walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
+      $scope.generatingAddress = false;
+      if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
+      $scope.addr = addr;
+    });
   };
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
@@ -52,9 +49,12 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
         $log.debug('No wallet provided');
         return;
       }
-      $scope.wallet = wallet;
-      $log.debug('Wallet changed: ' + wallet.name);
-      $scope.setAddress();
+      $timeout(function() {
+        $scope.wallet = wallet;
+        $log.debug('Wallet changed: ' + wallet.name);
+        $scope.setAddress();
+        $scope.$apply();
+      });
     });
   });
 

From 33c7e2b297a843f7ff0092264530bbfb4c17b47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 26 Sep 2016 16:11:45 -0300
Subject: [PATCH 16/47] add backup warning view to backup flow

---
 ...-backup-warning.svg => backup-warning.svg} |  0
 ...ng-no-screenshot.svg => no-screenshot.svg} |  0
 public/views/backup.html                      | 12 +++---
 .../views/{onboarding => }/backupWarning.html |  6 +--
 public/views/includes/backupNeededPopup.html  |  4 +-
 public/views/onboarding/backupRequest.html    |  2 +-
 public/views/preferences.html                 |  2 +-
 public/views/tab-receive.html                 |  2 +-
 src/js/controllers/backup.js                  | 25 ++++--------
 .../controllers/onboarding/backupWarning.js   | 33 ++++++++++------
 src/js/controllers/tab-receive.js             | 27 +++++++------
 src/js/routes.js                              | 38 +++++++++++++------
 src/js/services/profileService.js             | 20 ++++++++++
 src/js/services/storageService.js             |  8 ++++
 ...ackup-warning.scss => backup-warning.scss} |  8 ++--
 .../modals/screenshot-warning-model.scss      |  4 +-
 src/sass/views/onboarding/onboarding.scss     |  4 +-
 17 files changed, 123 insertions(+), 72 deletions(-)
 rename public/img/{onboarding-backup-warning.svg => backup-warning.svg} (100%)
 rename public/img/{onboarding-no-screenshot.svg => no-screenshot.svg} (100%)
 rename public/views/{onboarding => }/backupWarning.html (75%)
 rename src/sass/views/{onboarding/onboard-backup-warning.scss => backup-warning.scss} (89%)

diff --git a/public/img/onboarding-backup-warning.svg b/public/img/backup-warning.svg
similarity index 100%
rename from public/img/onboarding-backup-warning.svg
rename to public/img/backup-warning.svg
diff --git a/public/img/onboarding-no-screenshot.svg b/public/img/no-screenshot.svg
similarity index 100%
rename from public/img/onboarding-no-screenshot.svg
rename to public/img/no-screenshot.svg
diff --git a/public/views/backup.html b/public/views/backup.html
index ab45d0ec0..4453e17d7 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -1,10 +1,10 @@
-<ion-view id="wallet-backup-phrase" title="{{viewTitle}}">
+<ion-view id="wallet-backup-phrase">
   <ion-nav-bar class="bar-royal">
-    <ion-nav-buttons side="primary">
-      <button class="button button-back button-clear" ng-click="backupGoBack()">
-        <i class="icon ion-ios-arrow-thin-left"></i>
-      </button>
-    </ion-nav-buttons>
+    <ion-nav-title>
+      {{viewTitle}}
+    </ion-nav-title>
+    <ion-nav-back-button>
+    </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
     <div class="ng-hide" ng-show="deleted">
diff --git a/public/views/onboarding/backupWarning.html b/public/views/backupWarning.html
similarity index 75%
rename from public/views/onboarding/backupWarning.html
rename to public/views/backupWarning.html
index d588060bc..55464baac 100644
--- a/public/views/onboarding/backupWarning.html
+++ b/public/views/backupWarning.html
@@ -1,7 +1,7 @@
-<ion-view id="onboarding-backup-warning" class="onboarding" ng-controller="backupWarningController">
+<ion-view id="backup-warning" class="onboarding" ng-controller="backupWarningController">
   <ion-nav-bar  class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button button-back button-clear" href ui-sref="onboarding.backupRequest({walletId: walletId})">
+      <button class="button button-back button-clear" ng-click="goBack()">
         <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
@@ -18,7 +18,7 @@
       </p>
     </div>
     <div class="row">
-      <img src="img/onboarding-backup-warning.svg" class="col col-60 warning-image">
+      <img src="img/backup-warning.svg" class="col col-60 warning-image">
     </div>
     <div class="row text-center">
       <p class="col col-60">
diff --git a/public/views/includes/backupNeededPopup.html b/public/views/includes/backupNeededPopup.html
index c74742e06..dc9747b55 100644
--- a/public/views/includes/backupNeededPopup.html
+++ b/public/views/includes/backupNeededPopup.html
@@ -10,14 +10,14 @@
         <div class="col">
           <button
             class="button button-clear expand"
-            ng-click="closeBackupNeededModal()"
+            ng-click="close()"
             translate>Not now
           </button>
         </div>
         <div class="col">
           <button
             class="button button-clear expand"
-            ng-click="goToBackupFlow()"
+            ng-click="doBackup()"
             translate>Backup wallet now
           </button>
         </div>
diff --git a/public/views/onboarding/backupRequest.html b/public/views/onboarding/backupRequest.html
index df33a168e..a76125f41 100644
--- a/public/views/onboarding/backupRequest.html
+++ b/public/views/onboarding/backupRequest.html
@@ -19,7 +19,7 @@
     <div class="cta-buttons">
       <div class="row">
         <button class="button button-block button-positive col-75 col" href
-                ui-sref="onboarding.backupWarning({walletId: walletId})" translate>Backup wallet</button>
+                ui-sref="onboarding.backupWarning({from: 'onboarding.backupRequest', walletId: walletId})" translate>Backup wallet</button>
       </div>
       <div class="row">
         <button class="button button-block button-transparent col-75 col" ng-click="openPopup()" translate>I'll backup my wallet later</button>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index c147ef54b..41319fa36 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -40,7 +40,7 @@
       <div class="item item-divider" translate>
         Security
       </div>
-      <a class="item item-icon-right" ui-sref="tabs.preferences.backup" ng-hide="wallet.isPrivKeyExternal()">
+      <a class="item item-icon-right" ui-sref="tabs.preferences.backupWarning({from: 'tabs.preferences'})" ng-hide="wallet.isPrivKeyExternal()">
         <span translate>Backup</span>
         <i class="icon nav-item-arrow-right"></i>
       </a>
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index 3ab6158aa..d8f43983b 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -31,7 +31,7 @@
         </div>
       </article>
       <article ng-if="wallet.isComplete()">
-        <div class="row backup" ng-click="openBackupNeededPopup()">
+        <div class="row backup" ng-show="!wallet.showBackupNeededModal" ng-click="goToBackupFlow()">
           <div class="m15t text-center col center-block">
             <i class="icon ion-alert"></i><span translate>Wallet not backed up</span><i class="icon ion-ios-arrow-thin-right"></i>
           </div>
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index 62170a6c7..01eeae6ec 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -84,13 +84,15 @@ angular.module('copayApp.controllers').controller('backupController',
 
     $scope.closeBackupResultModal = function() {
       $scope.confirmBackupModal.hide();
+      $scope.confirmBackupModal.remove();
 
-      if ($stateParams.fromOnboarding) {
-        $state.go('onboarding.disclaimer');
-      } else {
-        $ionicHistory.removeBackView();
-        $state.go('tabs.home');
-      }
+      profileService.isDisclaimerAccepted(function(val) {
+        if (val) {
+          $ionicHistory.removeBackView();
+          $state.go('tabs.home');
+        }
+        else $state.go('onboarding.disclaimer');
+      });
     };
 
     var confirm = function(cb) {
@@ -184,17 +186,6 @@ angular.module('copayApp.controllers').controller('backupController',
         $scope.selectComplete = false;
     };
 
-    $scope.backupGoBack = function() {
-      if ($stateParams.fromOnboarding) $state.go('onboarding.backupWarning', {
-        walletId: $stateParams.walletId,
-        fromOnboarding: true
-      });
-      else if ($stateParams.fromReceive) $state.go('tabs.receive');
-      else $state.go('tabs.preferences', {
-        walletId: $stateParams.walletId
-      });
-    };
-
     $scope.$on("$ionicView.enter", function(event, data) {
       $scope.deleted = isDeletedSeed();
       if ($scope.deleted) {
diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js
index 6b83ee964..260c5eebd 100644
--- a/src/js/controllers/onboarding/backupWarning.js
+++ b/src/js/controllers/onboarding/backupWarning.js
@@ -5,20 +5,31 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun
   $scope.walletId = $stateParams.walletId;
   $scope.openPopup = function() {
     $ionicModal.fromTemplateUrl('views/includes/screenshotWarningModal.html', {
-        scope: $scope,
-        backdropClickToClose: false,
-        hardwareBackButtonClose: false
-      }).then(function(modal) {
-        $scope.warningModal = modal;
-        $scope.warningModal.show();
-      });
+      scope: $scope,
+      backdropClickToClose: false,
+      hardwareBackButtonClose: false
+    }).then(function(modal) {
+      $scope.warningModal = modal;
+      $scope.warningModal.show();
+    });
 
     $scope.close = function() {
       $scope.warningModal.hide();
-      $state.go('onboarding.backup', {
-        walletId: $stateParams.walletId,
-        fromOnboarding: true
-      });
+      if ($stateParams.from == 'onboarding.backupRequest')
+        $state.go('onboarding.backup', {
+          walletId: $stateParams.walletId
+        });
+      else
+        $state.go($stateParams.from + '.backup', {
+          walletId: $stateParams.walletId
+        });
     };
   }
+
+  $scope.goBack = function() {
+    $state.go($stateParams.from, {
+      walletId: $stateParams.walletId
+    });
+  };
+
 });
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index aec3c8b20..73d670693 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -53,6 +53,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
         $scope.wallet = wallet;
         $log.debug('Wallet changed: ' + wallet.name);
         $scope.setAddress();
+        if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal();
         $scope.$apply();
       });
     });
@@ -71,28 +72,32 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     }, 100);
   };
 
-  $scope.openBackupNeededPopup = function() {
+  $scope.openBackupNeededModal = function() {
     $ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', {
       scope: $scope,
       backdropClickToClose: false,
       hardwareBackButtonClose: false
     }).then(function(modal) {
-      $scope.BackupNeededPopup = modal;
-      $scope.BackupNeededPopup.show();
+      $scope.BackupNeededModal = modal;
+      $scope.BackupNeededModal.show();
     });
   };
 
-  $scope.closeBackupNeededModal = function() {
-    $scope.BackupNeededPopup.hide();
-    $scope.BackupNeededPopup.remove();
+  $scope.close = function() {
+    $scope.BackupNeededModal.hide();
+    $scope.BackupNeededModal.remove();
+    profileService.setBackupNeededModalFlag($scope.wallet.credentials.walletId);
+  };
+
+  $scope.doBackup = function() {
+    $scope.close();
+    $scope.goToBackupFlow();
   };
 
   $scope.goToBackupFlow = function() {
-    $scope.BackupNeededPopup.hide();
-    $scope.BackupNeededPopup.remove();
-    $state.go('tabs.receive.backup', {
-      fromReceive: true,
+    $state.go('tabs.receive.backupWarning', {
+      from: 'tabs.receive',
       walletId: $scope.wallet.credentials.walletId
     });
-  };
+  }
 });
diff --git a/src/js/routes.js b/src/js/routes.js
index 6dde26bca..9b37ce0a9 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -432,6 +432,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           }
         }
       })
+      .state('tabs.preferences.backupWarning', {
+        url: '/backupWarning/:from',
+        views: {
+          'tab-settings@tabs': {
+            templateUrl: 'views/backupWarning.html'
+          }
+        }
+      })
       .state('tabs.preferences.backup', {
         url: '/backup',
         views: {
@@ -571,15 +579,23 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      *
      */
 
-    .state('tabs.receive.backup', {
-      url: '/backup/:fromReceive/:walletId',
-      views: {
-        'tab-receive@tabs': {
-          controller: 'backupController',
-          templateUrl: 'views/backup.html'
+    .state('tabs.receive.backupWarning', {
+        url: '/backupWarning/:from/:walletId',
+        views: {
+          'tab-receive@tabs': {
+            templateUrl: 'views/backupWarning.html'
+          }
         }
-      }
-    })
+      })
+      .state('tabs.receive.backup', {
+        url: '/backup/:walletId',
+        views: {
+          'tab-receive@tabs': {
+            controller: 'backupController',
+            templateUrl: 'views/backup.html'
+          }
+        }
+      })
 
     /*
      *
@@ -633,15 +649,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('onboarding.backupWarning', {
-        url: '/backupWarning/:walletId',
+        url: '/backupWarning/:from/:walletId',
         views: {
           'onboarding': {
-            templateUrl: 'views/onboarding/backupWarning.html'
+            templateUrl: 'views/backupWarning.html'
           }
         }
       })
       .state('onboarding.backup', {
-        url: '/backup/:walletId/:fromOnboarding',
+        url: '/backup/:walletId',
         views: {
           'onboarding': {
             templateUrl: 'views/backup.html',
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index c6bc0d3d0..bb1e15084 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -38,6 +38,22 @@ angular.module('copayApp.services')
       });
     }
 
+    root.setBackupNeededModalFlag = function(walletId) {
+      storageService.setBackupNeededModalFlag(walletId, true, function(err) {
+        if (err) $log.error(err);
+        $log.debug('Backup warning modal flag stored');
+        root.wallet[walletId].showBackupNeededModal = false;
+      });
+    };
+
+    function _showBackupNeededModal(wallet, cb) {
+      storageService.getBackupNeededModalFlag(wallet.credentials.walletId, function(err, val) {
+        if (err) $log.error(err);
+        if (val) return cb(false);
+        return cb(true);
+      });
+    };
+
     root.setBackupFlag = function(walletId) {
       storageService.setBackupFlag(walletId, function(err) {
         if (err) $log.error(err);
@@ -101,6 +117,10 @@ angular.module('copayApp.services')
         wallet.balanceHidden = val;
       });
 
+      _showBackupNeededModal(wallet, function(val) {
+        wallet.showBackupNeededModal = val;
+      });
+
       wallet.removeAllListeners();
 
       wallet.on('report', function(n) {
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index 4df36dab1..a1daeb36e 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -365,6 +365,14 @@ angular.module('copayApp.services')
       storage.get('receiveTips', cb);
     };
 
+    root.setBackupNeededModalFlag = function(walletId, val, cb) {
+      storage.set('showBackupNeededModal-' + walletId, val, cb);
+    };
+
+    root.getBackupNeededModalFlag = function(walletId, cb) {
+      storage.get('showBackupNeededModal-' + walletId, cb);
+    };
+
     root.setAmazonGiftCards = function(network, gcs, cb) {
       storage.set('amazonGiftCards-' + network, gcs, cb);
     };
diff --git a/src/sass/views/onboarding/onboard-backup-warning.scss b/src/sass/views/backup-warning.scss
similarity index 89%
rename from src/sass/views/onboarding/onboard-backup-warning.scss
rename to src/sass/views/backup-warning.scss
index af09d351f..ee1017bcc 100644
--- a/src/sass/views/onboarding/onboard-backup-warning.scss
+++ b/src/sass/views/backup-warning.scss
@@ -1,4 +1,4 @@
-#onboarding-backup-warning{
+#backup-warning{
   .warning{
     margin:4rem auto 1rem;
     height: 11rem;
@@ -21,7 +21,7 @@
 }
 
 @media (max-width: 400px){
-  #onboarding-backup-warning{
+  #backup-warning{
     .warning{
       margin: 2rem auto 1rem;
       height: 8rem;
@@ -45,10 +45,10 @@
   }
 }
 @media (max-height: 540px){
-  #onboarding-backup-warning{
+  #backup-warning{
     .cta-buttons{
       float:left;
       position: relative;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/sass/views/includes/modals/screenshot-warning-model.scss b/src/sass/views/includes/modals/screenshot-warning-model.scss
index e979e9ff8..64662f0ef 100644
--- a/src/sass/views/includes/modals/screenshot-warning-model.scss
+++ b/src/sass/views/includes/modals/screenshot-warning-model.scss
@@ -1,7 +1,7 @@
 #screenshot-warning-modal{
   .popup-modal-header{
     &-img{
-      background-image: url('../img/onboarding-no-screenshot.svg');
+      background-image: url('../img/no-screenshot.svg');
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss
index c44f79878..7dad89ace 100644
--- a/src/sass/views/onboarding/onboarding.scss
+++ b/src/sass/views/onboarding/onboarding.scss
@@ -101,7 +101,7 @@
         max-width: 600px !important;
       }
       button{
-        max-width: 400px !important; 
+        max-width: 400px !important;
       }
     }
   }
@@ -112,6 +112,6 @@
 @import "onboard-tour";
 @import "onboard-collect-email";
 @import "onboard-backup-request";
-@import "onboard-backup-warning";
+@import "../backup-warning";
 @import "onboard-disclaimer";
 @import "onboard-push-notifications";

From 3c5022cb6a6af698747492f16dcc5d073fc422d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 26 Sep 2016 16:19:26 -0300
Subject: [PATCH 17/47] fix

---
 public/views/includes/screenshotWarningModal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/includes/screenshotWarningModal.html b/public/views/includes/screenshotWarningModal.html
index 0994ea628..bd7f2abba 100644
--- a/public/views/includes/screenshotWarningModal.html
+++ b/public/views/includes/screenshotWarningModal.html
@@ -1,5 +1,5 @@
 <div id="screenshot-warning-modal" class="popup-modal">
-  <div class="popup-modal-header">
+  <div class="popup-modal-header-success">
     <div class="popup-modal-header-img"></div>
   </div>
   <div class="popup-modal-content" ng-class="{'popup-modal-content-success': !backupError, 'popup-modal-content-fail': backupError}">

From f3117cec178b828cc5479b7d2e5ee4a29f822905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 27 Sep 2016 10:51:30 -0300
Subject: [PATCH 18/47] fixes - hide tabs in backup flow

---
 public/views/tab-receive.html        |  2 +-
 src/js/controllers/import.js         |  2 +-
 src/js/controllers/tab-receive.js    | 43 +++++++++++++++-------------
 src/js/controllers/tabsController.js |  4 +++
 src/js/services/profileService.js    |  3 +-
 5 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index d8f43983b..29a605958 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -31,7 +31,7 @@
         </div>
       </article>
       <article ng-if="wallet.isComplete()">
-        <div class="row backup" ng-show="!wallet.showBackupNeededModal" ng-click="goToBackupFlow()">
+        <div class="row backup" ng-show="!wallet.showBackupNeededModal && wallet.needsBackup" ng-click="goToBackupFlow()">
           <div class="m15t text-center col center-block">
             <i class="icon ion-alert"></i><span translate>Wallet not backed up</span><i class="icon ion-ios-arrow-thin-right"></i>
           </div>
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 388360787..bdc97e984 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('importController',
-  function($scope, $timeout, $log, $state, $stateParams, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog) {
+  function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog) {
 
     var isChromeApp = platformInfo.isChromeApp;
     var isDevel = platformInfo.isDevel;
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 73d670693..23c157a6e 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -33,12 +33,16 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
 
     $scope.addr = null;
     $scope.generatingAddress = true;
+    $timeout(function() {
+      walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
+        $scope.generatingAddress = false;
+        if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
+        $scope.addr = addr;
+        if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal();
+        $scope.$apply();
+      });
+    }, 100);
 
-    walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
-      $scope.generatingAddress = false;
-      if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
-      $scope.addr = addr;
-    });
   };
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
@@ -49,13 +53,9 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
         $log.debug('No wallet provided');
         return;
       }
-      $timeout(function() {
-        $scope.wallet = wallet;
-        $log.debug('Wallet changed: ' + wallet.name);
-        $scope.setAddress();
-        if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal();
-        $scope.$apply();
-      });
+      $scope.wallet = wallet;
+      $log.debug('Wallet changed: ' + wallet.name);
+      $scope.setAddress();
     });
   });
 
@@ -73,14 +73,17 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
   };
 
   $scope.openBackupNeededModal = function() {
-    $ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', {
-      scope: $scope,
-      backdropClickToClose: false,
-      hardwareBackButtonClose: false
-    }).then(function(modal) {
-      $scope.BackupNeededModal = modal;
-      $scope.BackupNeededModal.show();
-    });
+    $timeout(function() {
+      $ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', {
+        scope: $scope,
+        backdropClickToClose: false,
+        hardwareBackButtonClose: false
+      }).then(function(modal) {
+        $scope.BackupNeededModal = modal;
+        $scope.BackupNeededModal.show();
+      });
+    }, 100);
+
   };
 
   $scope.close = function() {
diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js
index 6d1a7116f..434a1e80c 100644
--- a/src/js/controllers/tabsController.js
+++ b/src/js/controllers/tabsController.js
@@ -31,6 +31,10 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro
     'tabs.addressbook',
     'tabs.addressbook.add',
     'tabs.addressbook.view',
+    'tabs.preferences.backupWarning',
+    'tabs.preferences.backup',
+    'tabs.receive.backupWarning',
+    'tabs.receive.backup',
   ];
 
   $rootScope.$on('$ionicView.beforeEnter', function() {
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index bb1e15084..5ecfe26cc 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -118,7 +118,8 @@ angular.module('copayApp.services')
       });
 
       _showBackupNeededModal(wallet, function(val) {
-        wallet.showBackupNeededModal = val;
+        if (wallet.needsBackup) wallet.showBackupNeededModal = val;
+        else wallet.showBackupNeededModal = false;
       });
 
       wallet.removeAllListeners();

From c49edca046f57440c4c4e2530ee30fcd8766b7fa Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Tue, 27 Sep 2016 09:57:27 -0400
Subject: [PATCH 19/47] fix on boarding request and collect email minor styles
 for iPad

---
 .../views/onboarding/onboard-backup-request.scss    |  9 +++++++--
 .../views/onboarding/onboard-collect-email.scss     | 13 +++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/sass/views/onboarding/onboard-backup-request.scss b/src/sass/views/onboarding/onboard-backup-request.scss
index 693ebe0bc..22b0b6a47 100644
--- a/src/sass/views/onboarding/onboard-backup-request.scss
+++ b/src/sass/views/onboarding/onboard-backup-request.scss
@@ -15,9 +15,14 @@
     position: absolute;
     bottom: 0;
   }
+  @media (min-width: 400px){
+    .warning{
+      height:16rem;
+    }
+  }
 }
 
-@media (max-width: 400px){
+@media (max-width: 399px){
   #onboarding-backup-request{
     .warning{
       margin: 2rem auto 1rem;
@@ -52,7 +57,7 @@
 @media (min-height: 980px){
   #onboarding-backup-request{
     #arrow-down{
-      margin-top: 15rem;
+      margin-top: 7rem;
     }
   }
 }
\ No newline at end of file
diff --git a/src/sass/views/onboarding/onboard-collect-email.scss b/src/sass/views/onboarding/onboard-collect-email.scss
index ebe7ad9b4..28eb7fe47 100644
--- a/src/sass/views/onboarding/onboard-collect-email.scss
+++ b/src/sass/views/onboarding/onboard-collect-email.scss
@@ -80,6 +80,19 @@
             font-size:.8rem;
           }
         }
+        @media (min-width: 400px){
+          &{
+            max-width: 400px;
+            label{
+              .checkbox{
+                left:1rem;
+              }
+              .item-content{
+                font-size: 1rem;
+              }
+            }
+          }
+        }
       }
     }
   }

From 64b8f10f888cf37b5dd489717c7d136b71e349a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 27 Sep 2016 10:59:08 -0300
Subject: [PATCH 20/47] remove timeout

---
 src/js/controllers/tab-receive.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 23c157a6e..9b7b2c672 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -73,17 +73,14 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
   };
 
   $scope.openBackupNeededModal = function() {
-    $timeout(function() {
-      $ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', {
-        scope: $scope,
-        backdropClickToClose: false,
-        hardwareBackButtonClose: false
-      }).then(function(modal) {
-        $scope.BackupNeededModal = modal;
-        $scope.BackupNeededModal.show();
-      });
-    }, 100);
-
+    $ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', {
+      scope: $scope,
+      backdropClickToClose: false,
+      hardwareBackButtonClose: false
+    }).then(function(modal) {
+      $scope.BackupNeededModal = modal;
+      $scope.BackupNeededModal.show();
+    });
   };
 
   $scope.close = function() {

From db8d587101aacce5f264fb76899564c392bc10f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 27 Sep 2016 12:26:58 -0300
Subject: [PATCH 21/47] Send view contents

---
 public/views/tab-send.html        | 44 ++++++++++++++++---------------
 src/js/controllers/tab-send.js    | 19 ++++++++++---
 src/js/services/profileService.js |  2 +-
 src/sass/views/tab-send.scss      |  7 +++++
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/public/views/tab-send.html b/public/views/tab-send.html
index d23a0731f..3ab5f5f6a 100644
--- a/public/views/tab-send.html
+++ b/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>
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index 18cafd1d1..45c56dd9b 100644
--- a/src/js/controllers/tab-send.js
+++ b/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)) {
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index bb1e15084..d24364bad 100644
--- a/src/js/services/profileService.js
+++ b/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;
diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss
index bc8664ec0..bd0f19a99 100644
--- a/src/sass/views/tab-send.scss
+++ b/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;
+  }
 }

From ed111f34fcd8080ead03d06ccacd9cd343ff6456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 27 Sep 2016 12:46:07 -0300
Subject: [PATCH 22/47] missing ionichistory

---
 src/js/controllers/confirm.js | 2 +-
 src/js/controllers/import.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 4f0a595bd..ab5440289 100644
--- a/src/js/controllers/confirm.js
+++ b/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;
 
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 388360787..bdc97e984 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('importController',
-  function($scope, $timeout, $log, $state, $stateParams, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog) {
+  function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog) {
 
     var isChromeApp = platformInfo.isChromeApp;
     var isDevel = platformInfo.isDevel;

From 484d37d15e6464f3fadbfe2e1f573cf421be1e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 27 Sep 2016 12:50:10 -0300
Subject: [PATCH 23/47] small fixes

---
 public/views/modals/txp-details.html  | 2 +-
 src/js/controllers/modals/txStatus.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 1227ca724..61bf8443b 100644
--- a/public/views/modals/txp-details.html
+++ b/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>
diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js
index d8383c5eb..c78749f1d 100644
--- a/src/js/controllers/modals/txStatus.js
+++ b/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();

From 4e1da5da0fa1b379374008b71d6ca84ec2d8aca0 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 27 Sep 2016 12:05:22 -0300
Subject: [PATCH 24/47] Ref txp modals

---
 public/views/modals/txp-details.html     | 106 ++++++++++++-----------
 src/sass/main.scss                       |   4 +
 src/sass/views/includes/txp-details.scss |   2 +-
 3 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 61bf8443b..8047c62b6 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -22,32 +22,30 @@
           <div class="amount">{{tx.amountStr}}</div>
           <div class="alternative" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
         </div>
-      </div>
 
-      <div class="row" ng-if="tx.removed">
-        <div class="column m20t text-center text-warning size-12" translate>
+        <div class="text-center m10t assertive" ng-if="tx.removed" translate>
           The payment was removed by creator
         </div>
+
+        <div class="text-center m10t" ng-show="tx.status != 'pending'">
+          <div ng-show="tx.status == 'accepted' && !tx.isGlidera">
+            <div class="m10b positive" translate>Payment accepted, but not yet broadcasted</div>
+
+            <button class="button button-positive button-block" ng-click="broadcast(tx)" ng-disabled="loading">
+              <i class="icon ion-ios-cloud-upload-outline"></i>
+              <span translate>Broadcast Payment</span>
+            </button>
+          </div>
+          <div ng-show="tx.status == 'accepted' && tx.isGlidera" >
+            <div class="m10h" translate>Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.</div>
+          </div>
+          <div class="balanced" ng-show="tx.status == 'broadcasted'" translate>Payment Sent</div>
+          <div class="assertive" ng-show="tx.status=='rejected'" translate>Payment Rejected</div>
+        </div>
       </div>
 
-      <div ng-show="tx.status != 'pending'">
-        <div ng-show="tx.status=='accepted' && !tx.isGlidera">
-          <div class="m10b" translate>Payment accepted, but not yet broadcasted</div>
-
-          <button class="button button-balanced button-block" ng-style="{'background-color':color}" ng-click="broadcast(tx)" ng-disabled="loading">
-            <i class="fi-upload-cloud"></i>
-            <span translate>Broadcast Payment</span>
-          </button>
-        </div>
-        <div ng-show="tx.status=='accepted' && tx.isGlidera" >
-          <div class="m10h" translate>Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.</div>
-        </div>
-        <div class="balanced" ng-show="tx.status == 'broadcasted'" translate>Payment Sent</div>
-        <div class="assertive" ng-show="tx.status=='rejected'" translate>Payment Rejected</div>
-      </div>
-
-      <div class="item" ng-show="!currentSpendUnconfirmed && tx.hasUnconfirmedInputs">
-        <span class="text-warning" translate>Warning: this transaction has unconfirmed inputs</span>
+      <div class="item assertive text-center" ng-show="!currentSpendUnconfirmed && tx.hasUnconfirmedInputs" translate>
+        Warning: this transaction has unconfirmed inputs
       </div>
 
       <div class="info">
@@ -73,61 +71,61 @@
         </div>
 
         <div class="item">
-          <span translate>From</span>
-          <i class="icon big-icon-svg">
-            <img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
-          </i>
-          <span>
-            {{wallet.name}}
+          {{'From'|translate}}
+          <span class="item-note">
+            <i class="icon big-icon-svg right">
+              <img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
+            </i>
+            <div class="m10t m55r">{{wallet.name}}</div>
           </span>
         </div>
         <div class="item">
-          <span translate>Created by</span>
-          <span>
+          {{'Created by'|translate}}
+          <span class="item-note">
             {{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
           </span>
         </div>
         <div class="item" ng-show="tx.message">
-          <span translate>Memo</span>
-          <span>
+          {{'Memo'|translate}}
+          <span class="item-note">
             {{tx.message}}
           </span>
         </div>
         <div class="item">
-          <span translate>Fee</span>
-          <span>
+          {{'Fee'|translate}}
+          <span class="item-note">
             {{tx.feeStr}}
           </span>
         </div>
 
         <div ng-if="tx.paypro">
           <div class="item item-divider" translate>Payment details</div>
-          <li class="item">
-            <span class="text-gray" translate>To</span>
-            <span class="right">
+          <div class="item">
+            {{'To'|translate}}
+            <span class="item-note">
               <span>
                 <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.paypro.domain}}</span>
                 <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.paypro.domain}}</span>
               </span>
               <contact address="{{tx.toAddress}}" ng-hide="tx.merchant"></contact>
             </span>
-          </li>
-          <li class="item" ng-if="paymentExpired">
-            <span class="text-gray" translate>Expired</span>
-            <span class="right text-alert">
+          </div>
+          <div class="item" ng-if="paymentExpired">
+            {{'Expired'|translate}}
+            <span class="item-note">
               <time>{{tx.paypro.expires * 1000 | amTimeAgo }}</time>
             </span>
-          </li>
-          <li class="item" ng-if="!paymentExpired">
-            <span class="text-gray" translate>Expires</span>
-            <span class="right">
+          </div>
+          <div class="item" ng-if="!paymentExpired">
+            {{'Expires'|translate}}
+            <span class="item-note">
               <time>{{expires}}</time>
             </span>
-          </li>
-          <li class="item">
-            <span class="text-gray" translate>Merchant Message</span>
-            <span class="db">{{tx.paypro.pr.pd.memo}}</span>
-          </li>
+          </div>
+          <div class="item">
+            {{'Merchant Message'|translate}}
+            <span class="item-note">{{tx.paypro.pr.pd.memo}}</span>
+          </div>
         </div>
         <div ng-if="actionList[0]">
           <div class="item item-divider" translate>Timeline</div>
@@ -151,16 +149,20 @@
         </div>
       </div>
     </div>
-    <div class="m20t" ng-if="tx.canBeRemoved || (tx.status == 'accepted' && !tx.broadcastedOn)">
+    <button class="button button-block button-positive"
+            ng-click="sign()"
+            ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && !isCordova" translate>
+      Click to accept
+    </button>
+    <div class="m30t text-center" ng-if="tx.canBeRemoved || (tx.status == 'accepted' && !tx.broadcastedOn)">
       <div class="size-12 padding" ng-show="!tx.isGlidera && isShared" translate>
         * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
       </div>
-      <button class="button button-assertive button-block" ng-click="remove()" ng-disabled="loading">
+      <button class="button button-assertive button-clear" ng-click="remove()" ng-disabled="loading">
         <i class="fi-trash size-14 m5r"></i>
         <span translate>Delete Payment Proposal</span>
       </button>
     </div>
-    <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>
diff --git a/src/sass/main.scss b/src/sass/main.scss
index 4974b6297..916c8f500 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -594,6 +594,10 @@ ul.wallet-selection.wallets {
   margin-right: 40px;
 }
 
+.m55r {
+  margin-right: 55px;
+}
+
 .m25r {
   margin-right: 25px;
 }
diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss
index 363466c94..28c1d977e 100644
--- a/src/sass/views/includes/txp-details.scss
+++ b/src/sass/views/includes/txp-details.scss
@@ -3,7 +3,7 @@
     bottom: 100px;
   }
   .head {
-    padding-bottom: 55px;
+    padding-bottom: 30px;
     .sending-label{
       line-height: 70px;
       font-size: 25px;

From 2efe47c016141cc7f8640f0ea22517e3c8a0291a Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 27 Sep 2016 12:57:46 -0300
Subject: [PATCH 25/47] Fix txp modals

---
 public/views/modals/tx-details.html     | 75 +++++++++++++------------
 public/views/modals/txp-details.html    |  2 +-
 public/views/tab-home.html              |  2 +-
 src/js/controllers/modals/txDetails.js  |  3 +
 src/js/controllers/modals/txpDetails.js |  8 +--
 5 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 31d46c5f0..b5a118a29 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -3,7 +3,7 @@
     <button class="button button-clear" ng-click="cancel()">
       {{'Close' | translate}}
     </button>
-    <div class="title" translate>
+    <div class="title">
       {{title}}
     </div>
   </ion-header-bar>
@@ -16,25 +16,26 @@
           <img src="img/icon-wallet.svg" ng-style="{'background-color': color}" class="bg"/>
         </i>
 
-        <div class="size-36" copy-to-clipboard="btx.amountStr">
-          <span class="enable_text_select">{{btx.amountStr}}</span>
+        <div class="size-36 m20t" copy-to-clipboard="btx.amountStr">
+          {{btx.amountStr}}
         </div>
 
-        <div class="alternative-amount" ng-click="showRate =! showRate">
-          <span class="label gray radius" ng-show="!showRate && alternativeAmountStr">
+        <div class="m10t" style="height:20px;" ng-click="showRate =! showRate">
+          <span ng-show="!showRate && alternativeAmountStr">
             {{alternativeAmountStr}}
           </span>
-          <span class="size-12" ng-show="showRate && alternativeAmountStr">
+          <span ng-show="showRate && alternativeAmountStr">
             {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
           </span>
         </div>
       </div>
 
       <div ng-show="btx.action == 'sent'">
-        <span translate>Sent from</span> {{wallet.credentials.walletName}}
-        <div class="padding-vertical">
-          <i class="icon ion-ios-arrow-thin-down size-24"></i>
+        <div>
+          <span translate>Sent from</span>
+          <strong ng-style="{'color': color}">{{wallet.credentials.walletName}}</strong>
         </div>
+        <i class="icon ion-ios-arrow-thin-down size-24"></i>
       </div>
 
       <div ng-show="btx.action == 'received'">
@@ -63,27 +64,26 @@
           </span>
           <span ng-if="!btx.merchant">
             <span ng-show="btx.labelTo">{{btx.labelTo}}</span>
-            <contact ng-show="!btx.labelTo" class="enable_text_select" address="{{btx.addressTo}}"></contact>
+            <contact ng-show="!btx.labelTo" address="{{btx.addressTo}}"></contact>
           </span>
         </div>
       </div>
 
-      <div class="item item-icon-left" ng-click="openExternalLink('https://' +
-        (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)">
+      <div class="item item-icon-left"
+        ng-click="openExternalLink('https://' + (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)">
         <i class="icon ion-ios-upload-outline"></i>
         <span class="text-gray" translate>View transaction on the blockchain</span>
       </div>
 
       <div class="item">
-        <div ng-if="btx.action == 'received' || 'moved'">
-          <span translate>Date</span>
+        <div ng-if="btx.action == 'received' || btx.action == 'moved'">
+          {{'Date'|translate}}
           <span class="item-note">
             <time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
           </span>
         </div>
         <div ng-if="btx.action == 'sent'">
-          <div translate>Created by</div>
-          <span>{{btx.creatorName}}</span>
+          {{'Created by'|translate}} <strong>{{btx.creatorName}}</strong>
           <span class="item-note">
             <time>{{ btx.createdOn * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
           </span>
@@ -91,9 +91,8 @@
       </div>
 
       <div class="item" ng-if="btx.action != 'received' && btx.feeLevel" copy-to-clipboard="btx.feeStr">
-        <div translate>Fee</div>
-        <span class="enable_text_select">{{btx.feeLevel}} ({{btx.feeStr}})</span>
-        <span class="right">
+        {{'Fee'|translate}}: {{btx.feeStr}}
+        <span class="item-note">
           <span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
             Unconfirmed
           </span>
@@ -108,20 +107,23 @@
       </div>
 
       <div class="item" ng-if="btx.message && btx.action != 'received'" copy-to-clipboard="btx.message">
-        <div translate>Description</div>
-        <span class="enable_text_select">{{btx.message}}</span>
+        {{'Description'|translate}}
+        <span class="item-note">
+          {{btx.message}}
+        </span>
       </div>
 
       <div ng-if="btx.merchant" class="item" copy-to-clipboard="btx.merchant.pr.pd.memo">
-        <div translate>Merchant message</div>
-        <span class="enable_text_select">
+        {{'Merchant message'|translate}}
+        <span class="item-note">
           {{btx.merchant.pr.pd.memo}}
         </span>
       </div>
 
       <div ng-show="btx.hasMultiplesOutputs" class="item" ng-click="showMultiplesOutputs = !showMultiplesOutputs">
-        <div translate>Recipients</div>
-        <span class="right">{{btx.recipientCount}}
+        {{'Recipients'|translate}}
+        <span class="item-note">
+          {{btx.recipientCount}}
           <i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i>
           <i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i>
         </span>
@@ -138,21 +140,22 @@
         </span>
       </div>
 
-      <div class="item item-icon-right" ng-click="showCommentPopup()">
-        <span class="text-gray" translate ng-if="!btx.note">Add Memo</i></span>
-        <span class="text-gray" translate ng-if="btx.note">Memo</span>
-        <div ng-if="btx.note && btx.note.body">
-          <span class="enable_text_select">{{btx.note.body}}</span><br>
-          <span class="text-italic item-note size-12">
-            <span translate>Edited by</span> <span>{{btx.note.editedByName}}</span>,
-            <time>{{btx.note.editedOn * 1000 | amTimeAgo}}</time></span>
-          </span>
-        </div>
+      <div class="item" ng-click="showCommentPopup()">
+        {{'Memo'|translate}}
+        <span class="item-note" translate ng-if="!btx.note">
+          <i class="icon ion-ios-plus-empty"></i>
+        </span>
+        <span class="item-note" ng-if="btx.note && btx.note.body">
+          {{btx.note.body}}
+          <div>
+            <span translate>Edited by</span> {{btx.note.editedByName}},
+            <time>{{btx.note.editedOn * 1000 | amTimeAgo}}</time>
+          </div>
+        </span>
       </div>
 
       <div ng-if="actionList[0]">
         <div class="item item-divider" translate>Timeline</div>
-
         <div class="item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList track by $index">
           <div class="row">
             <div class="col col-10">
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 8047c62b6..1f89f7b4a 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -53,7 +53,7 @@
           <span translate>To</span>
           <span class="payment-proposal-to" copy-to-clipboard="tx.toAddress">
             <i class="icon ion-social-bitcoin"></i>
-            <contact ng-if="!tx.hasMultiplesOutputs" class="enable_text_select ellipsis" address="{{tx.toAddress}}"></contact>
+            <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{tx.toAddress}}"></contact>
             <span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span>
           </span>
         </div>
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 1f7a26f2b..976b72c3b 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -26,7 +26,7 @@
         Payment Proposals
         <i class="icon nav-item-arrow-right"></i>
 
-        <span class="badge badge-assertive" ng-show="txpsN>3" translate> {{txpsN}}</span>
+        <span class="badge badge-assertive m5t m10r" ng-show="txpsN>3" translate> {{txpsN}}</span>
       </a>
 
       <a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js
index b4e45dae1..f9d7dd4ff 100644
--- a/src/js/controllers/modals/txDetails.js
+++ b/src/js/controllers/modals/txDetails.js
@@ -126,6 +126,9 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
         $scope.rateDate = res.fetchedOn;
         $scope.rateStr = res.rate + ' ' + $scope.alternativeIsoCode;
         $scope.alternativeAmountStr = $filter('formatFiatAmount')(alternativeAmountBtc * res.rate) + ' ' + $scope.alternativeIsoCode;
+        $timeout(function() {
+          $scope.$apply();
+        });
       }
     });
   };
diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js
index 75c4a3120..23ba059b3 100644
--- a/src/js/controllers/modals/txpDetails.js
+++ b/src/js/controllers/modals/txpDetails.js
@@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
   var isGlidera = $scope.isGlidera;
   var GLIDERA_LOCK_TIME = 6 * 60 * 60;
   var now = Math.floor(Date.now() / 1000);
+  var countDown;
 
   $scope.init = function() {
     $scope.loading = null;
@@ -18,6 +19,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
     $scope.data = {};
 
     initActionList();
+    checkPaypro();
   }
 
   function initActionList() {
@@ -53,8 +55,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
     $scope.sign();
   });
 
-  checkPaypro();
-
   // ToDo: use tx.customData instead of tx.message
   if (tx.message === 'Glidera transaction' && isGlidera) {
     tx.isGlidera = true;
@@ -154,7 +154,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
     $scope.paymentExpired = false;
     setExpirationTime();
 
-    self.countDown = $interval(function() {
+    countDown = $interval(function() {
       setExpirationTime();
     }, 1000);
 
@@ -162,7 +162,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
       var now = Math.floor(Date.now() / 1000);
       if (now > expirationTime) {
         $scope.paymentExpired = true;
-        if (self.countDown) $interval.cancel(self.countDown);
+        if (countDown) $interval.cancel(countDown);
         return;
       }
       var totalSecs = expirationTime - now;

From 4649586c4ed5c1784c57d47f6b87753aeeb50ee1 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Tue, 27 Sep 2016 13:40:42 -0400
Subject: [PATCH 26/47] - updated home template with ng-if, instead of ng-show
 - updated border styles

---
 public/views/tab-home.html   | 32 ++++++++++++++++----------------
 src/sass/views/tab-home.scss | 14 ++++++++++++--
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 1f7a26f2b..1cd42cf19 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -4,7 +4,7 @@
   </ion-nav-bar>
 
   <ion-content class="padding">
-    <div class="list card homeTip" ng-show="homeTip">
+    <div class="list card homeTip" ng-if="homeTip">
       <div class="item item-icon-right item-heading">
         <a ng-click="hideHomeTip()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
       </div>
@@ -26,7 +26,7 @@
         Payment Proposals
         <i class="icon nav-item-arrow-right"></i>
 
-        <span class="badge badge-assertive" ng-show="txpsN>3" translate> {{txpsN}}</span>
+        <span class="badge badge-assertive" ng-if="txpsN>3" translate> {{txpsN}}</span>
       </a>
 
       <a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
@@ -61,24 +61,24 @@
         </i>
         <h2>
           {{wallet.name || wallet.id}}
-          <span class="size-12 text-light" ng-show="wallet.n > 1">
+          <span class="size-12 text-light" ng-if="wallet.n > 1">
             {{wallet.m}}-of-{{wallet.n}}
           </span>
         </h2>
 
         <p>
-        <span ng-show="!wallet.isComplete()" class="assertive" translate>
+        <span ng-if="!wallet.isComplete()" class="assertive" translate>
           Incomplete
         </span>
-        <div ng-show="wallet.isComplete()">
-          <span ng-show="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
-          <span ng-show="wallet.balanceHidden" translate>[Balance Hidden]</span>
+        <div ng-if="wallet.isComplete()">
+          <span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
+          <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
         </div>
         </p>
         <i class="icon nav-item-arrow-right"></i>
       </a>
       <a ui-sref="bitpayCard.main"
-         ng-show="externalServices.BitpayCard"
+         ng-if="externalServices.BitpayCard"
          class="item item-icon-left item-big-icon-left item-icon-right">
         <i class="icon big-icon-svg">
           <div class="bg icon-bitpay-card"></div>
@@ -89,22 +89,22 @@
       </a>
     </div>
 
-    <div class="list card" ng-show="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
+    <div class="list card" ng-if="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
       <div class="item item-icon-right item-heading" translate>
         Buy &amp; Sell Bitcoin
         <a ui-sref="tabs.buyandsell"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
       </div>
-      <a ng-show="glideraEnabled" ui-sref="tabs.buyandsell.glidera" class="item item-icon-right">
+      <a ng-if="glideraEnabled" ui-sref="tabs.buyandsell.glidera" class="item item-icon-right">
         <img src="img/glidera-logo.png" width="90"/>
         <i class="icon nav-item-arrow-right"></i>
       </a>
       <!-- disable coinbase for this release -->
-      <!-- <a ng-show="coinbaseEnabled" ui-sref="exchange.coinbase" class="item">
+      <!-- <a ng-if="coinbaseEnabled" ui-sref="exchange.coinbase" class="item">
         <img src="img/coinbase-logo.png" width="90"> TODO
       </a> -->
     </div>
 
-    <div class="list card" ng-show="externalServices.AmazonGiftCards">
+    <div class="list card" ng-if="externalServices.AmazonGiftCards">
       <a class="item item-icon-left item-icon-right item-big-icon-left" ui-sref="tabs.giftcards.amazon">
         <i class="icon big-icon-svg">
           <div class="bg icon-gift"></div>
@@ -115,13 +115,13 @@
     </div>
 
     <div class="list card"
-         ng-show="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]">
+         ng-if="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]">
       <div class="item item-icon-right item-heading" ng-click="shouldHideNextSteps()" translate>
         Next steps
-        <i class="icon nav-item-arrow-down" ng-show="!hideNextSteps"></i>
-        <i class="icon nav-item-arrow-up" ng-show="hideNextSteps"></i>
+        <i class="icon nav-item-arrow-down" ng-if="!hideNextSteps"></i>
+        <i class="icon nav-item-arrow-up" ng-if="hideNextSteps"></i>
       </div>
-      <div ng-show="hideNextSteps">
+      <div ng-if="hideNextSteps">
         <a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
          <i class="icon big-icon-svg">
            <div class="bg icon-create-wallet"></div>
diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss
index f75138075..4ce59566b 100644
--- a/src/sass/views/tab-home.scss
+++ b/src/sass/views/tab-home.scss
@@ -26,14 +26,24 @@
         top:0;
         right:0;
         content:'';
+        @media (min-width: 450px){
+          &{
+            width:90%;
+          }
+        }
       }
       &.item-heading{
         &:before{
-          width:100%;
+          width:100% !important;
           top:99%
         }
       }
-      &:nth-child(2){
+      &:nth-child(1){
+        &:before{
+          width:0;
+        }
+      }
+      &:nth-child(2):last-child{
         &:before{
           width:0;
         }

From 10159728608020c6db37d8c10d0889f28edd534a Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 27 Sep 2016 14:54:53 -0300
Subject: [PATCH 27/47] Fix alignment badge nr of pending proposals

---
 public/views/tab-home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 3427914ab..998160d29 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -25,7 +25,7 @@
       <a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
         Payment Proposals
         <i class="icon nav-item-arrow-right"></i>
-        <span class="badge badge-assertive" ng-if="txpsN>3" translate> {{txpsN}}</span>
+        <span class="badge badge-assertive m5t m10r" ng-if="txpsN>3" translate> {{txpsN}}</span>
       </a>
 
       <a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">

From 54967cb59c9218bab44d508dea3cd9e3cdc47c1b Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Tue, 27 Sep 2016 14:15:24 -0400
Subject: [PATCH 28/47] on boarding media query fixes for applying to devices
 bigger than iPhone plus size

---
 src/sass/views/includes/wallets.scss                  | 1 +
 src/sass/views/onboarding/onboard-backup-request.scss | 2 +-
 src/sass/views/onboarding/onboard-collect-email.scss  | 2 +-
 src/sass/views/onboarding/onboarding.scss             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss
index 772b08058..57a616a94 100644
--- a/src/sass/views/includes/wallets.scss
+++ b/src/sass/views/includes/wallets.scss
@@ -9,6 +9,7 @@
       padding-left:.25rem;
       padding-right:.25rem;
       border-radius: .25rem;
+      max-width: 350px;
     }
     .swiper-slide{
       width:100% !important;
diff --git a/src/sass/views/onboarding/onboard-backup-request.scss b/src/sass/views/onboarding/onboard-backup-request.scss
index 22b0b6a47..c64f0db77 100644
--- a/src/sass/views/onboarding/onboard-backup-request.scss
+++ b/src/sass/views/onboarding/onboard-backup-request.scss
@@ -15,7 +15,7 @@
     position: absolute;
     bottom: 0;
   }
-  @media (min-width: 400px){
+  @media (min-width: 415px){
     .warning{
       height:16rem;
     }
diff --git a/src/sass/views/onboarding/onboard-collect-email.scss b/src/sass/views/onboarding/onboard-collect-email.scss
index 28eb7fe47..a6cf4acc4 100644
--- a/src/sass/views/onboarding/onboard-collect-email.scss
+++ b/src/sass/views/onboarding/onboard-collect-email.scss
@@ -80,7 +80,7 @@
             font-size:.8rem;
           }
         }
-        @media (min-width: 400px){
+        @media (min-width: 415px){
           &{
             max-width: 400px;
             label{
diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss
index 7dad89ace..da762022a 100644
--- a/src/sass/views/onboarding/onboarding.scss
+++ b/src/sass/views/onboarding/onboarding.scss
@@ -87,7 +87,7 @@
   }
 }
 
-@media (min-width: 400px){
+@media (min-width: 415px){
   .onboarding{
     ion-content{
       h2{

From 01d5ba8d9f089d35b7ca1919b181851ca1d846bc Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 27 Sep 2016 16:01:15 -0300
Subject: [PATCH 29/47] Ref ionicPopup. Clear amount view after send

---
 public/views/tab-home.html                    |  6 ++--
 src/js/controllers/amount.js                  |  2 ++
 src/js/controllers/confirm.js                 |  2 +-
 .../controllers/onboarding/backupRequest.js   |  2 +-
 .../controllers/onboarding/backupWarning.js   |  2 +-
 .../onboarding/welcomeController.js           |  2 +-
 src/js/controllers/tab-send.js                |  6 ++--
 src/js/controllers/tabsController.js          |  6 ++--
 src/js/controllers/walletDetails.js           | 10 ++----
 src/js/services/walletService.js              | 32 ++++---------------
 10 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 998160d29..8fb038e78 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -22,10 +22,10 @@
     </div>
 
     <div class="list card" ng-hide="!txps[0]">
-      <a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
-        Payment Proposals
+      <a class="item item-icon-right item-heading" ui-sref="tabs.proposals">
+        {{'Payment Proposals'|translate}}
         <i class="icon nav-item-arrow-right"></i>
-        <span class="badge badge-assertive m5t m10r" ng-if="txpsN>3" translate> {{txpsN}}</span>
+        <span class="badge badge-assertive m5t m10r" ng-show="txpsN>3"> {{txpsN}}</span>
       </a>
 
       <a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 48daafb38..e4b157408 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -60,6 +60,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
     satToBtc = 1 / 100000000;
     unitDecimals = config.unitDecimals;
 
+    $scope.resetAmount();
+
     // in SAT ALWAYS
     if ($stateParams.toAmount) {
       $scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals);
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index ab5440289..0b6654842 100644
--- a/src/js/controllers/confirm.js
+++ b/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, 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, gettext, txFormatService, ongoingProcess, $ionicModal, popupService) {
   var cachedTxp = {};
   var isChromeApp = platformInfo.isChromeApp;
 
diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js
index 1ff5e6271..abf63c661 100644
--- a/src/js/controllers/onboarding/backupRequest.js
+++ b/src/js/controllers/onboarding/backupRequest.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, $ionicPopup, popupService, gettextCatalog) {
+angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, popupService, gettextCatalog) {
 
   $scope.walletId = $stateParams.walletId;
 
diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js
index 260c5eebd..795ce1d33 100644
--- a/src/js/controllers/onboarding/backupWarning.js
+++ b/src/js/controllers/onboarding/backupWarning.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicPopup, profileService, $ionicModal) {
+angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, profileService, $ionicModal) {
 
   $scope.walletId = $stateParams.walletId;
   $scope.openPopup = function() {
diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js
index bb74b9206..aca36409b 100644
--- a/src/js/controllers/onboarding/welcomeController.js
+++ b/src/js/controllers/onboarding/welcomeController.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
+angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, profileService) {
 
   $scope.goImport = function(code) {
     $state.go('onboarding.import', {
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index 45c56dd9b..c3583249a 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData) {
+angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService) {
 
   var originalList;
   var CONTACTS_SHOW_LIMIT = 10;
@@ -99,9 +99,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
 
   $scope.onQrCodeScanned = function(data) {
     if (!incomingData.redir(data)) {
-      $ionicPopup.alert({
-        title: 'Invalid data',
-      });
+      popupService.showAlert(null, gettextCatalog.getString('Invalid data'));
     }
   };
 
diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js
index 434a1e80c..bfb12da45 100644
--- a/src/js/controllers/tabsController.js
+++ b/src/js/controllers/tabsController.js
@@ -1,12 +1,10 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, incomingData, lodash) {
+angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, incomingData, lodash, popupService) {
 
   $scope.onScan = function(data) {
     if (!incomingData.redir(data)) {
-      $ionicPopup.alert({
-        title: 'Invalid data',
-      });
+      popupService.showAlert(null, gettextCatalog.getString('Invalid data'));
     }
   }
 
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index c51a99f37..dbb357ca4 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService, $ionicPopup, txpModalService, externalLinkService) {
+angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService) {
   var isCordova = platformInfo.isCordova;
   var isWP = platformInfo.isWP;
   var isAndroid = platformInfo.isAndroid;
@@ -219,9 +219,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
         if (tx) {
           $scope.openTxModal(tx);
         } else {
-          $ionicPopup.alert({
-            title: gettext('TX not available'),
-          });
+          popupService.showAlert(null, gettextCatalog.getString('TX not available'));
         }
       } else if ($stateParams.txpId) {
         var txp = lodash.find($scope.txps, {
@@ -230,9 +228,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
         if (txp) {
           $scope.openTxpModal(txp);
         } else {
-          $ionicPopup.alert({
-            title: gettext('Proposal not longer available'),
-          });
+          popupService.showAlert(null, gettextCatalog.getString('Proposal not longer available'));
         }
       }
     });
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index c9680a5cb..a34b210d3 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -820,32 +820,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
 
   // An alert dialog
   var askPassword = function(name, title, cb) {
-    var scope = $rootScope.$new(true);
-    scope.data = [];
-    var pass = $ionicPopup.show({
-      template: '<input type="password" ng-model="data.pass">',
-      title: title,
-      subTitle: name,
-      scope: scope,
-      buttons: [{
-        text: 'Cancel'
-      }, {
-        text: '<b>OK</b>',
-        type: 'button-positive',
-        onTap: function(e) {
-          if (!scope.data.pass) {
-            //don't allow the user to close unless he enters wifi password
-            e.preventDefault();
-            return;
-
-          }
-
-          return scope.data.pass;
-        }
-      }]
-    });
-    pass.then(function(res) {
-      return cb(res);
+    var opts = {
+      inputType: 'password'
+    };
+    popupService.showPrompt(title, name, opts, function(res) {
+      if (!res) return cb();
+      if (res) return cb(res)
     });
   };
 

From d75af58ddf1da3d2c0973b71c1e9ff68664ec2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 27 Sep 2016 15:57:39 -0300
Subject: [PATCH 30/47] advanced settings

---
 public/views/advancedSettings.html     |  63 ++++++++++++++
 public/views/tab-home.html             |  12 +--
 public/views/tab-settings.html         |  27 ++----
 src/js/controllers/advancedSettings.js | 113 +++++++++++++++++++++++++
 src/js/controllers/tab-home.js         |   4 +
 src/js/controllers/tab-settings.js     |  41 +--------
 src/js/routes.js                       |   9 ++
 src/js/services/configService.js       |  32 ++++++-
 src/js/services/profileService.js      |  24 +-----
 9 files changed, 239 insertions(+), 86 deletions(-)
 create mode 100644 public/views/advancedSettings.html
 create mode 100644 src/js/controllers/advancedSettings.js

diff --git a/public/views/advancedSettings.html b/public/views/advancedSettings.html
new file mode 100644
index 000000000..842904fd5
--- /dev/null
+++ b/public/views/advancedSettings.html
@@ -0,0 +1,63 @@
+<ion-view id="tab-settings" class="settings">
+  <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{'Advanced Settings' | translate}}</ion-nav-title>
+    <ion-nav-back-button>
+    </ion-nav-back-button>
+  </ion-nav-bar>
+
+  <ion-content>
+    <div class="list">
+      <div class="item item-divider" translate>Enabled Integrations</div>
+
+      <ion-toggle ng-show="!isWP" ng-model="bitpayCardEnabled.value" toggle-class="toggle-balanced" ng-change="bitpayCardChange()">
+        <span class="toggle-label" translate>Enable Bitpay Card Integration</span>
+      </ion-toggle>
+
+      <ion-toggle ng-show="!isWP" ng-model="amazonEnabled.value" toggle-class="toggle-balanced" ng-change="amazonChange()">
+        <span class="toggle-label" translate>Enable Amazon Integration</span>
+      </ion-toggle>
+
+      <ion-toggle ng-show="!isWP" ng-model="glideraEnabled.value" toggle-class="toggle-balanced" ng-change="glideraChange()">
+        <span class="toggle-label" translate>Enable Glidera Service</span>
+      </ion-toggle>
+
+      <!-- disable coinbase for this release -->
+
+      <!-- <ion-toggle ng-show="!isWP" ng-model="coinbaseEnabled" toggle-class="toggle-balanced" ng-change="coinbaseChange()">
+        <span class="toggle-label" translate>Enable Coinbase Service</span>
+      </ion-toggle> -->
+
+
+      <div class="item item-divider" translate>Wallet Operation</div>
+
+      <ion-toggle ng-model="spendUnconfirmed.value" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
+        <span class="toggle-label" translate>Use Unconfirmed Funds</span>
+      </ion-toggle>
+      <div ng-style="{'padding':'15px', 'background-color': '#fff', 'color': 'rgba(74, 74, 74, 0.8)'}">
+        <span translate>If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays.</span>
+      </div>
+
+      <div class="item item-divider" translate>Experimental Features</div>
+      <div ng-style="{'padding':'15px', 'color': 'rgba(74, 74, 74, 0.8)', 'font-size': '15px'}">
+        <span translate>These features aren't quite ready for primetime. They may change, stop working, or disappear at any time.</span>
+      </div>
+
+      <ion-toggle ng-show="!isWP" ng-model="recentTransactionsEnabled.value" toggle-class="toggle-balanced" ng-change="recentTransactionsChange()">
+        <span class="toggle-label" translate>Recent Transaction Card</span>
+      </ion-toggle>
+      <div ng-style="{'padding':'15px', 'background-color': '#fff', 'color': 'rgba(74, 74, 74, 0.8)'}">
+        <span transaction>If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab.</span>
+      </div>
+
+      <!-- disable frequently used for this release -->
+
+      <!-- <ion-toggle ng-show="!isWP" ng-model="frequentlyUsedEnabled.value" toggle-class="toggle-balanced" ng-change="frequentlyUsedChange()">
+        <span class="toggle-label" translate>Frequently Used Card</span>
+      </ion-toggle>
+      <div ng-style="{'padding':'15px', 'background-color': '#fff', 'color': 'rgba(74, 74, 74, 0.8)'}">
+        <span transaction>If enabled, the Frequently Used card - a list of the most commonly chosen recipients - will appear in the Send tab.</span>
+      </div> -->
+
+    </div>
+  </ion-content>
+</ion-view>
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 998160d29..37643f5e2 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -33,9 +33,9 @@
       </a>
     </div>
 
-    <div class="list card" ng-if="notifications[0]">
+    <div class="list card" ng-if="notifications[0] && recentTransactions">
       <a class="item item-icon-right item-heading" ui-sref="tabs.activity">
-        <span translate>Recent Activity</span>
+        <span translate>Recent Transactions</span>
         <i class="icon nav-item-arrow-right"></i>
       </a>
       <span ng-if="fetchingNotifications" class="item text-center">
@@ -114,7 +114,7 @@
     </div>
 
     <div class="list card"
-         ng-if="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]">
+         ng-if="(!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]) && nextStepEnabled">
       <div class="item item-icon-right item-heading" ng-click="shouldHideNextSteps()" translate>
         Next steps
         <i class="icon nav-item-arrow-down" ng-if="!hideNextSteps"></i>
@@ -128,21 +128,21 @@
           <span translate>Create a bitcoin wallet</span>
           <i class="icon nav-item-arrow-right"></i>
         </a>
-        <a ui-sref="bitpayCard.main" ng-if="!externalServices.BitpayCard" class="item item-icon-left item-big-icon-left item-icon-right next-step">
+        <a ui-sref="bitpayCard.main" ng-if="!externalServices.BitpayCard && bitpayCardEnabled" class="item item-icon-left item-big-icon-left item-icon-right next-step">
          <i class="icon big-icon-svg">
            <div class="bg icon-bitpay-card"></div>
          </i>
           <span translate>Add BitPay Card</span>
           <i class="icon nav-item-arrow-right"></i>
         </a>
-        <a ng-if="!externalServices.BuyAndSell" ui-sref="tabs.buyandsell" class="item item-icon-left item-big-icon-left item-icon-right next-step">
+        <a ng-if="!externalServices.BuyAndSell && (coinbaseEnabled || glideraEnabled)" ui-sref="tabs.buyandsell" class="item item-icon-left item-big-icon-left item-icon-right next-step">
          <i class="icon big-icon-svg">
            <div class="bg icon-buy-bitcoin"></div>
          </i>
           <span translate>Buy or Sell Bitcoin</span>
           <i class="icon nav-item-arrow-right"></i>
         </a>
-        <a ui-sref="tabs.giftcards.amazon" ng-if="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right next-step">
+        <a ui-sref="tabs.giftcards.amazon" ng-if="!externalServices.AmazonGiftCards && amazonEnabled" class="item item-icon-left item-big-icon-left item-icon-right next-step">
           <i class="icon big-icon-svg">
             <div class="bg icon-gift"></div>
           </i>
diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html
index 6c5add5f2..cb9113da9 100644
--- a/public/views/tab-settings.html
+++ b/public/views/tab-settings.html
@@ -50,25 +50,6 @@
         <i class="icon nav-item-arrow-right"></i>
       </a>
 
-      <div class="item item-divider" translate>Exchanges</div>
-
-      <ion-toggle ng-show="!isWP" ng-model="glideraEnabled.value" toggle-class="toggle-balanced" ng-change="glideraChange()">
-        <span class="toggle-label" translate>Enable Glidera Service</span>
-      </ion-toggle>
-
-      <!-- disable coinbase for this release -->
-      <!--
-      <ion-toggle ng-show="!isWP" ng-model="coinbaseEnabled" toggle-class="toggle-balanced" ng-change="coinbaseChange()">
-        <span class="toggle-label" translate>Enable Coinbase Service</span>
-      </ion-toggle>
-      -->
-
-      <div class="item item-divider" translate>Others</div>
-
-      <ion-toggle ng-model="spendUnconfirmed.value" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
-        <span class="toggle-label" translate>Use Unconfirmed Funds</span>
-      </ion-toggle>
-
       <div ng-show="usePushNotifications && PNEnabledByUser">
         <div class="item item-divider" translate>Notifications</div>
 
@@ -108,6 +89,14 @@
         <span translate>About</span> {{appName}}
         <i class="icon nav-item-arrow-right"></i>
       </a>
+
+      <div class="item item-divider"></div>
+      <a class="item item-icon-right" href ui-sref="tabs.advanced">
+        <span translate>Advanced</span>
+        <i class="icon nav-item-arrow-right"></i>
+      </a>
+
+      <div class="item item-divider"></div>
     </div>
   </ion-content>
 </ion-view>
diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
new file mode 100644
index 000000000..928b64a93
--- /dev/null
+++ b/src/js/controllers/advancedSettings.js
@@ -0,0 +1,113 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $rootScope, $log, $window, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService) {
+
+  var updateConfig = function() {
+
+    var config = configService.getSync();
+
+    $scope.spendUnconfirmed = {
+      value: config.wallet.spendUnconfirmed
+    };
+    $scope.bitpayCardEnabled = {
+      value: config.bitpayCard.enabled
+    };
+    $scope.amazonEnabled = {
+      value: config.amazon.enabled
+    };
+    $scope.glideraEnabled = {
+      value: config.glidera.enabled
+    };
+    $scope.coinbaseEnabled = {
+      value: config.coinbase.enabled
+    };
+    $scope.recentTransactionsEnabled = {
+      value: config.recentTransactions.enabled
+    };
+    $scope.frequentlyUsedEnabled = {
+      value: config.frequentlyUsed.enabled
+    };
+  };
+
+  $scope.spendUnconfirmedChange = function() {
+    var opts = {
+      wallet: {
+        spendUnconfirmed: $scope.spendUnconfirmed.value
+      }
+    };
+    configService.set(opts, function(err) {
+      if (err) $log.debug(err);
+    });
+  };
+
+  $scope.bitpayCardChange = function() {
+    var opts = {
+      bitpayCard: {
+        enabled: $scope.bitpayCardEnabled.value
+      }
+    };
+    configService.set(opts, function(err) {
+      if (err) $log.debug(err);
+    });
+  };
+
+  $scope.amazonChange = function() {
+    var opts = {
+      amazon: {
+        enabled: $scope.amazonEnabled.value
+      }
+    };
+    configService.set(opts, function(err) {
+      if (err) $log.debug(err);
+    });
+  };
+
+  $scope.glideraChange = function() {
+    var opts = {
+      glidera: {
+        enabled: $scope.glideraEnabled.value
+      }
+    };
+    configService.set(opts, function(err) {
+      if (err) $log.debug(err);
+    });
+  };
+
+  $scope.coinbaseChange = function() {
+    var opts = {
+      coinbase: {
+        enabled: $scope.coinbaseEnabled
+      }
+    };
+    configService.set(opts, function(err) {
+      if (err) $log.debug(err);
+    });
+  };
+
+  $scope.recentTransactionsChange = function() {
+    var opts = {
+      recentTransactions: {
+        enabled: $scope.recentTransactionsEnabled
+      }
+    };
+    configService.set(opts, function(err) {
+      if (err) $log.debug(err);
+    });
+  };
+
+  $scope.frequentlyUsedChange = function() {
+    var opts = {
+      frequentlyUsed: {
+        enabled: $scope.frequentlyUsedEnabled
+      }
+    };
+    configService.set(opts, function(err) {
+      if (err) $log.debug(err);
+    });
+  };
+
+  $scope.$on("$ionicView.enter", function(event, data) {
+    updateConfig();
+  });
+
+});
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index f58bb7ca0..fbaa561f4 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -209,6 +209,10 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
         $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
         $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp;
+        $scope.amazonEnabled = config.amazon.enabled;
+        $scope.bitpayCardEnabled = config.bitpayCard.enabled;
+        $scope.nextStepEnabled = $scope.glideraEnabled || $scope.coinbaseEnabled || $scope.amazonEnabled || $scope.bitpayCardEnabled;
+        $scope.recentTransactionsEnabled = config.recentTransactions.enabled;
       });
       $scope.nextStep();
       $scope.updateAllWallets();
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index f8f13202c..ba4bfafda 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -28,13 +28,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
         $scope.$digest();
       });
     }
-    $scope.spendUnconfirmed = {
-      value: config.wallet.spendUnconfirmed
-    };
-    $scope.glideraEnabled = {
-      value: config.glidera.enabled
-    };
-    $scope.coinbaseEnabled = config.coinbase.enabled;
+
     $scope.pushNotifications = {
       value: config.pushNotifications.enabled
     };
@@ -52,17 +46,6 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
     });
   };
 
-  $scope.spendUnconfirmedChange = function() {
-    var opts = {
-      wallet: {
-        spendUnconfirmed: $scope.spendUnconfirmed.value
-      }
-    };
-    configService.set(opts, function(err) {
-      if (err) $log.debug(err);
-    });
-  };
-
   $scope.pushNotificationsChange = function() {
     var opts = {
       pushNotifications: {
@@ -78,28 +61,6 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
     });
   };
 
-  $scope.glideraChange = function() {
-    var opts = {
-      glidera: {
-        enabled: $scope.glideraEnabled.value
-      }
-    };
-    configService.set(opts, function(err) {
-      if (err) $log.debug(err);
-    });
-  };
-
-  $scope.coinbaseChange = function() {
-    var opts = {
-      coinbase: {
-        enabled: $scope.coinbaseEnabled
-      }
-    };
-    configService.set(opts, function(err) {
-      if (err) $log.debug(err);
-    });
-  };
-
   $scope.$on("$ionicView.enter", function(event, data) {
     updateConfig();
   });
diff --git a/src/js/routes.js b/src/js/routes.js
index 489c156f6..501a304f5 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -390,6 +390,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           }
         }
       })
+      .state('tabs.advanced', {
+        url: '/advanced',
+        views: {
+          'tab-settings@tabs': {
+            controller: 'advancedSettingsController',
+            templateUrl: 'views/advancedSettings.html'
+          }
+        }
+      })
 
     /*
      *
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 9ef2fdf23..f7728c6c5 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -39,10 +39,28 @@ angular.module('copayApp.services').factory('configService', function(storageSer
     },
 
     coinbase: {
-      enabled: true,
+      enabled: false, //disable coinbase for this release
       testnet: false
     },
 
+    bitpayCard: {
+      enabled: true
+    },
+
+    amazon: {
+      enabled: true
+    },
+
+    //Experimental Features
+
+    recentTransactions: {
+      enabled: true
+    },
+
+    frequentlyUsed: {
+      enabled: true
+    },
+
     rates: {
       url: 'https://insight.bitpay.com:443/api/rates',
     },
@@ -111,6 +129,18 @@ angular.module('copayApp.services').factory('configService', function(storageSer
         if (!configCache.coinbase) {
           configCache.coinbase = defaultConfig.coinbase;
         }
+        if (!configCache.amazon) {
+          configCache.amazon = defaultConfig.amazon;
+        }
+        if (!configCache.bitpayCard) {
+          configCache.bitpayCard = defaultConfig.bitpayCard;
+        }
+        if (!configCache.recentTransactions) {
+          configCache.recentTransactions = defaultConfig.recentTransactions;
+        }
+        if (!configCache.frequentlyUsed) {
+          configCache.frequentlyUsed = defaultConfig.frequentlyUsed;
+        }
         if (!configCache.pushNotifications) {
           configCache.pushNotifications = defaultConfig.pushNotifications;
         }
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 247516f9f..0dea73fb0 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -780,21 +780,11 @@ angular.module('copayApp.services')
       var TIME_STAMP = 60 * 60 * 24 * 7;
       var MAX = 100;
 
-      var typeFilter1 = {
-        'NewBlock': 1,
-        'BalanceUpdated': 1,
-        'NewOutgoingTxByThirdParty': 1,
-        'NewAddress': 1,
-        'TxProposalFinallyAccepted': 1,
-        'TxProposalFinallyRejected': 1,
+      var typeFilter = {
+        'NewOutgoingTx': 1,
+        'NewIncomingTx': 1
       };
 
-      var typeFilter2 = {
-        'TxProposalAcceptedBy': 1,
-        'TxProposalRejectedBy': 1,
-        'NewTxProposal': 1,
-      }
-
       var w = root.getWallets();
       if (lodash.isEmpty(w)) return cb();
 
@@ -895,15 +885,9 @@ angular.module('copayApp.services')
             var n;
 
             n = lodash.filter(wallet.cachedActivity.n, function(x) {
-              return !typeFilter1[x.type];
+              return typeFilter[x.type];
             });
 
-            if (wallet.m == 1) {
-              n = lodash.filter(n, function(x) {
-                return !typeFilter2[x.type];
-              });
-            }
-
             var idToName = {};
             if (wallet.cachedStatus) {
               lodash.each(wallet.cachedStatus.wallet.copayers, function(c) {

From a0a9b42f13268ca7489909fa985e453d921d1725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 27 Sep 2016 16:25:50 -0300
Subject: [PATCH 31/47] adding scss file

---
 public/views/advancedSettings.html   |  8 ++---
 src/sass/main.scss                   |  1 +
 src/sass/views/advancedSettings.scss | 53 ++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 src/sass/views/advancedSettings.scss

diff --git a/public/views/advancedSettings.html b/public/views/advancedSettings.html
index 842904fd5..e0a2d0e5d 100644
--- a/public/views/advancedSettings.html
+++ b/public/views/advancedSettings.html
@@ -1,4 +1,4 @@
-<ion-view id="tab-settings" class="settings">
+<ion-view id="advanced-settings" class="settings">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Advanced Settings' | translate}}</ion-nav-title>
     <ion-nav-back-button>
@@ -33,19 +33,19 @@
       <ion-toggle ng-model="spendUnconfirmed.value" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
         <span class="toggle-label" translate>Use Unconfirmed Funds</span>
       </ion-toggle>
-      <div ng-style="{'padding':'15px', 'background-color': '#fff', 'color': 'rgba(74, 74, 74, 0.8)'}">
+      <div class="comment">
         <span translate>If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays.</span>
       </div>
 
       <div class="item item-divider" translate>Experimental Features</div>
-      <div ng-style="{'padding':'15px', 'color': 'rgba(74, 74, 74, 0.8)', 'font-size': '15px'}">
+      <div class="divider-comment">
         <span translate>These features aren't quite ready for primetime. They may change, stop working, or disappear at any time.</span>
       </div>
 
       <ion-toggle ng-show="!isWP" ng-model="recentTransactionsEnabled.value" toggle-class="toggle-balanced" ng-change="recentTransactionsChange()">
         <span class="toggle-label" translate>Recent Transaction Card</span>
       </ion-toggle>
-      <div ng-style="{'padding':'15px', 'background-color': '#fff', 'color': 'rgba(74, 74, 74, 0.8)'}">
+      <div class="comment">
         <span transaction>If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab.</span>
       </div>
 
diff --git a/src/sass/main.scss b/src/sass/main.scss
index 916c8f500..d5a17d289 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -996,6 +996,7 @@ input[type=number] {
 @import "views/tab-send";
 @import "views/tab-settings";
 @import "views/walletDetails";
+@import "views/advancedSettings";
 @import "views/bitpayCard";
 @import "views/address-book";
 @import "views/wallet-backup-phrase";
diff --git a/src/sass/views/advancedSettings.scss b/src/sass/views/advancedSettings.scss
new file mode 100644
index 000000000..d3da674d9
--- /dev/null
+++ b/src/sass/views/advancedSettings.scss
@@ -0,0 +1,53 @@
+.settings {
+  .item {
+    color: #444;
+    border-color: rgba(221, 221, 221, 0.3);
+  }
+}
+
+#advanced-settings {
+  .list {
+    .item {
+      color: #444;
+      border-top: none;
+      padding-top: 1.5rem;
+      padding-bottom: 1.5rem;
+      &:before {
+        display: block;
+        position: absolute;
+        width: 100%;
+        height: 1px;
+        background: rgba(221, 221, 221, 0.3);
+        top: 0;
+        right: 0;
+        content: '';
+      }
+      &.item-divider {
+        color: rgba(74, 74, 74, .8);
+      }
+      &.item-heading {
+        &:before {
+          top: 99%
+        }
+      }
+      &:nth-child(2) {
+        &:before {
+          width: 0;
+        }
+      }
+      .item-note {
+        color: rgb(58, 58, 58);
+      }
+    }
+    .comment {
+      padding: 15px;
+      background-color: #fff;
+      color: rgba(74, 74, 74, 0.8);
+    }
+    .divider-comment {
+      padding: 15px;
+      color: rgba(74, 74, 74, 0.8);
+      font-size: 15px;
+    }
+  }
+}

From 2c3220e04154a796ea9a803981990983bf6f96c3 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 28 Sep 2016 09:43:19 -0300
Subject: [PATCH 32/47] Minux bug fixes

---
 src/js/controllers/modals/txStatus.js | 5 ++++-
 src/sass/views/confirm.scss           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js
index c78749f1d..9b9cdd7e4 100644
--- a/src/js/controllers/modals/txStatus.js
+++ b/src/js/controllers/modals/txStatus.js
@@ -9,7 +9,10 @@ angular.module('copayApp.controllers').controller('txStatusController', function
     $scope.txStatusModal.hide();
     if ($scope.fromSendTab) {
       $ionicHistory.removeBackView();
-      $state.go('tabs.home');
+      $state.go('tabs.send');
+      $timeout(function() {
+        $state.transitionTo('tabs.home');
+      }, 100);
     }
   };
 
diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss
index 1a739bba1..425850d92 100644
--- a/src/sass/views/confirm.scss
+++ b/src/sass/views/confirm.scss
@@ -9,7 +9,7 @@
   }
   .accept-slide {
      position: fixed;
-     bottom: 49px;
+     bottom: 0;
      width: 100%;
      height: 100px;
      background-color: #647CE8;

From 570b16a81a8a03f55b2d45081f800ff5e838f768 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Wed, 28 Sep 2016 10:42:25 -0300
Subject: [PATCH 33/47] reverse timeline

---
 src/js/controllers/modals/txDetails.js  | 2 ++
 src/js/controllers/modals/txpDetails.js | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js
index f9d7dd4ff..37f6718fa 100644
--- a/src/js/controllers/modals/txDetails.js
+++ b/src/js/controllers/modals/txDetails.js
@@ -73,6 +73,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
       time: $scope.btx.time,
       description: actionDescriptions['broadcasted'],
     });
+
+    $scope.actionList.reverse();
   };
 
   $scope.showCommentPopup = function() {
diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js
index 23ba059b3..8f76d7f4d 100644
--- a/src/js/controllers/modals/txpDetails.js
+++ b/src/js/controllers/modals/txpDetails.js
@@ -49,6 +49,8 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
         by: action.copayerName
       });
     });
+
+    $scope.actionList.reverse();
   };
 
   $scope.$on('accepted', function(event) {

From fb117ba1ba4def62072286749ba7940319923976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 28 Sep 2016 10:50:33 -0300
Subject: [PATCH 34/47] add notifications settings

---
 public/views/preferencesNotifications.html    | 29 +++++++++++
 public/views/tab-settings.html                | 24 +++------
 .../controllers/preferencesNotifications.js   | 52 +++++++++++++++++++
 src/js/controllers/tab-settings.js            | 37 +------------
 src/js/routes.js                              | 11 +++-
 src/sass/views/notifications.scss             | 43 +++++++++++++++
 6 files changed, 142 insertions(+), 54 deletions(-)
 create mode 100644 public/views/preferencesNotifications.html
 create mode 100644 src/js/controllers/preferencesNotifications.js
 create mode 100644 src/sass/views/notifications.scss

diff --git a/public/views/preferencesNotifications.html b/public/views/preferencesNotifications.html
new file mode 100644
index 000000000..8b54a93e2
--- /dev/null
+++ b/public/views/preferencesNotifications.html
@@ -0,0 +1,29 @@
+<ion-view id="tab-notifications" class="settings">
+  <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{'Notifications' | translate}}</ion-nav-title>
+    <ion-nav-back-button>
+    </ion-nav-back-button>
+  </ion-nav-bar>
+
+  <ion-content>
+    <div class="list">
+      <div ng-show="PNEnabledByUser">
+        <div class="item item-divider" translate>Notifications</div>
+
+        <ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
+          <span class="toggle-label" translate>Enable push notifications</span>
+        </ion-toggle>
+      </div>
+
+      <div ng-show="!PNEnabledByUser && isIOSApp">
+        <div class="item item-divider" translate>Notifications</div>
+        <div class="padding text-light" translate>
+          Push notifications for Copay are currently disabled. Enable them in the Settings app.
+        </div>
+        <a class="item" ng-click="openSettings()">
+          <span translate>Open Settings app</span>
+        </a>
+      </div>
+    </div>
+  </ion-content>
+</ion-view>
diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html
index cb9113da9..efdff84ad 100644
--- a/public/views/tab-settings.html
+++ b/public/views/tab-settings.html
@@ -14,6 +14,12 @@
 
       <div class="item item-divider" translate>Preferences</div>
 
+      <a class="item item-icon-left item-icon-right" ui-sref="tabs.notifications" ng-show="usePushNotifications">
+        <i class="icon ion-ios-bell-outline"></i>
+        <span translate>Notifications</span>
+        <i class="icon nav-item-arrow-right"></i>
+      </a>
+
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.language">
         <i class="icon ion-ios-chatbubble-outline"></i>
         <span translate>Language</span>
@@ -50,24 +56,6 @@
         <i class="icon nav-item-arrow-right"></i>
       </a>
 
-      <div ng-show="usePushNotifications && PNEnabledByUser">
-        <div class="item item-divider" translate>Notifications</div>
-
-        <ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
-          <span class="toggle-label" translate>Enable push notifications</span>
-        </ion-toggle>
-      </div>
-
-      <div ng-show="usePushNotifications && !PNEnabledByUser && isIOSApp">
-        <div class="item item-divider" translate>Notifications</div>
-        <div class="padding text-light" translate>
-          Push notifications for Copay are currently disabled. Enable them in the Settings app.
-        </div>
-        <a class="item" ng-click="openSettings()">
-          <span translate>Open Settings app</span>
-        </a>
-      </div>
-
       <div class="item item-divider" translate>Wallets Preferences</div>
       <a class="item item-icon-left item-icon-right" href
            ui-sref="tabs.preferences({'walletId': item.id})"
diff --git a/src/js/controllers/preferencesNotifications.js b/src/js/controllers/preferencesNotifications.js
new file mode 100644
index 000000000..8d947dde8
--- /dev/null
+++ b/src/js/controllers/preferencesNotifications.js
@@ -0,0 +1,52 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('preferencesNotificationsController',
+  function($scope, $rootScope, $log, $window, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService) {
+
+    var updateConfig = function() {
+
+      var config = configService.getSync();
+      var isCordova = platformInfo.isCordova;
+      var isIOS = platformInfo.isIOS;
+
+      $scope.PNEnabledByUser = true;
+      $scope.isIOSApp = isIOS && isCordova;
+      if ($scope.isIOSApp) {
+        cordova.plugins.diagnostic.isRemoteNotificationsEnabled(function(isEnabled) {
+          $scope.PNEnabledByUser = isEnabled;
+          $scope.$digest();
+        });
+      }
+
+      $scope.pushNotifications = {
+        value: config.pushNotifications.enabled
+      };
+    };
+
+    $scope.openSettings = function() {
+      cordova.plugins.diagnostic.switchToSettings(function() {
+        $log.debug('switched to settings');
+      }, function(err) {
+        $log.debug(err);
+      });
+    };
+
+    $scope.pushNotificationsChange = function() {
+      var opts = {
+        pushNotifications: {
+          enabled: $scope.pushNotifications.value
+        }
+      };
+      configService.set(opts, function(err) {
+        if (opts.pushNotifications.enabled)
+          pushNotificationsService.enableNotifications(profileService.walletClients);
+        else
+          pushNotificationsService.disableNotifications(profileService.walletClients);
+        if (err) $log.debug(err);
+      });
+    };
+
+    $scope.$on("$ionicView.enter", function(event, data) {
+      updateConfig();
+    });
+  });
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index ba4bfafda..ec1492ef9 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -9,6 +9,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
     var isWP = platformInfo.isWP;
     var isIOS = platformInfo.isIOS;
 
+    $scope.usePushNotifications = isCordova && !isWP;
+
     $scope.appName = $window.appConfig.nameCase;
 
     $scope.unitName = config.wallet.settings.unitName;
@@ -19,48 +21,13 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
     };
     $scope.feeOpts = feeService.feeOpts;
     $scope.currentFeeLevel = feeService.getCurrentFeeLevel();
-    $scope.usePushNotifications = isCordova && !isWP;
-    $scope.PNEnabledByUser = true;
-    $scope.isIOSApp = isIOS && isCordova;
-    if ($scope.isIOSApp) {
-      cordova.plugins.diagnostic.isRemoteNotificationsEnabled(function(isEnabled) {
-        $scope.PNEnabledByUser = isEnabled;
-        $scope.$digest();
-      });
-    }
 
-    $scope.pushNotifications = {
-      value: config.pushNotifications.enabled
-    };
     $scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
       return w.id != self.walletId;
     });
     $scope.wallets = profileService.getWallets();
   };
 
-  $scope.openSettings = function() {
-    cordova.plugins.diagnostic.switchToSettings(function() {
-      $log.debug('switched to settings');
-    }, function(err) {
-      $log.debug(err);
-    });
-  };
-
-  $scope.pushNotificationsChange = function() {
-    var opts = {
-      pushNotifications: {
-        enabled: $scope.pushNotifications.value
-      }
-    };
-    configService.set(opts, function(err) {
-      if (opts.pushNotifications.enabled)
-        pushNotificationsService.enableNotifications(profileService.walletClients);
-      else
-        pushNotificationsService.disableNotifications(profileService.walletClients);
-      if (err) $log.debug(err);
-    });
-  };
-
   $scope.$on("$ionicView.enter", function(event, data) {
     updateConfig();
   });
diff --git a/src/js/routes.js b/src/js/routes.js
index 501a304f5..d76a7328e 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -318,7 +318,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      *
      */
 
-    .state('tabs.language', {
+    .state('tabs.notifications', {
+        url: '/notifications',
+        views: {
+          'tab-settings@tabs': {
+            controller: 'preferencesNotificationsController',
+            templateUrl: 'views/preferencesNotifications.html'
+          }
+        }
+      })
+      .state('tabs.language', {
         url: '/language',
         views: {
           'tab-settings@tabs': {
diff --git a/src/sass/views/notifications.scss b/src/sass/views/notifications.scss
new file mode 100644
index 000000000..a0433cc5d
--- /dev/null
+++ b/src/sass/views/notifications.scss
@@ -0,0 +1,43 @@
+.settings {
+  .item {
+    color: #444;
+    border-color: rgba(221, 221, 221, 0.3);
+  }
+}
+
+#tab-notifications {
+  .list {
+    .item {
+      color: #444;
+      border-top: none;
+      padding-top: 1.5rem;
+      padding-bottom: 1.5rem;
+      &:before {
+        display: block;
+        position: absolute;
+        width: 100%;
+        height: 1px;
+        background: rgba(221, 221, 221, 0.3);
+        top: 0;
+        right: 0;
+        content: '';
+      }
+      &.item-divider {
+        color: rgba(74, 74, 74, .8);
+      }
+      &.item-heading {
+        &:before {
+          top: 99%
+        }
+      }
+      &:nth-child(2) {
+        &:before {
+          width: 0;
+        }
+      }
+      .item-note {
+        color: rgb(58, 58, 58);
+      }
+    }
+  }
+}

From 14e941e0f2b26a571bc5d504931fc4e447a3c7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 28 Sep 2016 11:59:42 -0300
Subject: [PATCH 35/47] switch advanced and about

---
 public/views/tab-settings.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html
index efdff84ad..0231d8d99 100644
--- a/public/views/tab-settings.html
+++ b/public/views/tab-settings.html
@@ -71,13 +71,6 @@
         <i class="icon nav-item-arrow-right"></i>
       </a>
 
-      <div class="item item-divider"></div>
-      <a class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
-        <i class="icon ion-ios-information-outline"></i>
-        <span translate>About</span> {{appName}}
-        <i class="icon nav-item-arrow-right"></i>
-      </a>
-
       <div class="item item-divider"></div>
       <a class="item item-icon-right" href ui-sref="tabs.advanced">
         <span translate>Advanced</span>
@@ -85,6 +78,11 @@
       </a>
 
       <div class="item item-divider"></div>
+      <a class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
+        <i class="icon ion-ios-information-outline"></i>
+        <span translate>About</span> {{appName}}
+        <i class="icon nav-item-arrow-right"></i>
+      </a>
     </div>
   </ion-content>
 </ion-view>

From 947a12b996f3c3fae7b16c4f0fd0b9c1146ae7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 28 Sep 2016 12:26:09 -0300
Subject: [PATCH 36/47] Save last state only for onboarding views

---
 src/js/routes.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/js/routes.js b/src/js/routes.js
index d76a7328e..ba828213c 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -995,6 +995,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       $log.debug('Route change from:', fromState.name || '-', ' to:', toState.name);
       $log.debug('            toParams:' + JSON.stringify(toParams || {}));
       $log.debug('            fromParams:' + JSON.stringify(fromParams || {}));
+
+      if (!toState.name.match(/onboarding/)) return;
       var state = {};
       state.name = toState.name;
       state.toParams = toParams;

From 8cda873299ef95758d049f5c5c24d2914a56c083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 28 Sep 2016 14:11:09 -0300
Subject: [PATCH 37/47] go to copayers when join wallet if is not complete

---
 src/js/controllers/join.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 872b15462..83150713a 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -146,7 +146,19 @@ angular.module('copayApp.controllers').controller('joinController',
             $log.debug('Remote preferences saved for:' + client.credentials.walletId)
           });
           $ionicHistory.removeBackView();
-          $state.go('tabs.home');
+
+          if (!client.isComplete()) {
+            $ionicHistory.nextViewOptions({
+              disableAnimate: true
+            });
+            $state.go('tabs.home');
+            $timeout(function() {
+              $state.transitionTo('tabs.copayers', {
+                walletId: client.credentials.walletId
+              });
+            }, 100);
+          }
+          else $state.go('tabs.home')
         });
       }, 100);
     };

From 1837d0b7af28656ac63c0747306e8a32641aa2b7 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Wed, 28 Sep 2016 13:28:23 -0400
Subject: [PATCH 38/47] fix receive tab wallet icon slider on tablet

---
 src/sass/common.scss                 |  4 ++
 src/sass/views/includes/wallets.scss | 76 ++++++++++++++++++++--------
 2 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/src/sass/common.scss b/src/sass/common.scss
index 5be328775..b2a7677af 100644
--- a/src/sass/common.scss
+++ b/src/sass/common.scss
@@ -112,3 +112,7 @@ ion-header-bar{
 .bold-text{
   font-weight: bold !important;
 }
+
+.card{
+  box-shadow:  0 2px 3px rgba(0, 0, 0, 0.3);
+}
diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss
index 57a616a94..cf2626745 100644
--- a/src/sass/views/includes/wallets.scss
+++ b/src/sass/views/includes/wallets.scss
@@ -1,34 +1,68 @@
-.wallets{
-  .slides{
-    .swiper-container{
-      width:75% !important;
-      overflow:visible;
+.wallets {
+  .slides {
+    .swiper-container {
+      width: 75% !important;
+      overflow: visible;
     }
-    .card{
+    .card {
       padding: .7rem;
-      padding-left:.25rem;
-      padding-right:.25rem;
+      padding-left: .25rem;
+      padding-right: .25rem;
       border-radius: .25rem;
       max-width: 350px;
-    }
-    .swiper-slide{
-      width:100% !important;
-      max-width: 450px;
-      &.swiper-slide-prev, &.swiper-slide-next{
-        opacity: .2;
-        &:hover{
-          opacity: 1;
+      @media (min-width: 500px) {
+        & {
+          width: 350px;
+          position: relative;
+          margin: 1.5rem auto 0;
         }
       }
-      &.swiper-slide-prev{
-        left:-5%;
+    }
+    .swiper-slide {
+      width: 100% !important;
+      max-width: 450px;
+      @media (min-width: 500px) {
+        & {
+          margin: 0 auto;
+          display: block;
+          float: none;
+          max-width: none;
+        }
+        &.swiper-slide-next .card {
+          float: left;
+        }
+        &.swiper-slide-prev .card {
+          float: right;
+        }
       }
-      &.swiper-slide-next{
-        left:4%;
+      &.swiper-slide-prev,
+      &.swiper-slide-next {
+        opacity: .2;
+      }
+      &.swiper-slide-prev {
+        left: -5%;
+      }
+      &.swiper-slide-next {
+        left: 4%;
       }
     }
   }
-  .swiper-pagination{
+  .swiper-pagination {
     visibility: hidden;
   }
 }
+
+.platform-browser {
+  .wallets {
+    .slides {
+      .swiper-slide {
+        &.swiper-slide-prev,
+        &.swiper-slide-next {
+          &:hover {
+            opacity: 1;
+          }
+        }
+      }
+    }
+  }
+}

From 2fdd12a9c2b0c1c4bbc87d4b54200a60ec1e0956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 28 Sep 2016 15:45:21 -0300
Subject: [PATCH 39/47] add timeout to resize and fix advanced settings

---
 public/views/tab-home.html                   |  4 ++--
 src/js/controllers/advancedSettings.js       |  6 +++---
 src/js/controllers/amount.js                 |  2 +-
 src/js/controllers/create.js                 |  4 +++-
 src/js/controllers/modals/search.js          |  4 +++-
 src/js/controllers/modals/txpDetails.js      |  2 +-
 src/js/controllers/preferencesInformation.js |  4 ++--
 src/js/controllers/tab-home.js               | 18 +++++++++++-------
 8 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 5e9f09017..e17426e5b 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -33,7 +33,7 @@
       </a>
     </div>
 
-    <div class="list card" ng-if="notifications[0] && recentTransactions">
+    <div class="list card" ng-if="notifications[0] && recentTransactionsEnabled">
       <a class="item item-icon-right item-heading" ui-sref="tabs.activity">
         <span translate>Recent Transactions</span>
         <i class="icon nav-item-arrow-right"></i>
@@ -120,7 +120,7 @@
         <i class="icon nav-item-arrow-down" ng-if="!hideNextSteps"></i>
         <i class="icon nav-item-arrow-up" ng-if="hideNextSteps"></i>
       </div>
-      <div ng-if="hideNextSteps">
+      <div ng-if="!hideNextSteps">
         <a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
          <i class="icon big-icon-svg">
            <div class="bg icon-create-wallet"></div>
diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index 928b64a93..807eb0dd9 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
   $scope.coinbaseChange = function() {
     var opts = {
       coinbase: {
-        enabled: $scope.coinbaseEnabled
+        enabled: $scope.coinbaseEnabled.value
       }
     };
     configService.set(opts, function(err) {
@@ -87,7 +87,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
   $scope.recentTransactionsChange = function() {
     var opts = {
       recentTransactions: {
-        enabled: $scope.recentTransactionsEnabled
+        enabled: $scope.recentTransactionsEnabled.value
       }
     };
     configService.set(opts, function(err) {
@@ -98,7 +98,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
   $scope.frequentlyUsedChange = function() {
     var opts = {
       frequentlyUsed: {
-        enabled: $scope.frequentlyUsedEnabled
+        enabled: $scope.frequentlyUsedEnabled.value
       }
     };
     configService.set(opts, function(err) {
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index e4b157408..c8e3abf4e 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -71,7 +71,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
 
     $timeout(function() {
       $ionicScrollDelegate.resize();
-    }, 100);
+    }, 10);
   });
 
   $scope.toggleAlternative = function() {
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 84c77275f..6b91db34d 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -37,7 +37,9 @@ angular.module('copayApp.controllers').controller('createController',
     };
 
     $scope.showAdvChange = function() {
-      $ionicScrollDelegate.resize();
+      $timeout(function() {
+        $ionicScrollDelegate.resize();
+      }, 10);
     };
 
     function updateRCSelect(n) {
diff --git a/src/js/controllers/modals/search.js b/src/js/controllers/modals/search.js
index 9b9e6d268..ed1861074 100644
--- a/src/js/controllers/modals/search.js
+++ b/src/js/controllers/modals/search.js
@@ -14,7 +14,9 @@ angular.module('copayApp.controllers').controller('searchController', function($
       window.plugins.toast.hide();
     currentTxHistoryPage = 0;
     throttleSearch(search);
-    $ionicScrollDelegate.resize();
+    $timeout(function() {
+      $ionicScrollDelegate.resize();
+    }, 10);
   }
 
   var throttleSearch = lodash.throttle(function(search) {
diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js
index 8f76d7f4d..076d98748 100644
--- a/src/js/controllers/modals/txpDetails.js
+++ b/src/js/controllers/modals/txpDetails.js
@@ -147,7 +147,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
         paymentTimeControl(tx.paypro.expires);
         $timeout(function() {
           $ionicScrollDelegate.resize();
-        }, 100);
+        }, 10);
       });
     }
   };
diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js
index 3cbac1bab..2f2da8b00 100644
--- a/src/js/controllers/preferencesInformation.js
+++ b/src/js/controllers/preferencesInformation.js
@@ -114,9 +114,9 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
         }
         $scope.addrs = last10;
         $timeout(function() {
+          $ionicScrollDelegate.resize();
           $scope.$apply();
-        });
-        $ionicScrollDelegate.resize();
+        }, 10);
       });
     });
 
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index fbaa561f4..41444b0d9 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -88,11 +88,10 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         if (err) $log.error(err);
         $scope.txps = txps;
         $scope.txpsN = n;
-        $ionicScrollDelegate.resize();
-
         $timeout(function() {
+          $ionicScrollDelegate.resize();
           $scope.$apply();
-        }, 1);
+        }, 10);
       })
     };
 
@@ -128,11 +127,11 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         }
         $scope.fetchingNotifications = false;
         $scope.notifications = n;
-        $ionicScrollDelegate.resize();
 
         $timeout(function() {
+          $ionicScrollDelegate.resize();
           $scope.$apply();
-        }, 1);
+        }, 10);
 
       })
     };
@@ -175,14 +174,18 @@ angular.module('copayApp.controllers').controller('tabHomeController',
       lodash.each(['AmazonGiftCards', 'BitpayCard', 'BuyAndSell'], function(service) {
         storageService.getNextStep(service, function(err, value) {
           $scope.externalServices[service] = value ? true : false;
-          $ionicScrollDelegate.resize();
+          $timeout(function() {
+            $ionicScrollDelegate.resize();
+          }, 10);
         });
       });
     };
 
     $scope.shouldHideNextSteps = function() {
       $scope.hideNextSteps = !$scope.hideNextSteps;
-      $ionicScrollDelegate.resize();
+      $timeout(function() {
+        $ionicScrollDelegate.resize();
+      }, 10);
     };
 
     var listeners = [
@@ -207,6 +210,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
       configService.whenAvailable(function() {
         var config = configService.getSync();
         var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
+        $scope.hideNextSteps = false;
         $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
         $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp;
         $scope.amazonEnabled = config.amazon.enabled;

From 8fc4f2d69a1298caf63f87533bb5e222d179a569 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Wed, 28 Sep 2016 14:53:01 -0400
Subject: [PATCH 40/47] added new design for add contact when user has empty
 address book

---
 public/img/address-book-add.svg  | 27 +++++++++++++++++++++++++++
 public/views/addressbook.html    | 20 +++++++++++++++-----
 src/sass/views/address-book.scss |  2 +-
 3 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 public/img/address-book-add.svg

diff --git a/public/img/address-book-add.svg b/public/img/address-book-add.svg
new file mode 100644
index 000000000..fa8866b49
--- /dev/null
+++ b/public/img/address-book-add.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="128px" height="128px" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
+    <title>CF22B02A-463B-4798-B448-F6A878730EDC</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#EFF2FF" offset="0%"></stop>
+            <stop stop-color="#F7F7F7" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Settings" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="1.7.4---Address-book-(Empty)" transform="translate(-122.000000, -125.000000)">
+            <g id="Header/Jumbo-W-Text/Light" transform="translate(0.000000, 70.000000)">
+                <g id="users-24px-outline-2_a-add" transform="translate(64.000000, 41.000000)">
+                    <g id="Group" transform="translate(58.000000, 14.000000)">
+                        <circle id="Oval-2" fill="url(#linearGradient-1)" cx="64" cy="64" r="64"></circle>
+                        <path d="M59.8058824,65.8235294 C51.3947922,65.8235294 43.9338216,67.7071485 39.0313235,69.3457199 C35.4125294,70.5591485 33,73.9396246 33,77.7275294 L33,89.442577 L62.7843137,89.442577" id="Shape" stroke="#647CE8" stroke-width="2"></path>
+                        <path d="M65.8843137,68.4285714 L65.8843137,68.4285714 C57.6608647,68.4285714 50.9921569,58.8658095 50.9921569,50.7142857 L50.9921569,47.7619048 C50.9921569,39.610381 57.6608647,33 65.8843137,33 L65.8843137,33 C74.1077627,33 80.7764706,39.610381 80.7764706,47.7619048 L80.7764706,50.7142857 C80.7764706,58.8658095 74.1077627,68.4285714 65.8843137,68.4285714 L65.8843137,68.4285714 Z" id="Shape" stroke="#647CE8" stroke-width="2"></path>
+                        <path d="M85.2745098,77.2857143 L85.2745098,95" id="Shape" stroke="#647CE8" stroke-width="2"></path>
+                        <path d="M77.1294118,85.2745098 L95,85.2745098" id="Shape" stroke="#647CE8" stroke-width="2"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/public/views/addressbook.html b/public/views/addressbook.html
index ee69d6fb7..a6d355b6f 100644
--- a/public/views/addressbook.html
+++ b/public/views/addressbook.html
@@ -39,12 +39,22 @@
 
       </ion-item>
     </ion-list>
-    <div class="row text-center absolute-center" ng-show="isEmptyList">
+    <div class="text-center absolute-center" ng-show="isEmptyList">
       <div id="add-contact" class="col col-80 center-block">
-        <img class="col" src="img/item-ico-contact.svg">
-        <a class="col col-40 center-block" ui-sref="tabs.addressbook.add">
-          Add Contact
-        </a>
+        <div class="row">
+          <img class="col col-60 center-block" src="img/address-book-add.svg">
+        </div>
+        <div class="row text-center">
+          <h2 class="col" translate>No contacts yet</h2>
+        </div>
+        <div class="row">
+          <p class="text-center" translate>
+            You haven’t added any contacts to your address book yet. Get started by adding your first one.
+          </p>
+        </div>
+        <div class="row">
+          <button class="button button-block button-positive col" ui-sref="tabs.addressbook.add" translate>Add Contact</button>
+        </div>
       </div>
     </div>
   </ion-content>
diff --git a/src/sass/views/address-book.scss b/src/sass/views/address-book.scss
index fe3f5834b..24019b52e 100644
--- a/src/sass/views/address-book.scss
+++ b/src/sass/views/address-book.scss
@@ -9,7 +9,7 @@
   }
   #add-contact{
     img{
-      width: 6rem;
+      width: 10rem;
       display: inline-block;
     }
     a{

From 11a7e96c0842425d912eefc6e8ad02eb74097fb6 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 28 Sep 2016 11:08:08 -0300
Subject: [PATCH 41/47] Fix flow for bitpay card

---
 public/views/bitpayCard.html      | 13 +++++------
 public/views/tab-home.html        |  2 +-
 src/js/controllers/bitpayCard.js  | 34 ++++++++++++++--------------
 src/js/controllers/tab-home.js    |  2 +-
 src/js/routes.js                  | 37 ++++++++++++++-----------------
 src/js/services/profileService.js |  2 +-
 6 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html
index 9e10307a7..5480dc787 100644
--- a/public/views/bitpayCard.html
+++ b/public/views/bitpayCard.html
@@ -1,19 +1,16 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-buttons side="primary">
-      <button class="button button-clear" ui-sref="tabs.home">
-        Close
-      </button>
-    </ion-nav-buttons>
+    <ion-nav-back-button>
+    </ion-nav-back-button>
     <ion-nav-title>BitPay Card</ion-nav-title>
     <ion-nav-buttons side="secondary">
-      <button class="button button-clear" ui-sref="bitpayCard.preferences">
-        <i class="icon ion-gear-b"></i>
+      <button class="button back-button">
+        <i class="icon ion-ios-search-strong"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
 
-  <ion-content ng-controller="bitpayCardController as bitpayCard" ng-init="bitpayCard.init()">
+  <ion-content>
 
     <div class="box-notification warning" ng-show="network == 'testnet'">
       Sandbox version. Only for testing purpose
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index e17426e5b..2a92cc6de 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -76,7 +76,7 @@
         </p>
         <i class="icon nav-item-arrow-right"></i>
       </a>
-      <a ui-sref="bitpayCard.main"
+      <a ui-sref="tabs.bitpayCard"
          ng-if="externalServices.BitpayCard"
          class="item item-icon-left item-big-icon-left item-icon-right">
         <i class="icon big-icon-svg">
diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index fe199d85d..752c91fa7 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -98,23 +98,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
     });
   };
 
-  this.init = function() {
-    $scope.dateRange = 'last30Days';
-
-    $scope.network = bitpayCardService.getEnvironment();
-    $scope.wallets = profileService.getWallets({
-      network: $scope.network,
-      onlyComplete: true
-    });
-
-    self.update();
-
-    wallet = $scope.wallets[0];
-
-    if (wallet && wallet.credentials.n > 1)
-      self.isMultisigWallet = true;
-  };
-
   this.sendFunds = function() {
     if (lodash.isEmpty(wallet)) return;
 
@@ -258,5 +241,22 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
     return tx.description;
   };
 
+  $scope.$on("$ionicView.beforeEnter", function(event, data){
+    $scope.dateRange = 'last30Days';
+
+    $scope.network = bitpayCardService.getEnvironment();
+    $scope.wallets = profileService.getWallets({
+      network: $scope.network,
+      onlyComplete: true
+    });
+
+    self.update();
+
+    wallet = $scope.wallets[0];
+
+    if (wallet && wallet.credentials.n > 1)
+      self.isMultisigWallet = true;
+  });
+
 });
 
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 41444b0d9..ae0f7cb3c 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         });
       }
 
-      $state.go('tabs.details', {
+      $state.go('tabs.wallet', {
         walletId: wallet.credentials.walletId
       });
     };
diff --git a/src/js/routes.js b/src/js/routes.js
index ba828213c..e81fa76b2 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -150,10 +150,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      *
      */
 
-    .state('tabs.details', {
-        url: '/details/{walletId}/{fromOnboarding}',
+    .state('tabs.wallet', {
+        url: '/wallet/{walletId}/{fromOnboarding}',
         views: {
-          'tab-home': {
+          'tab-home@tabs': {
             controller: 'walletDetailsController',
             templateUrl: 'views/walletDetails.html'
           }
@@ -166,7 +166,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.activity', {
         url: '/activity',
         views: {
-          'tab-home': {
+          'tab-home@tabs': {
             controller: 'activityController',
             templateUrl: 'views/activity.html',
           }
@@ -175,7 +175,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.proposals', {
         url: '/proposals',
         views: {
-          'tab-home': {
+          'tab-home@tabs': {
             controller: 'proposalsController',
             templateUrl: 'views/proposals.html',
           }
@@ -836,29 +836,26 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
 
-    /*
-     *
-     * BitPay Card
-     *
-     */
+      /*
+       *
+       * BitPay Card
+       *
+       */
 
-    .state('bitpayCard', {
-        url: '/bitpayCard',
-        abstract: true,
-        template: '<ion-nav-view name="bitpayCard"></ion-nav-view>'
-      })
-      .state('bitpayCard.main', {
-        url: '/main',
+      .state('tabs.bitpayCard', {
+        url: '/bitpay-card',
         views: {
-          'bitpayCard': {
+          'tab-home@tabs': {
+            controller: 'bitpayCardController',
+            controllerAs: 'bitpayCard',
             templateUrl: 'views/bitpayCard.html'
           }
         }
       })
-      .state('bitpayCard.preferences', {
+      .state('tabs.bitpayCard.preferences', {
         url: '/preferences',
         views: {
-          'bitpayCard': {
+          'tab-home@tabs': {
             templateUrl: 'views/preferencesBitpayCard.html'
           }
         }
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 0dea73fb0..ace8bbb11 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -833,7 +833,7 @@ angular.module('copayApp.services')
 
           x.action = function() {
             // TODO?
-            // $state.go('tabs.details', {
+            // $state.go('tabs.wallet', {
             //   walletId: x.walletId,
             //   txpId: x.txpId,
             //   txid: x.txid,

From 1ac78c21a5101575e06d0464c4140f418c14b3e6 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 28 Sep 2016 17:51:45 -0300
Subject: [PATCH 42/47] New send flow for bitpay card. Fix paypro txStatus.
 Minor bug fixes

---
 public/views/amount.html              | 11 ++--
 public/views/bitpayCard.html          |  2 +-
 public/views/confirm.html             | 21 +++++---
 public/views/modals/paypro.html       | 77 +++++++++++++--------------
 public/views/modals/tx-status.html    | 15 +++---
 src/js/controllers/amount.js          | 69 ++++++++++++++++++------
 src/js/controllers/confirm.js         | 23 ++++----
 src/js/controllers/modals/txStatus.js | 15 ++++--
 src/js/controllers/tabsController.js  |  2 +
 src/js/routes.js                      | 18 +++++++
 src/sass/common.scss                  | 13 +++++
 src/sass/views/amount.scss            |  3 ++
 src/sass/views/confirm.scss           |  3 ++
 13 files changed, 182 insertions(+), 90 deletions(-)

diff --git a/public/views/amount.html b/public/views/amount.html
index 207ca5c11..07460c375 100644
--- a/public/views/amount.html
+++ b/public/views/amount.html
@@ -12,10 +12,15 @@
     <div>
       <div class="item item-no-bottom-border" translate>Recipient</div>
 
-      <div class="item item-text-wrap item-icon-left bitcoin-address">
+      <div class="item item-text-wrap item-icon-left item-big-icon-left bitcoin-address">
         <i ng-if="isWallet" class="icon ion-briefcase size-21"></i>
-        <gravatar ng-if="!isWallet" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
-        <span>{{toName || toAddress}}</span>
+        <span ng-if="!isWallet">
+          <gravatar ng-if="!isCard" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
+          <i ng-if="isCard" class="icon big-icon-svg">
+            <div class="bg icon-bitpay-card"></div>
+          </i>
+        </span>
+        <span ng-class="{'m10l':isCard}">{{toName || toAddress}}</span>
       </div>
     </div>
 
diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html
index 5480dc787..2b15d9aa6 100644
--- a/public/views/bitpayCard.html
+++ b/public/views/bitpayCard.html
@@ -101,7 +101,7 @@
           </div>
         </div>
         <div class="camera-icon" ng-show="bitpayCard.bitpayCardCurrentBalance">
-          <a ng-click="addFunds = true">
+          <a ui-sref="tabs.bitpayCard.amount({'isCard': true, 'toName': 'BitPay Card'})">
             <i class="icon ion-plus size-21"></i>
           </a>
         </div>
diff --git a/public/views/confirm.html b/public/views/confirm.html
index 721ef18c8..aa039f4b4 100644
--- a/public/views/confirm.html
+++ b/public/views/confirm.html
@@ -26,14 +26,21 @@
 
       <div class="item item-icon-left">
         <i ng-if="isWallet" class="icon ion-briefcase size-21"></i>
-        <gravatar ng-if="!isWallet" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
-        <span translate>To</span>: {{toAddress}}
-        <p ng-show="toName">{{toName}}</p>
+        <div ng-if="!isWallet">
+          <gravatar ng-if="!isCard" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
+          <i ng-if="isCard" class="icon big-icon-svg">
+            <div class="bg icon-bitpay-card"></div>
+          </i>
+        </div>
+        <div ng-class="{'m10l':isCard}">
+          <span translate>To</span>: {{toAddress}}
+          <p ng-show="toName">{{toName}}</p>
 
-        <div ng-show="_paypro" ng-click="openPPModal(_paypro)">
-            <i ng-show="_paypro.verified && _paypro.caTrusted" class="ion-locked" style="color:green"></i>
-            <i ng-show="!_paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
-              {{_paypro.domain}}
+          <div ng-show="_paypro" ng-click="openPPModal(_paypro)">
+              <i ng-show="_paypro.verified && _paypro.caTrusted" class="ion-locked" style="color:green"></i>
+              <i ng-show="!_paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
+                {{_paypro.domain}}
+          </div>
         </div>
       </div>
     </div>
diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html
index 20eecb676..e3fc96488 100644
--- a/public/views/modals/paypro.html
+++ b/public/views/modals/paypro.html
@@ -1,60 +1,57 @@
 <ion-modal-view ng-controller="payproController">
-  <ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
-    <div class="left-small">
-      <a ng-click="cancel()" class="p10">
-        <span class="text-close" translate>Close</span>
-      </a>
+  <ion-header-bar align-title="center" class="bar-royal" ng-style="{'background-color': color}">
+    <button class="button button-clear" ng-click="cancel()">
+      {{'Close' | translate}}
+    </button>
+    <div class="title" translate>
+      Payment request
     </div>
-    <h1 class="title ellipsis" translate>Payment request</h1>
   </ion-header-bar>
 
-  <ion-content ng-style="{'background-color': '#F6F7F9'}">
-    <div class="modal-content">
-      <div class="header-modal text-center p50t">
-        <div class="size-42">
-          {{amountStr}}
-        </div>
-      </div>
+  <ion-content>
+    <div class="header-modal text-center size-42">
+      {{amountStr}}
+    </div>
 
-      <h4 class="title m10l" translate>Details</h4>
-      <ul class="no-bullet size-14 m10t">
-        <li class="line-b p10 oh">
-        <span class="text-gray" translate>Pay To</span>
-        <span class="right enable_text_select">{{_paypro.domain}}</span>
-        </li>
-        <li class="line-b p10 oh" ng-if="_paypro.toAddress">
-        <span class="text-gray" translate>Address</span>
-        <span class="right enable_text_select">{{_paypro.toAddress}}</span>
-        </li>
-        <li class="line-b p10 oh">
-        <span class="text-gray" translate>Certified by</span>
-        <span class="right text-right">
+    <div class="list">
+      <div class="item item-divider" translate>
+        Details
+      </div>
+      <div class="item">
+        {{'Pay To'|translate}}
+        <span class="item-note">{{_paypro.domain}}</span>
+      </div>
+      <div class="item" ng-if="_paypro.toAddress">
+        {{'Address'|translate}}
+        <span class="item-note">{{_paypro.toAddress}}</span>
+      </div>
+      <div class="item">
+        {{'Certified by'|translate}}
+        <span class="item-note">
           <span ng-show="_paypro.caTrusted">
-            <i class="fi-lock color-greeni"></i>
+            <i class="ion-locked" style="color:green"></i>
             {{_paypro.caName}}<br>
             <span translate>(Trusted)</span>
           </span>
           <span ng-show="!_paypro.caTrusted">
             <span ng-show="_paypro.selfSigned">
-              <i class="fi-unlock color-yellowi"></i> <span translate>Self-signed Certificate</span>
+              <i class="ion-unlocked" style="color:red"></i> <span translate>Self-signed Certificate</span>
             </span>
             <span ng-show="!_paypro.selfSigned">
-              <i class="fi-unlock color-yellowi"></i>{{_paypro.caName}}<br>
+              <i class="ion-locked" style="color:yellow"></i>{{_paypro.caName}}<br>
               <span translate>WARNING: UNTRUSTED CERTIFICATE</span>
             </span>
           </span>
         </span>
-        </li>
-        <li class="line-b p10 oh" ng-if="_paypro.memo">
-        <span class="text-gray" translate>Memo</span>
-        <span class="right">{{_paypro.memo}}</span>
-        </li>
-        <li class="line-b p10 oh" ng-if="_paypro.expires">
-        <span class="text-gray" translate>Expires</span>
-        <span class="right">{{_paypro.expires * 1000 | amTimeAgo }}</span>
-        </li>
-      </ul>
+      </div>
+      <div class="item" ng-if="_paypro.memo">
+        {{'Memo'|translate}}
+        <span class="item-note wrapword">{{_paypro.memo}}</span>
+      </div>
+      <div class="item" ng-if="_paypro.expires">
+        {{'Expires'|translate}}
+        <span class="item-note">{{_paypro.expires * 1000 | amTimeAgo }}</span>
+      </div>
     </div>
-    <div class="extra-margin-bottom"></div>
   </ion-content>
 </ion-modal-view>
diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html
index 6d808fafb..426c762af 100644
--- a/public/views/modals/tx-status.html
+++ b/public/views/modals/tx-status.html
@@ -4,13 +4,14 @@
     <div ng-show="tx.amountStr" class="m20t size-36">
       {{tx.amountStr}}
     </div>
-    <div class="size-16 text-gray m10v">
-      <span translate>Sent</span>
+    <div class="size-24 text-gray m20v">
+      <span ng-if="!fromBitPayCard" translate>Sent</span>
+      <span ng-if="fromBitPayCard" translate>Funds sent</span>
     </div>
-    <div class="text-center m20t" ng-if="entryExist || !fromSendTab">
+    <div class="text-center m20t" ng-if="entryExist || !fromSendTab || fromPayPro">
       <a class="button button-positive" ng-click="cancel()" translate>OKAY</a>
     </div>
-    <div class="collect-address" ng-if="!entryExist && fromSendTab">
+    <div class="collect-address" ng-if="!entryExist && fromSendTab && !fromPayPro">
       <div class="row">
         <p translate class="col">Would you like to add this address to your address book?</p>
       </div>
@@ -40,7 +41,7 @@
 
   <div ng-if="type == 'created'" class="popup-txsigned text-center m30tp">
     <i class="icon ion-checkmark-round"></i>
-    <div class="text-center size-18 tu text-bold m20t">
+    <div class="text-center size-24 tu text-bold m20v">
       <span translate>Payment Proposal Created</span>
     </div>
     <div class="text-center">
@@ -52,7 +53,7 @@
 
   <div ng-if="type == 'accepted'" class="popup-txsigned text-center m30tp">
     <i class="icon ion-checkmark-round"></i>
-    <div class="text-center size-18 tu text-bold m20t">
+    <div class="text-center size-24 tu text-bold m20v">
       <span translate>Payment Accepted</span>
     </div>
     <div class="text-center">
@@ -62,7 +63,7 @@
 
   <div ng-if="type=='rejected'" class="popup-txrejected text-center m30tp">
     <i class="icon ion-close-round"></i>
-    <div class="text-center size-18 tu text-bold m20t">
+    <div class="text-center size-24 tu text-bold m20v">
       <span translate>Payment Rejected</span>
     </div>
     <div class="text-center">
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index c8e3abf4e..8478aaaec 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService) {
+angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, bitpayCardService, popupService) {
 
   var unitToSatoshi;
   var satToUnit;
@@ -10,18 +10,20 @@ angular.module('copayApp.controllers').controller('amountController', function($
   var SMALL_FONT_SIZE_LIMIT = 13;
   var LENGTH_EXPRESSION_LIMIT = 19;
 
-  $scope.isWallet = $stateParams.isWallet;
-  $scope.toAddress = $stateParams.toAddress;
-  $scope.toName = $stateParams.toName;
-  $scope.toEmail = $stateParams.toEmail;
-
   $scope.$on('$ionicView.leave', function() {
     angular.element($window).off('keydown');
   });
 
   $scope.$on("$ionicView.enter", function(event, data) {
 
-    if (!$stateParams.toAddress) {
+    $scope.isWallet = data.stateParams.isWallet;
+    $scope.isCard = data.stateParams.isCard;
+    $scope.toAddress = data.stateParams.toAddress;
+    $scope.toName = data.stateParams.toName;
+    $scope.toEmail = data.stateParams.toEmail;
+    $scope.showAlternativeAmount = !!$scope.isCard;
+
+    if (!$scope.isCard && !$stateParams.toAddress) {
       $log.error('Bad params at amount')
       throw ('bad params');
     }
@@ -97,7 +99,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
   };
 
   $scope.pushOperator = function(operator) {
-    console.log('[amount.js.90:operator:]', operator); //TODO
     if (!$scope.amount || $scope.amount.length == 0) return;
     $scope.amount = _pushOperator($scope.amount);
 
@@ -185,14 +186,50 @@ angular.module('copayApp.controllers').controller('amountController', function($
 
   $scope.finish = function() {
     var _amount = evaluate(format($scope.amount));
-    var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals);
 
-    $state.transitionTo('tabs.send.confirm', {
-      isWallet: $scope.isWallet,
-      toAmount: amount * unitToSatoshi,
-      toAddress: $scope.toAddress,
-      toName: $scope.toName,
-      toEmail: $scope.toEmail
-    });
+    if ($scope.isCard) {
+      var amountUSD = $scope.showAlternativeAmount ? _amount : $filter('formatFiatAmount')(toFiat(_amount));
+
+      var dataSrc = {
+        amount: amountUSD,
+        currency: 'USD'
+      };
+      ongoingProcess.set('Processing Transaction...', true);
+      $timeout(function() {
+
+        bitpayCardService.topUp(dataSrc, function(err, invoiceId) {
+          if (err) {
+            ongoingProcess.set('Processing Transaction...', false);
+            popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
+            return;
+          }
+
+          bitpayCardService.getInvoice(invoiceId, function(err, data) {
+            ongoingProcess.set('Processing Transaction...', false);
+            if (err) {
+              popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
+              return;
+            }
+            var payProUrl = data.paymentUrls.BIP73;
+
+            $state.transitionTo('tabs.bitpayCard.confirm', {
+              isCard: $scope.isCard,
+              toName: $scope.toName,
+              paypro: payProUrl
+            });
+          });
+        });
+      });
+
+    } else {
+      var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals);
+      $state.transitionTo('tabs.send.confirm', {
+        isWallet: $scope.isWallet,
+        toAmount: amount * unitToSatoshi,
+        toAddress: $scope.toAddress,
+        toName: $scope.toName,
+        toEmail: $scope.toEmail
+      });
+    }
   };
 });
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 0b6654842..1a73ddd2d 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -4,15 +4,15 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   var cachedTxp = {};
   var isChromeApp = platformInfo.isChromeApp;
 
-  $scope.isWallet = $stateParams.isWallet;
-  $scope.toAmount = $stateParams.toAmount;
-  $scope.toAddress = $stateParams.toAddress;
-  $scope.toName = $stateParams.toName;
-  $scope.toEmail = $stateParams.toEmail;
-  $scope.description = $stateParams.description;
-  $scope.paypro = $stateParams.paypro;
-
   $scope.$on("$ionicView.enter", function(event, data) {
+    $scope.isWallet = data.stateParams.isWallet;
+    $scope.isCard = data.stateParams.isCard;
+    $scope.toAmount = data.stateParams.toAmount;
+    $scope.toAddress = data.stateParams.toAddress;
+    $scope.toName = data.stateParams.toName;
+    $scope.toEmail = data.stateParams.toEmail;
+    $scope.description = data.stateParams.description;
+    $scope.paypro = data.stateParams.paypro;
     initConfirm();
   });
 
@@ -243,7 +243,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
     walletService.createTx(wallet, txp, function(err, ctxp) {
       if (err) {
-        return setSendError(err);
+        setSendError(err);
+        return cb(err);
       }
       return cb(null, ctxp);
     });
@@ -312,8 +313,4 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       if (err) return setSendError(err);
     });
   };
-
-  $scope.cancel = function() {
-    $state.go('tabs.send');
-  };
 });
diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js
index 9b9cdd7e4..6ac660181 100644
--- a/src/js/controllers/modals/txStatus.js
+++ b/src/js/controllers/modals/txStatus.js
@@ -1,9 +1,13 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $ionicHistory, $log, addressbookService) {
+angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $stateParams, $ionicHistory, $log, addressbookService) {
 
   if ($scope.cb) $timeout($scope.cb, 100);
-  $scope.fromSendTab = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount" ||  "tabs.send";
+
+  var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName;
+  $scope.fromSendTab = previousView.match(/tabs.send/) ? true : false;
+  $scope.fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false;
+  $scope.fromPayPro = $stateParams.paypro ? true : false;
 
   $scope.cancel = function() {
     $scope.txStatusModal.hide();
@@ -13,6 +17,11 @@ angular.module('copayApp.controllers').controller('txStatusController', function
       $timeout(function() {
         $state.transitionTo('tabs.home');
       }, 100);
+    } else if ($scope.fromBitPayCard) {
+      $ionicHistory.removeBackView();
+      $timeout(function() {
+        $state.transitionTo('tabs.bitpayCard');
+      }, 100);
     }
   };
 
@@ -24,7 +33,7 @@ angular.module('copayApp.controllers').controller('txStatusController', function
     });
     $ionicHistory.removeBackView();
     $state.go('tabs.send.addressbook', {
-      fromSendTab: true,
+      fromSendTab: $scope.fromSendTab,
       addressbookEntry: addressbookEntry
     });
   }
diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js
index bfb12da45..3e93df45d 100644
--- a/src/js/controllers/tabsController.js
+++ b/src/js/controllers/tabsController.js
@@ -33,6 +33,8 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro
     'tabs.preferences.backup',
     'tabs.receive.backupWarning',
     'tabs.receive.backup',
+    'tabs.bitpayCard.amount',
+    'tabs.bitpayCard.confirm',
   ];
 
   $rootScope.$on('$ionicView.beforeEnter', function() {
diff --git a/src/js/routes.js b/src/js/routes.js
index e81fa76b2..b8301f47f 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -852,6 +852,24 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           }
         }
       })
+      .state('tabs.bitpayCard.amount', {
+        url: '/amount/:isCard/:toName',
+        views: {
+          'tab-home@tabs': {
+            controller: 'amountController',
+            templateUrl: 'views/amount.html'
+          }
+        }
+      })
+      .state('tabs.bitpayCard.confirm', {
+        url: '/confirm/:isCard/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro',
+        views: {
+          'tab-home@tabs': {
+            controller: 'confirmController',
+            templateUrl: 'views/confirm.html'
+          }
+        }
+      })
       .state('tabs.bitpayCard.preferences', {
         url: '/preferences',
         views: {
diff --git a/src/sass/common.scss b/src/sass/common.scss
index b2a7677af..23da004f3 100644
--- a/src/sass/common.scss
+++ b/src/sass/common.scss
@@ -116,3 +116,16 @@ ion-header-bar{
 .card{
   box-shadow:  0 2px 3px rgba(0, 0, 0, 0.3);
 }
+
+/* Wrap text from item-note */
+.item-note{
+  white-space: -moz-pre-wrap !important;
+  white-space: -pre-wrap;
+  white-space: -o-pre-wrap;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  white-space: -webkit-pre-wrap;
+  word-break: break-all;
+  white-space: normal;
+}
+
diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
index e459a46dd..83f1c3b14 100644
--- a/src/sass/views/amount.scss
+++ b/src/sass/views/amount.scss
@@ -1,4 +1,7 @@
 #view-amount {
+  .icon-bitpay-card {
+    background-image: url("../img/icon-bitpay.svg");
+  }
   @media(max-width: 480px) {
     .bitcoin-address {
       .icon {
diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss
index 425850d92..667184165 100644
--- a/src/sass/views/confirm.scss
+++ b/src/sass/views/confirm.scss
@@ -1,4 +1,7 @@
 #view-confirm {
+  .icon-bitpay-card {
+    background-image: url("../img/icon-bitpay.svg");
+  }
   .slide-to-pay{
     bottom: 149px;
   }

From da931600e279bad0379b1b4860d7951a1cd7b333 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 28 Sep 2016 19:28:54 -0300
Subject: [PATCH 43/47] Fix main view of the bitpay card

---
 public/views/bitpayCard.html     | 92 +++++++-------------------------
 src/js/controllers/bitpayCard.js | 75 --------------------------
 src/sass/views/bitpayCard.scss   | 12 ++++-
 3 files changed, 30 insertions(+), 149 deletions(-)

diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html
index 2b15d9aa6..d28fa3700 100644
--- a/public/views/bitpayCard.html
+++ b/public/views/bitpayCard.html
@@ -1,4 +1,4 @@
-<ion-view>
+<ion-view id="bitpayCard">
   <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
     </ion-nav-back-button>
@@ -12,7 +12,7 @@
 
   <ion-content>
 
-    <div class="box-notification warning" ng-show="network == 'testnet'">
+    <div class="box-notification warning m0" ng-show="network == 'testnet'">
       Sandbox version. Only for testing purpose
     </div>
 
@@ -89,30 +89,21 @@
         </form>
     </div>
 
-    <div ng-show="bitpayCard.bitpayCardAuthenticated && !bitpayCard.visaCardActivated && !addFunds">
-      <div id="bitpayCard" class="oh pr">
+    <div ng-show="bitpayCard.bitpayCardAuthenticated">
+      <div class="oh pr">
         <div class="amount">
-          <div ng-show="!loadingHistory && bitpayCard.bitpayCardCurrentBalance" ng-click="bitpayCard.update()">
-            <strong class="size-36">${{bitpayCard.bitpayCardCurrentBalance}}</strong>
-            <div class="size-12">Available balance</div>
+          <div ng-if="!loadingHistory && bitpayCard.bitpayCardCurrentBalance" ng-click="bitpayCard.update()">
+            <div class="size-36 m20b">${{bitpayCard.bitpayCardCurrentBalance}}</div>
+            <a class="button button-positive button-small" ui-sref="tabs.bitpayCard.amount({'isCard': true, 'toName': 'BitPay Card'})">
+              <i class="icon ion-ios-plus-empty"></i> {{'Add Funds'|translate}}
+            </a>
           </div>
-          <div ng-show="loadingHistory">
+          <div ng-if="loadingHistory" class="m20t">
             <strong class="size-36">...</strong>
           </div>
         </div>
-        <div class="camera-icon" ng-show="bitpayCard.bitpayCardCurrentBalance">
-          <a ui-sref="tabs.bitpayCard.amount({'isCard': true, 'toName': 'BitPay Card'})">
-            <i class="icon ion-plus size-21"></i>
-          </a>
-        </div>
       </div>
 
-      <select class="m10" ng-model="dateRange" ng-change="bitpayCard.update(dateRange)">
-        <option value="last30Days">Recent Activity</option>
-        <option value="lastMonth">Last Month</option>
-        <option value="all">All Activity</option>
-      </select>
-
       <div
         class="oh pr m20t text-gray size-12 text-center"
         ng-show="!bitpayCard.bitpayCardTransactionHistory[0] &&
@@ -124,12 +115,19 @@
         <i class="icon ion-android-sync"></i>
       </div>
 
-      <div class="card list" ng-show="!loadingHistory">
+      <div class="list" ng-show="!loadingHistory">
+        <div class="item item-divider">
+        <select class="select-style" ng-model="dateRange" ng-change="bitpayCard.update(dateRange)">
+          <option value="last30Days">Recent Activity</option>
+          <option value="lastMonth">Last Month</option>
+          <option value="all">All Activity</option>
+        </select>
+        </div>
         <div
           ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']"
           class="item row"
           ng-init="bitpayCard.getMerchantInfo(tx)">
-          <div class="col" ng-init="icon = bitpayCard.getIconName(tx)">
+          <div class="col col-10" ng-init="icon = bitpayCard.getIconName(tx)">
             <img class="m5t" ng-src="img/mcc-icons/{{icon}}.svg" width="22">
           </div>
 
@@ -143,7 +141,7 @@
           </div>
           <div
             ng-init="desc = bitpayCard.processDescription(tx)"
-            class="col">
+            class="col size-12">
             {{desc}}
           </div>
           <div class="col">
@@ -162,55 +160,5 @@
         </div>
       </div>
     </div>
-
-    <div ng-show="bitpayCard.bitpayCardAuthenticated && !bitpayCard.visaCardActivated && addFunds">
-        <form
-           name="createInvoiceForm"
-           ng-submit="bitpayCard.sendFunds()"
-           novalidate>
-
-          <div class="card list">
-            <label class="item item-input item-stacked-label">
-              <span class="input-label">Amount</span>
-              <input
-                    type="number"
-                    id="fiat"
-                    name="fiat"
-                    ng-attr-placeholder="{{'Amount in USD'}}"
-                    min="0.01"
-                    max="2000"
-                    ng-model="fiat"
-                    autocomplete="off"
-                    required>
-              <a class="postfix">USD</a>
-            </label>
-
-            <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
-
-          </div>
-
-          <p class="size-12 text-warning" ng-show="bitpayCard.isMultisigWallet">
-            You selected a multisignature wallet. Please note that the transaction will only appear on your card's
-            Activity when the payment is fully signed.
-          </p>
-
-          <div class="row">
-            <div class="col">
-              <button class="button button-block button-light"
-                      type="button"
-                      ng-click="addFunds = false; fiat = null">
-                Cancel
-              </button>
-            </div>
-            <div class="col">
-              <button class="button button-block button-positive"
-                      ng-disabled="!fiat"
-                      type="submit">
-                Send
-              </button>
-            </div>
-          </div>
-        </form>
-    </div>
   </ion-content>
 </ion-view>
diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index 752c91fa7..4479b8a3a 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -98,81 +98,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
     });
   };
 
-  this.sendFunds = function() {
-    if (lodash.isEmpty(wallet)) return;
-
-    if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
-      $log.info('No signing proposal: No private key');
-      popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg('MISSING_PRIVATE_KEY'));
-      return;
-    }
-
-    var dataSrc = {
-      amount: $scope.fiat,
-      currency: 'USD'
-    };
-    var outputs = [];
-    var config = configService.getSync();
-    var configWallet = config.wallet;
-    var walletSettings = configWallet.settings;
-
-
-    ongoingProcess.set('Processing Transaction...', true);
-    $timeout(function() {
-
-      bitpayCardService.topUp(dataSrc, function(err, invoiceId) {
-        if (err) {
-          ongoingProcess.set('Processing Transaction...', false);
-          popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
-          return;
-        }
-
-        bitpayCardService.getInvoice(invoiceId, function(err, data) {
-          var address, comment, amount;
-
-          address = data.bitcoinAddress;
-          amount = parseInt((data.btcPrice * 100000000).toFixed(0));
-          comment = data.itemDesc;
-
-          outputs.push({
-            'toAddress': address,
-            'amount': amount,
-            'message': comment
-          });
-
-          var txp = {
-            toAddress: address,
-            amount: amount,
-            outputs: outputs,
-            message: comment,
-            payProUrl: null,
-            excludeUnconfirmedUtxos: configWallet.spendUnconfirmed ? false : true,
-            feeLevel: walletSettings.feeLevel || 'normal'
-          };
-
-          walletService.createTx(wallet, txp, function(err, createdTxp) {
-            ongoingProcess.set('Processing Transaction...', false);
-            if (err) {
-              popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
-              return;
-            }
-            walletService.publishAndSign(wallet, createdTxp, function(err, tx) {
-              if (err) {
-                popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
-                return;
-              }
-              self.update();
-              $scope.addFunds = false;
-              $timeout(function() {
-                $scope.$digest();
-              });
-            });
-          });
-        });
-      });
-    }, 100);
-  };
-
   this.authenticate = function() {
 
     var data = {
diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss
index 4d431a4d4..5d7b045b6 100644
--- a/src/sass/views/bitpayCard.scss
+++ b/src/sass/views/bitpayCard.scss
@@ -3,8 +3,7 @@
     width: 100%;
     text-align: center;
     padding: 2rem 1rem 1.5rem 1rem;
-    min-height: 115px;
-    margin-bottom: 25px;
+    min-height: 140px;
     border-color: #172565;
     background-color: #1e3186;
     background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%);
@@ -13,4 +12,13 @@
   strong {
     line-height: 100%;
   }
+  .select-style {
+    border: none;
+    box-shadow: none;
+    background-color: transparent;
+    background-image: none;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+  }
 }

From 104209de5de62a505dd0dce2526b56f3a4d7002c Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 28 Sep 2016 21:09:41 -0300
Subject: [PATCH 44/47] Enable cache for bitpay card

---
 public/views/bitpayCard.html                | 26 ++++++------
 public/views/tab-home.html                  |  3 +-
 src/js/controllers/bitpayCard.js            | 46 +++++++++------------
 src/js/controllers/preferencesBitpayCard.js |  5 ++-
 src/js/controllers/tab-home.js              | 12 +++++-
 src/js/services/bitpayCardService.js        | 30 ++++++++++++++
 src/js/services/storageService.js           | 12 ++++++
 7 files changed, 90 insertions(+), 44 deletions(-)

diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html
index d28fa3700..ab8457b30 100644
--- a/public/views/bitpayCard.html
+++ b/public/views/bitpayCard.html
@@ -3,9 +3,9 @@
     <ion-nav-back-button>
     </ion-nav-back-button>
     <ion-nav-title>BitPay Card</ion-nav-title>
-    <ion-nav-buttons side="secondary">
-      <button class="button back-button">
-        <i class="icon ion-ios-search-strong"></i>
+    <ion-nav-buttons side="secondary" ng-show="bitpayCard.bitpayCardAuthenticated">
+      <button class="button back-button" ui-sref="tabs.bitpayCard.preferences">
+        <i class="icon ion-ios-gear-outline"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
@@ -32,7 +32,7 @@
         <form
              ng-show="!bitpayCard.bitpayCardTwoFactorPending"
              name="authenticateForm"
-             ng-submit="bitpayCard.authenticate()"
+             ng-submit="bitpayCard.authenticate(email, password)"
              novalidate>
 
           <div class="card list">
@@ -68,7 +68,7 @@
         <form
              ng-show="bitpayCard.bitpayCardTwoFactorPending"
              name="authenticate2FAForm"
-             ng-submit="bitpayCard.authenticate2FA()"
+             ng-submit="bitpayCard.authenticate2FA(twoFactorCode)"
              novalidate>
 
           <div class="list">
@@ -98,24 +98,22 @@
               <i class="icon ion-ios-plus-empty"></i> {{'Add Funds'|translate}}
             </a>
           </div>
-          <div ng-if="loadingHistory" class="m20t">
+          <div ng-if="loadingHistory" class="m10t">
             <strong class="size-36">...</strong>
           </div>
         </div>
       </div>
 
       <div
-        class="oh pr m20t text-gray size-12 text-center"
+        class="m10t text-center padding"
         ng-show="!bitpayCard.bitpayCardTransactionHistory[0] &&
-        !bitpayCard.bitpayCardInvoiceHistory[0] && !loadingHistory">
-        No transactions yet
+        !bitpayCard.bitpayCardInvoiceHistory[0] && (!loadingHistory || !bitpayCardCached)">
+        <i class="icon ion-ios-arrow-thin-up size-24"></i>
+        <h1>Get started</h1>
+        <h4>Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.</h4>
       </div>
 
-      <div ng-show="loadingHistory" class="oh pr m20t text-gray text-center">
-        <i class="icon ion-android-sync"></i>
-      </div>
-
-      <div class="list" ng-show="!loadingHistory">
+      <div class="list" ng-if="bitpayCardCached">
         <div class="item item-divider">
         <select class="select-style" ng-model="dateRange" ng-change="bitpayCard.update(dateRange)">
           <option value="last30Days">Recent Activity</option>
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 2a92cc6de..d3592e704 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -83,7 +83,8 @@
           <div class="bg icon-bitpay-card"></div>
         </i>
         <h2>BitPay Card</h2>
-        <p translate>Add funds to get started</p>
+        <p ng-if="!bitpayCard" translate>Add funds to get started</p>
+        <span ng-if="bitpayCard">${{bitpayCard.balance}}</span>
         <i class="icon nav-item-arrow-right"></i>
       </a>
     </div>
diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index 4479b8a3a..54a9c09a5 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -3,15 +3,14 @@
 angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, pbkdf2Service, moment, popupService, gettextCatalog, bwcError) {
 
   var self = this;
-  var wallet;
+  $scope.dateRange = 'last30Days';
+  $scope.network = bitpayCardService.getEnvironment();
 
-  $scope.$on('Wallet/Changed', function(event, w) {
-    if (lodash.isEmpty(w)) {
-      $log.debug('No wallet provided');
-      return;
-    }
-    wallet = w;
-    $log.debug('Wallet changed: ' + w.name);
+  bitpayCardService.getCacheData(function(err, data) {
+    if (err || lodash.isEmpty(data)) return;
+    $scope.bitpayCardCached = true;
+    self.bitpayCardTransactionHistory = data.transactions;
+    self.bitpayCardCurrentBalance = data.balance;
   });
 
   var processTransactions = function(invoices, history) {
@@ -89,6 +88,14 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
 
             self.bitpayCardTransactionHistory = processTransactions(invoices, history.transactionList);
             self.bitpayCardCurrentBalance = history.currentCardBalance;
+
+            var cacheData = {
+              balance: self.bitpayCardCurrentBalance,
+              transactions: self.bitpayCardTransactionHistory
+            };
+            bitpayCardService.setCacheData(cacheData, function(err) {
+              if (err) $log.error(err);
+            });
           });
         });
       }
@@ -98,11 +105,11 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
     });
   };
 
-  this.authenticate = function() {
+  this.authenticate = function(email, password) {
 
     var data = {
-      emailAddress : $scope.email,
-      hashedPassword : pbkdf2Service.pbkdf2Sync($scope.password, '..............', 200, 64).toString('hex')
+      emailAddress : email,
+      hashedPassword : pbkdf2Service.pbkdf2Sync(password, '..............', 200, 64).toString('hex')
     };
 
     // POST /authenticate
@@ -123,10 +130,10 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
     });
   };
 
-  this.authenticate2FA = function() {
+  this.authenticate2FA = function(twoFactorCode) {
 
     var data = {
-      twoFactorCode : $scope.twoFactorCode
+      twoFactorCode : twoFactorCode
     };
 
     self.authenticating = true;
@@ -167,20 +174,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
   };
 
   $scope.$on("$ionicView.beforeEnter", function(event, data){
-    $scope.dateRange = 'last30Days';
-
-    $scope.network = bitpayCardService.getEnvironment();
-    $scope.wallets = profileService.getWallets({
-      network: $scope.network,
-      onlyComplete: true
-    });
-
     self.update();
-
-    wallet = $scope.wallets[0];
-
-    if (wallet && wallet.credentials.n > 1)
-      self.isMultisigWallet = true;
   });
 
 });
diff --git a/src/js/controllers/preferencesBitpayCard.js b/src/js/controllers/preferencesBitpayCard.js
index 9e4c9da8a..2abf6a8c4 100644
--- a/src/js/controllers/preferencesBitpayCard.js
+++ b/src/js/controllers/preferencesBitpayCard.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesBitpayCardController',
-  function($scope, $state, $timeout, bitpayCardService, popupService) {
+  function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService) {
 
     $scope.logout = function() {
       var title = 'Are you sure you would like to log out of your Bitpay Card account?';
@@ -12,8 +12,9 @@ angular.module('copayApp.controllers').controller('preferencesBitpayCardControll
 
     var logout = function() {
       bitpayCardService.logout(function() {
+        $ionicHistory.removeBackView();
         $timeout(function() {
-          $state.go('bitpayCard.main');
+          $state.go('tabs.home');
         }, 100);
       });
     };
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index ae0f7cb3c..0dec2cc7f 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('tabHomeController',
-  function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window) {
+  function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window, bitpayCardService) {
     var wallet;
     $scope.externalServices = {};
     $scope.bitpayCardEnabled = true; // TODO
@@ -206,7 +206,15 @@ angular.module('copayApp.controllers').controller('tabHomeController',
       });
     });
 
+    var bitpayCardCache = function() {
+      bitpayCardService.getCacheData(function(err, data) {
+        if (err || lodash.isEmpty(data)) return;
+        $scope.bitpayCard = data;
+      });
+    };
+
     $scope.$on("$ionicView.enter", function(event, data) {
+      $scope.bitpayCard = null;
       configService.whenAvailable(function() {
         var config = configService.getSync();
         var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
@@ -217,6 +225,8 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         $scope.bitpayCardEnabled = config.bitpayCard.enabled;
         $scope.nextStepEnabled = $scope.glideraEnabled || $scope.coinbaseEnabled || $scope.amazonEnabled || $scope.bitpayCardEnabled;
         $scope.recentTransactionsEnabled = config.recentTransactions.enabled;
+
+        if ($scope.bitpayCardEnabled) bitpayCardCache();
       });
       $scope.nextStep();
       $scope.updateAllWallets();
diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js
index d01b1cf89..c49bc5ffa 100644
--- a/src/js/services/bitpayCardService.js
+++ b/src/js/services/bitpayCardService.js
@@ -187,8 +187,38 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
     });
   };
 
+  root.getCacheData = function(cb) {
+    _setCredentials();
+    storageService.getBitpayCardCache(credentials.NETWORK, function(err, data) {
+      if (err) return cb(err);
+      if (lodash.isString(data)) {
+        data = JSON.parse(data);
+      }
+      data = data || {};
+      return cb(null, data);
+    });
+  };
+
+  root.setCacheData = function(data, cb) {
+    _setCredentials();
+    data = JSON.stringify(data);
+    storageService.setBitpayCardCache(credentials.NETWORK, data, function(err) {
+      if (err) return cb(err);
+      return cb();
+    });
+  };
+
+  root.removeCacheData = function(cb) {
+    _setCredentials();
+    storageService.removeBitpayCardCache(credentials.NETWORK, function(err) {
+      if (err) return cb(err);
+      return cb();
+    });
+  };
+
   root.logout = function(cb) {
     _setCredentials();
+    root.removeCacheData(function() {});
     storageService.removeBitpayCard(credentials.NETWORK, function(err) {
       $http(_getBitPay('/visa-api/logout')).then(function(data) {
         $log.info('BitPay Logout: SUCCESS');
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index a1daeb36e..3e07547ac 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -337,6 +337,18 @@ angular.module('copayApp.services')
       storage.remove('bitpayCard-' + network, cb);
     };
 
+    root.setBitpayCardCache = function(network, data, cb) {
+      storage.set('bitpayCardCache-' + network, data, cb);
+    };
+
+    root.getBitpayCardCache = function(network, cb) {
+      storage.get('bitpayCardCache-' + network, cb);
+    };
+
+    root.removeBitpayCardCache = function(network, cb) {
+      storage.remove('bitpayCardCache-' + network, cb);
+    };
+
     root.removeAllWalletData = function(walletId, cb) {
       root.clearLastAddress(walletId, function(err) {
         if (err) return cb(err);

From ec58b42f3ec36801824c0900e808f79c3f9638ce Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 29 Sep 2016 10:10:53 -0300
Subject: [PATCH 45/47] Fix gravatar on amount/confirm views

---
 public/views/amount.html      | 2 +-
 src/js/controllers/amount.js  | 2 +-
 src/js/controllers/confirm.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/views/amount.html b/public/views/amount.html
index 07460c375..8e961d3b7 100644
--- a/public/views/amount.html
+++ b/public/views/amount.html
@@ -12,7 +12,7 @@
     <div>
       <div class="item item-no-bottom-border" translate>Recipient</div>
 
-      <div class="item item-text-wrap item-icon-left item-big-icon-left bitcoin-address">
+      <div class="item item-text-wrap item-icon-left bitcoin-address" ng-class="{'item-big-icon-left':isCard}">
         <i ng-if="isWallet" class="icon ion-briefcase size-21"></i>
         <span ng-if="!isWallet">
           <gravatar ng-if="!isCard" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 8478aaaec..baa1cfdc4 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
     angular.element($window).off('keydown');
   });
 
-  $scope.$on("$ionicView.enter", function(event, data) {
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
 
     $scope.isWallet = data.stateParams.isWallet;
     $scope.isCard = data.stateParams.isCard;
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 1a73ddd2d..868a45856 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   var cachedTxp = {};
   var isChromeApp = platformInfo.isChromeApp;
 
-  $scope.$on("$ionicView.enter", function(event, data) {
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
     $scope.isWallet = data.stateParams.isWallet;
     $scope.isCard = data.stateParams.isCard;
     $scope.toAmount = data.stateParams.toAmount;

From 0798c6ed1ea98cee0234b1939792dd75004ad481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 29 Sep 2016 11:20:38 -0300
Subject: [PATCH 46/47] experimental feature disabled by default

---
 src/js/controllers/tab-home.js   | 8 +++++---
 src/js/services/configService.js | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 0dec2cc7f..2d05b9263 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -117,6 +117,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         });
       });
 
+      if (!$scope.recentTransactionsEnabled) return;
       $scope.fetchingNotifications = true;
       profileService.getNotifications({
         limit: 3
@@ -144,6 +145,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           return;
         }
         wallet.status = status;
+        updateTxps();
+
+        if (!$scope.recentTransactionsEnabled) return;
 
         $scope.fetchingNotifications = true;
         profileService.getNotifications({
@@ -155,8 +159,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
             return;
           }
           $scope.notifications = notifications;
-
-          updateTxps();
         })
       });
     };
@@ -208,7 +210,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
 
     var bitpayCardCache = function() {
       bitpayCardService.getCacheData(function(err, data) {
-        if (err || lodash.isEmpty(data)) return;
+        if (err ||  lodash.isEmpty(data)) return;
         $scope.bitpayCard = data;
       });
     };
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index f7728c6c5..19aa405a3 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -54,7 +54,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
     //Experimental Features
 
     recentTransactions: {
-      enabled: true
+      enabled: false //disabled by default
     },
 
     frequentlyUsed: {

From 3662f5c66b42d6a3e70eb274997466de8db0838b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 29 Sep 2016 12:58:07 -0300
Subject: [PATCH 47/47] show loading label if progress > 5

---
 public/views/walletDetails.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html
index 06ca6ca30..6f822579f 100644
--- a/public/views/walletDetails.html
+++ b/public/views/walletDetails.html
@@ -112,7 +112,7 @@
         translate>No transactions yet {{status.totalBalanceStr}}
       </div>
 
-      <div ng-show="updatingTxHistory" class="updatingHistory">
+      <div ng-show="updatingTxHistory && updatingTxHistoryProgress>5" class="updatingHistory">
         <div  class="row" >
             <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
         </div>