Fixed Conflicts:

bower.json
	js/directives.js
	views/includes/sidebar.html

bower.json

@@ -22,6 +22,7 @@
     "angular-moment": "~0.7.1",
     "socket.io-client": ">=1.0.0",
     "mousetrap": "1.4.6",
-    "zeroclipboard": "~2.1.6"
+    "zeroclipboard": "~2.1.6",
+    "ng-idle": "*"
   }
 }

index.html

@@ -62,6 +62,7 @@
   <script src="lib/angular-moment/angular-moment.js"></script>
   <script src="lib/qrcode-generator/js/qrcode.js"></script>
   <script src="lib/angular-qrcode/qrcode.js"></script>
+  <script src="lib/ng-idle/angular-idle.min.js"></script>
   <script src="lib/angular-foundation/mm-foundation.min.js"></script>
   <script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script>
   <script src="lib/peer.js"></script> <!-- TODO Change this on PeerJS version 0.3.9 -->

js/app.js

@@ -27,6 +27,7 @@ var copayApp = window.copayApp = angular.module('copayApp', [
   'angularMoment',
   'mm.foundation',
   'monospaced.qrcode',
+  'ngIdle',
   'copayApp.filters',
   'copayApp.services',
   'copayApp.controllers',
@@ -40,6 +41,7 @@ copayApp.config(function($sceDelegateProvider) {
   ]);
 });
 
+
 angular.module('copayApp.filters', []);
 angular.module('copayApp.services', []);
 angular.module('copayApp.controllers', []);

js/controllers/addresses.js

@@ -20,13 +20,6 @@ angular.module('copayApp.controllers').controller('AddressesController',
       var ModalInstanceCtrl = function ($scope, $modalInstance, address) {
         $scope.address = address;
 
-        $scope.openExternal = function(address) {
-          var url = 'bitcoin:' + address;
-          if (window.cordova) return window.open(url, '_blank');
-
-          window.location = url;
-        }
-
         $scope.cancel = function () {
           $modalInstance.dismiss('cancel');
         };

js/controllers/sidebar.js

@@ -82,4 +82,15 @@ angular.module('copayApp.controllers').controller('SidebarController',
     // Init socket handlers (with no wallet yet)
     controllerUtils.setSocketHandlers();
 
+    if ($rootScope.wallet) {
+      $scope.$on('$idleStart', function(a) {
+        notification.warning('Session will be closed', 'Your session is about to expire due to inactivity');
+      });
+
+      $scope.$on('$idleTimeout', function() {
+        $scope.signout();
+        notification.warning('Session closed', 'Session closed because a long time of inactivity');
+      });
+    }
+
   });

js/directives.js

@@ -198,10 +198,18 @@ angular.module('copayApp.directives')
       }
     };
   })
-// From https://gist.github.com/asafge/7430497
+  .directive('openExternal', function() {
-.directive('ngReallyClick', [
+    return {
-
+      restrict: 'A',
-  function() {
+      link: function(scope, element, attrs) {
+        element.bind('click', function() {
+          window.open('bitcoin:'+attrs.address, '_blank');
+        });
+      }
+    }
+  })
+  // From https://gist.github.com/asafge/7430497
+  .directive('ngReallyClick', [function() {
       return {
         restrict: 'A',
         link: function(scope, element, attrs) {
@@ -214,8 +222,7 @@ angular.module('copayApp.directives')
         }
       }
     }
-])
+  ])
-
   .directive('match', function () {
     return {
       require: 'ngModel',
@@ -265,5 +272,4 @@ angular.module('copayApp.directives')
         });
       }
     };
-  })
+  });
-;

js/models/core/HDParams.js

@@ -18,7 +18,7 @@ function HDParams(opts) {
 
 HDParams.init = function(totalCopayers) {
   preconditions.shouldBeNumber(totalCopayers);
-  var ret = [new HDParams()];
+  var ret = [new HDParams({receiveIndex: 1})];
   for (var i = 0 ; i < totalCopayers ; i++) {
     ret.push(new HDParams({copayerIndex: i}));
   }

js/routes.js

@@ -65,17 +65,22 @@ angular
 //Setting HTML5 Location Mode
 angular
   .module('copayApp')
-  .config(function($locationProvider) {
+  .config(function($locationProvider, $idleProvider) {
     $locationProvider
       .html5Mode(false)
       .hashPrefix('!');
+    // IDLE timeout
+    $idleProvider.idleDuration(15 * 60); // in seconds
+    $idleProvider.warningDuration(10); // in seconds
   })
-  .run(function($rootScope, $location) {
+  .run(function($rootScope, $location, $idle) {
+    $idle.watch();
     $rootScope.$on('$routeChangeStart', function(event, next, current) {
       if (!util.supports.data) {
         $location.path('unsupported');
       } else {
         if ((!$rootScope.wallet || !$rootScope.wallet.id) && next.validate) {
+          $idle.unwatch();
           $location.path('/');
         }
         if ($rootScope.wallet && !$rootScope.wallet.isReady()) {

js/services/controllerUtils.js

@@ -185,13 +185,14 @@ angular.module('copayApp.services')
 
     root.updateAddressList = function() {
       var w = $rootScope.wallet;
-      if (w)
+      if (w && w.isReady())
         $rootScope.addrInfos = w.getAddressesInfo();
     };
 
     root.updateBalance = function(cb) {
       var w = $rootScope.wallet;
       if (!w) return root.onErrorDigest();
+      if (!w.isReady()) return;
 
       $rootScope.balanceByAddr = {};
       $rootScope.updatingBalance = true;
@@ -212,6 +213,10 @@ angular.module('copayApp.services')
         $rootScope.totalBalanceBTC = (balanceSat / COIN);
         $rootScope.availableBalance = safeBalanceSat * satToUnit;
         $rootScope.availableBalanceBTC = (safeBalanceSat / COIN);
+
+        $rootScope.lockedBalance = (balanceSat - safeBalanceSat) * satToUnit;
+        $rootScope.lockedBalanceBTC = (balanceSat - safeBalanceSat) / COIN;
+
         var balanceByAddr = {};
         for (var ii in balanceByAddrSat) {
           balanceByAddr[ii] = balanceByAddrSat[ii] * satToUnit;

karma.conf.js

@@ -21,6 +21,7 @@ module.exports = function(config) {
       'lib/angular/angular.min.js',
       'lib/angular-mocks/angular-mocks.js',
       'lib/moment/moment.js',
+      'lib/ng-idle/angular-idle.min.js',
       'lib/angular-moment/angular-moment.js',
       'lib/qrcode-generator/js/qrcode.js',
       'lib/angular-qrcode/qrcode.js',

test/mocks/FakeWallet.js

@@ -46,6 +46,10 @@ FakeWallet.prototype.getAddressesInfo = function() {
   return ret;
 };
 
+FakeWallet.prototype.isReady = function() {
+  return true;
+}
+
 
 FakeWallet.prototype.getBalance = function(cb) {
   return cb(null, this.balance, this.balanceByAddr, this.safeBalance);

test/test.PublicKeyRing.js

@@ -145,9 +145,8 @@ describe('PublicKeyRing model', function() {
     var k = createW();
     var w = k.w;
 
-
     var a = w.getAddresses();
-    a.length.should.equal(0);
+    a.length.should.equal(1);
 
     [true, false].forEach(function(isChange){
       for (var i = 0; i < 2; i++) {
@@ -156,15 +155,22 @@ describe('PublicKeyRing model', function() {
     });
 
     var as = w.getAddressesInfo();
-    as.length.should.equal(4);
+    as.length.should.equal(5); // include pre-generated shared one
     for (var j in as) {
       var a = as[j];
       a.address.isValid().should.equal(true);
       a.addressStr.should.equal(a.address.toString());
-      a.isChange.should.equal([false, false, true, true][j]);
+      a.isChange.should.equal([false, false, false, true, true][j]);
     }
   });
 
+
+  it('should start with one shared address', function() {
+    var k = createW();
+    var a = k.w.getAddresses();
+    a.length.should.equal(1);
+  });
+
   it('should count generation indexes', function() {
     var k = createW();
     var w = k.w;

test/test.Wallet.js

@@ -594,7 +594,7 @@ describe('Wallet model', function() {
 
 
   it('should get balance', function(done) {
-    var w = createW();
+    var w = createW2();
     var spy = sinon.spy(w.blockchain, 'getUnspent');
     w.blockchain.fixUnspent([]);
     w.getBalance(function(err, balance, balanceByAddr, safeBalance) {

test/unit/services/servicesSpec.js

@@ -93,8 +93,12 @@ describe("Unit: controllerUtils", function() {
     controllerUtils.updateBalance(function() {
       expect($rootScope.totalBalanceBTC).to.be.equal(1.00000001);
       expect($rootScope.availableBalanceBTC).to.be.equal(0.90000002);
+      expect($rootScope.lockedBalanceBTC).to.be.equal(0.09999999);
+
       expect($rootScope.totalBalance).to.be.equal(1000000.01);
       expect($rootScope.availableBalance).to.be.equal(900000.02);
+      expect($rootScope.lockedBalance).to.be.equal(99999.99);
+
       expect($rootScope.addrInfos).not.to.equal(null);
       expect($rootScope.addrInfos[0].address).to.equal(Waddr);
     });

views/includes/sidebar-mobile.html

@@ -24,16 +24,16 @@
         </span>
       </div> 
       <div>
-        Available
+        Locked 
         <span ng-if="$root.updatingBalance">
           <i class="fi-bitcoin-circle icon-rotate spinner"></i>
         </span>
         <span ng-show="!$root.updatingBalance"
           data-options="disable_for_touch:true"
-          tooltip="{{availableBalanceBTC || 0 |noFractionNumber:8}} BTC"
+          tooltip="{{lockedBalanceBTC || 0 |noFractionNumber:8}} BTC"
           tooltip-trigger="mouseenter"
-          tooltip-placement="bottom">{{availableBalance || 0|noFractionNumber}} {{$root.unitName}}
+          tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
-        </span>
+        </span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>
       </div>
       <div class="line-sidebar-b"></div>
     </div>

views/includes/sidebar.html

@@ -34,7 +34,7 @@
         |noFractionNumber}} {{$root.unitName}} 
       </span>
       <br>
-      Available
+      Locked &nbsp;
       <span ng-if="$root.updatingBalance">
         <i class="fi-bitcoin-circle icon-rotate spinner"></i>
       </span>
@@ -42,10 +42,10 @@
         class="has-tip"
         data-options="disable_for_touch:true"
         tooltip-popup-delay='500'
-        tooltip="{{availableBalanceBTC || 0 |noFractionNumber:8}} BTC"
+        tooltip="{{lockedBalanceBTC || 0 |noFractionNumber:8}} BTC"
         tooltip-trigger="mouseenter"
-        tooltip-placement="bottom">{{availableBalance || 0|noFractionNumber}} {{$root.unitName}}
+        tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
-      </span>
+      </span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>
     </div>
     <div class="line-sidebar"></div>
   </header>

views/modals/qr-address.html

@@ -10,8 +10,8 @@
       {{address.balance || 0|noFractionNumber}} {{$root.unitName}}
     </span>
     <div style="margin-top:10px;">
-      <span class="label pointer" ng-click="openExternal(address.address)">
+      <span class="label pointer" open-external address="{{address.address}}">
-        <i class="fi-link">&nbsp;</i> Open in external aplication
+        <i class="fi-link">&nbsp;</i> Open in external application
       </span>
     </div>
   </div>