Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_push_notifications

# Conflicts:
#	public/views/onboarding/notifications.html
#	src/js/controllers/onboarding/collectEmail.js

Gruntfile.js

@@ -120,6 +120,7 @@ module.exports = function(grunt) {
           'bower_components/ng-csv/build/ng-csv.js',
           'bower_components/ionic-toast/dist/ionic-toast.bundle.min.js',
           'bower_components/angular-clipboard/angular-clipboard.js',
+          'bower_components/angular-md5/angular-md5.js',
           'bower_components/angular-mocks/angular-mocks.js',
           'angular-pbkdf2/angular-pbkdf2.js',
           'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js'

bower.json

@@ -18,7 +18,8 @@
     "trezor-connect": "~1.0.1",
     "ng-csv": "~0.3.6",
     "ionic-toast": "^0.4.1",
-    "angular-clipboard": "^1.4.2"
+    "angular-clipboard": "^1.4.2",
+    "angular-md5": "^0.1.10"
   },
   "resolutions": {
     "angular": "1.5.3"

public/views/addressbook.html

@@ -29,10 +29,11 @@
 
     <ion-list>
       <ion-item ng-repeat="addrEntry in addressbook"
-                class="item-icon-left item-icon-right"
+                class="item-icon-right item-avatar"
                 ui-sref="tabs.addressbook.view({address:addrEntry.address})">
-        <i class="icon ion-ios-person-outline"></i>
+        <gravatar name="{{addrEntry.name}}" width="50" email="{{addrEntry.email}}"></gravatar>
-        {{addrEntry.name}}
+        <h2>{{addrEntry.name}}</h2>
+        <p>{{addrEntry.address}}</p>
         <i class="icon nav-item-arrow-right"></i>
 
         <ion-option-button class="button-assertive" ng-click="remove(addrEntry.address)">

public/views/addressbook.view.html

@@ -12,6 +12,10 @@
 
   <ion-content>
 
+    <div class="gravatar-content">
+      <gravatar name="{{addressbookEntry.name}}" width="80" email="{{addressbookEntry.email}}"></gravatar>
+    </div>
+
     <div class="card">
       <div class="item item-text-wrap">
         <h3 translate>Name</h3>

public/views/amount.html

@@ -13,7 +13,7 @@
       <div class="item item-no-bottom-border" translate>Recipient</div>
 
       <div class="item item-text-wrap item-icon-left bitcoin-address">
-        <i class="icon ion-ios-person-outline"></i>
+        <gravatar class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
         <span>{{toName || toAddress}}</span>
       </div>
     </div>

public/views/confirm.html

@@ -1,4 +1,4 @@
-<ion-view>
+<ion-view id="view-confirm">
   <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
       <i class="icon ion-ios-arrow-thin-left"></i>
@@ -23,7 +23,7 @@
       </div>
 
       <div class="item item-icon-left">
-        <i class="icon ion-ios-person-outline"></i>
+        <gravatar class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
         <label translate>To</label> {{toAddress}}
         <p ng-show="toName">{{toName}}</p>
 

public/views/onboarding/backupRequest.html

@@ -1,5 +1,5 @@
 <ion-view id="onboarding-backup-request" class="onboarding">
-  <ion-content ng-controller="backupRequestController">
+  <ion-content ng-controller="backupRequestController" scroll="false">
     <div class="row">
       <img src="img/onboarding-warning.svg" class="col col-75 warning">
     </div>

public/views/onboarding/backupWarning.html

@@ -6,7 +6,7 @@
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content>
+  <ion-content scroll="false">
     <div class="row text-center">
       <h3 translate class="col col-80">
         Are you being watched?

public/views/onboarding/collectEmail.html

@@ -40,7 +40,7 @@
       </div>
     </div>
     <div class="overlay collect-overlay">
-      <button class="button button-stable button-clear" ng-click="onboardingMailSkip()">
+      <button class="button button-stable button-clear" ng-click="goNextView()">
         {{'Skip' | translate}}
       </button>
     </div>

public/views/onboarding/disclaimer.html

@@ -1,5 +1,5 @@
 <ion-view id="onboarding-disclaimer" class="onboarding">
-  <ion-content ng-controller="disclaimerController" ng-init=init()>
+  <ion-content ng-controller="disclaimerController" ng-init=init() scroll="false">
     <div class="row text-center">
       <h3 translate class="col-75 col">Almost done! Let's review</h3>
     </div>

public/views/onboarding/tour.html

@@ -14,7 +14,7 @@
   </ion-nav-bar>
   <ion-slides class="slides" options="options" slider="data.slider">
     <ion-slide-page>
-      <ion-content id="onboard-tour-secure">
+      <ion-content id="onboard-tour-secure" scroll="false">
         <div class="text-center row">
           <h2 class="col col-60" translate>Bitcoin is secure, digital money</h2>
         </div>
@@ -38,7 +38,7 @@
       </ion-content>
     </ion-slide-page>
     <ion-slide-page>
-      <ion-content id="onboard-tour-currency">
+      <ion-content id="onboard-tour-currency" scroll="false">
         <div class="text-center row">
           <h2 class="col col-75" translate>Bitcoin is a currency</h2>
         </div>
@@ -62,7 +62,7 @@
       </ion-content>
     </ion-slide-page>
     <ion-slide-page>
-      <ion-content id="onboard-tour-control">
+      <ion-content id="onboard-tour-control" scroll="false">
         <div class="text-center row">
           <h2 translate class="col col-75">You control your bitcoin</h2>
         </div>

public/views/onboarding/welcome.html

@@ -1,5 +1,5 @@
 <ion-view id="onboard-welcome" class="onboarding">
-  <ion-content ng-controller="welcomeController" ng-init="createProfile()">
+  <ion-content ng-controller="welcomeController" ng-init="createProfile()" scroll="false">
     <qr-scanner id="shopping-24" on-scan="goImport(data)"></qr-scanner>
     <article id="logo-tagline">
       <div class="row text-center">

public/views/tab-send.html

@@ -24,7 +24,7 @@
       <div class="item text-center" ng-show="!list[0]" translate>No Wallet - Contact</div>
       <a class="item item-icon-left" ng-repeat="item in list" ng-click="goToAmount(item)">
         <i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
-        <i ng-show="!item.isWallet" class="icon ion-ios-person-outline"></i>
+        <gravatar class="send-gravatar" ng-show="!item.isWallet" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
         {{item.name}}
       </a>
     </div>

src/js/app.js

@@ -9,6 +9,7 @@ var modules = [
   'angular-clipboard',
   'ngLodash',
   'ngCsv',
+  'angular-md5',
   'bwcModule',
   'pbkdf2Module',
   'copayApp.filters',

src/js/controllers/amount.js

@@ -50,6 +50,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
 
     $scope.toAddress = $stateParams.toAddress;
     $scope.toName = $stateParams.toName;
+    $scope.toEmail = $stateParams.toEmail;
 
     var config = configService.getSync().wallet.settings;
     $scope.unitName = config.unitName;
@@ -191,6 +192,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
       toAmount: amount * unitToSatoshi,
       toAddress: $scope.toAddress,
       toName: $scope.toName,
+      toEmail: $scope.toEmail
     });
   };
 });

src/js/controllers/confirm.js

@@ -102,6 +102,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
     $scope.toAddress = $stateParams.toAddress;
     $scope.toName = $stateParams.toName;
+    $scope.toEmail = $stateParams.toEmail;
     $scope.description = $stateParams.description;
     $scope.paypro = $stateParams.paypro;
 
@@ -119,12 +120,14 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
     lodash.each(wallets, function(w) {
       walletService.getStatus(w, {}, function(err, status) {
-        if (err) $log.error(err);
+        if (err || !status) {
-        if (!status.availableBalanceSat) $log.debug('No balance available in: ' + w.name);
+          $log.error(err);
-        if (status.availableBalanceSat > amount) filteredWallets.push(w);
+        } else {
+          if (!status.availableBalanceSat) $log.debug('No balance available in: ' + w.name);
+          if (status.availableBalanceSat > amount) filteredWallets.push(w);
+        }
 
         if (++index == wallets.length) {
-
           if (!lodash.isEmpty(filteredWallets)) {
             $scope.wallets = lodash.clone(filteredWallets);
             $scope.notAvailable = false;
@@ -135,7 +138,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
           $timeout(function() {
             $scope.$apply();
-          }, 10);
+          });
           return;
         }
       });

src/js/controllers/onboarding/backupWarning.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $stateParams, $ionicPopup, profileService) {
+angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicPopup, profileService) {
 
   $scope.walletId = $stateParams.walletId;
   $scope.openPopup = function() {
@@ -11,7 +11,10 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun
 
     $scope.close = function() {
       backupWarningPopup.close();
-      $state.go('onboarding.backup', {walletId: $stateParams.walletId, fromOnboarding: true});
+      $state.go('onboarding.backup', {
+        walletId: $stateParams.walletId,
+        fromOnboarding: true
+      });
     };
   }
 });

src/js/controllers/onboarding/collectEmail.js

@@ -4,7 +4,8 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
 
   var isCordova = platformInfo.isCordova;
   var isWP = platformInfo.isWP;
-  var usePushNotifications = true;
+  var usePushNotifications = isCordova && !isWP;
+  var requiresOptIn = platformInfo.isIOS;
 
   var wallet = profileService.getWallet($stateParams.walletId);
   var walletId = wallet.credentials.walletId;
@@ -21,16 +22,29 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
       if (err) $log.warn(err);
       configService.set(opts, function(err) {
         if (err) $log.warn(err);
-        if (!usePushNotifications) $state.go('onboarding.backupRequest', {
+        $scope.goNextView();
-          walletId: walletId
-        });
-        else $state.go('onboarding.notifications', {
-          walletId: walletId
-        });
       });
     });
   };
 
+  $scope.goNextView = function() {
+    if (!usePushNotifications) {
+      $state.go('onboarding.backupRequest', {
+        walletId: walletId
+      });
+    }
+    else if (requiresOptIn) {
+      $state.go('onboarding.notifications', {
+        walletId: walletId
+      });
+    } else {
+      profileService.pushNotificationsInit();
+      $state.go('onboarding.backupRequest', {
+        walletId: walletId
+      });
+    }
+  };
+
   $scope.confirm = function(emailForm) {
     if (emailForm.$invalid) return;
     $scope.confirmation = true;
@@ -44,9 +58,4 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
     }, 1);
   };
 
-  $scope.onboardingMailSkip = function() {
-    $state.go('onboarding.backupRequest', {
-      walletId: walletId
-    });
-  };
 });

src/js/controllers/onboarding/notifications.js

@@ -5,7 +5,9 @@ angular.module('copayApp.controllers').controller('notificationsController', fun
   $scope.walletId = $stateParams.walletId;
   $scope.allowNotif = function() {
     profileService.pushNotificationsInit();
-    $state.go('onboarding.backupRequest');
+    $state.go('onboarding.backupRequest', {
+      walletId: $scope.walletId
+    });
   }
 
 });

src/js/controllers/tab-send.js

@@ -1,6 +1,6 @@
 '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, addressbookService, profileService, lodash, $state, walletService, incomingData) {
 
   var originalList;
 
@@ -30,6 +30,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
         contacts.push({
           name: lodash.isObject(v) ? v.name : v,
           address: k,
+          email: lodash.isObject(v) ? v.email : null,
           getAddress: function(cb) {
             return cb(null, k);
           },
@@ -76,7 +77,8 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
       $log.debug('Got toAddress:' + addr + ' | ' + item.name);
       return $state.transitionTo('send.amount', {
         toAddress: addr,
-        toName: item.name
+        toName: item.name,
+        toEmail: item.email
       })
     });
   };

src/js/directives/directives.js

@@ -113,15 +113,16 @@ angular.module('copayApp.directives')
       }
     }
   })
-  .directive('contact', ['addressbookService',
+  .directive('contact', ['addressbookService', 'lodash',
-    function(addressbookService) {
+    function(addressbookService, lodash) {
       return {
         restrict: 'E',
         link: function(scope, element, attrs) {
           var addr = attrs.address;
-          addressbookService.getLabel(addr, function(label) {
+          addressbookService.get(addr, function(err, ab) {
-            if (label) {
+            if (ab) {
-              element.append(label);
+              var name = lodash.isObject(ab) ? ab.name : ab;
+              element.append(name);
             } else {
               element.append(addr);
             }

src/js/directives/gravatar.js

@@ -0,0 +1,20 @@
+'use strict';
+
+angular.module('copayApp.directives')
+  .directive('gravatar', function(md5) {
+    return {
+      restrict: 'AE',
+      replace: true,
+      scope: {
+        name: '@',
+        height: '@',
+        width: '@',
+        email: '@'
+      },
+      link: function(scope, el, attr) {
+        scope.emailHash = md5.createHash(scope.email || '');
+      },
+      template: '<img class="gravatar" alt="{{ name }}" height="{{ height }}"  width="{{ width }}" src="https://secure.gravatar.com/avatar/{{ emailHash }}.jpg?s={{ width }}&d=mm">'
+    }
+  });
+

src/js/routes.js

@@ -235,7 +235,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         template: '<ion-nav-view name="send"></ion-nav-view>'
       })
       .state('send.amount', {
-        url: '/amount/:toAddress/:toName',
+        url: '/amount/:toAddress/:toName/:toEmail',
         views: {
           'send': {
             templateUrl: 'views/amount.html'
@@ -243,7 +243,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('send.confirm', {
-        url: '/confirm/:toAddress/:toName/:toAmount/:description/:paypro',
+        url: '/confirm/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro',
         views: {
           'send': {
             templateUrl: 'views/confirm.html'
@@ -490,14 +490,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
 
-      /*
+    /*
-       *
+     *
-       * Addressbook
+     * Addressbook
-       *
+     *
-       */
+     */
 
 
-      .state('tabs.addressbook', {
+    .state('tabs.addressbook', {
         url: '/addressbook',
         views: {
           'tab-settings': {
@@ -769,6 +769,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
     $ionicPlatform.ready(function() {
       if (platformInfo.isCordova) {
 
+        if (screen.width < 768)
+          screen.lockOrientation('portrait');
+
         if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) {
           cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
           cordova.plugins.Keyboard.disableScroll(true);
@@ -877,6 +880,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       var state = {};
       state.name = toState.name;
       state.toParams = toParams;
-      storageService.setLastState(JSON.stringify(state), function() {});
+      if (state.name != 'starting') storageService.setLastState(JSON.stringify(state), function() {});
     });
   });

src/js/services/profileService.js

@@ -268,9 +268,6 @@ angular.module('copayApp.services')
             if (!val) {
               return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer'));
             }
-            if (usePushNotifications)
-              root.pushNotificationsInit();
-            $rootScope.$emit('disclaimerAccepted');
             return cb();
           });
         });
@@ -873,12 +870,15 @@ angular.module('copayApp.services')
           if (err) {
             $log.warn('Error updating notifications:' + err);
           } else {
-            var n = lodash.filter(wallet.cachedActivity.n, function(x) {
+
+            var n;
+
+            n = lodash.filter(wallet.cachedActivity.n, function(x) {
               return !typeFilter1[x.type];
             });
 
-            if (wallet.n == 1) {
+            if (wallet.m == 1) {
-              var n = lodash.filter(n, function(x) {
+              n = lodash.filter(n, function(x) {
                 return !typeFilter2[x.type];
               });
             }

src/sass/main.scss

@@ -937,6 +937,27 @@ input[type=number] {
   }
 }
 
+/** Gravatar **/
+
+.gravatar {
+  border-radius: 50%;
+}
+
+.gravatar-content {
+  position: relative;
+  height: 70px;
+  border-color: #172565;
+  background-color: #1e3186;
+  background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%);
+  color: #fff;
+  margin-bottom: 50px;
+  .gravatar {
+    position: absolute;
+    bottom: -30px;
+    left: 41%;
+  }
+}
+
 /* Spinner */
 
 .item-icon-left ion-spinner {
@@ -961,6 +982,7 @@ input[type=number] {
 @import 'mixins/mixins';
 @import "views/add";
 @import "views/amount";
+@import "views/confirm";
 @import "views/tab-home";
 @import "views/tab-receive";
 @import "views/tab-send";

src/sass/views/amount.scss

@@ -9,7 +9,11 @@
       padding-left: 48px;
     }
   }
-
+  .send-gravatar {
+    left: 11px;
+    position: absolute;
+    top: 10px;
+  }
   .amount-pane {
     position: absolute;
     top: 125px;

src/sass/views/confirm.scss

@@ -0,0 +1,7 @@
+#view-confirm {
+  .send-gravatar {
+    left: 11px;
+    position: absolute;
+    top: 10px;
+  }
+}

src/sass/views/tab-send.scss

@@ -11,4 +11,9 @@
         padding-bottom: 1px;
     }
   }
+  .send-gravatar {
+    left: 11px;
+    position: absolute;
+    top: 10px;
+  }
 }