From 88116dab256226c3134fe64a220ad7c0dfab7aec Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 9 Jun 2014 15:59:18 -0300
Subject: [PATCH 1/4] add config for video, add names in footer

---
 config.js                      |  3 +--
 css/main.css                   |  4 ++--
 index.html                     | 13 ++++++++++---
 js/controllers/footer.js       |  2 ++
 js/services/controllerUtils.js |  5 +++--
 test/test.TxProposals.js       |  4 ++--
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/config.js b/config.js
index d6adfb2df..12a7794cf 100644
--- a/config.js
+++ b/config.js
@@ -104,7 +104,6 @@ var defaultConfig = {
 
   // theme list
   themes: ['default'],
-
-
+  disableVideo: 1,
   verbose: 1,
 };
diff --git a/css/main.css b/css/main.css
index 4aa24fbfa..b29cbe070 100644
--- a/css/main.css
+++ b/css/main.css
@@ -54,11 +54,11 @@ html, body {height: 100%;}
 }
 
 .bottom-copay {
-  width: 56px;
+  width: 50px;
   text-align: center;
   position: relative;
   float: right;
-  margin-left: 15px;
+  margin-left: 20px;
   /* height: 551px; */
 }
 
diff --git a/index.html b/index.html
index 508d4ffae..9c85efd2e 100644
--- a/index.html
+++ b/index.html
@@ -150,7 +150,7 @@
   <div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet}">
     <link rel="stylesheet" ng-href="{{theme}}">
     <div ng-show="!$root.wallet">
-      <div class="large-12 columns text-right">
+      <div class="large-12 columns text-left">
         Copay
         <small>v{{version}}</small>
       </div>
@@ -163,14 +163,18 @@
         <div class="size-12 m10t">
           {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet
         </div>
+        <div class="text-gray size-12" style="margin-top:5px">
+          Copay v{{version}}
+        </div>
+  
         <div class="size-12 m10t" ng-if="themes.length > 1">
           <a class="size-12" ng-click="change_theme(th)" ng-repeat="th in themes">{{th}} {{$last ? '' : '&middot; '}}</a>
         </div>
       </div>
       <div class="large-9 medium-9 small-9 columns">
         <a href="#/addresses" > </a>
-        <div class="bottom-copay"
-            ng-repeat="c in $root.wallet.getRegisteredPeerIds()" class="has-tip" tooltip-popup-delay="1000" tooltip-placement="top" tooltip="{{c.nick}}">
+        <!-- <div class="bottom&#45;copay" ng&#45;repeat="c in $root.wallet.getRegisteredPeerIds()" class="has&#45;tip" tooltip&#45;popup&#45;delay="1000" tooltip&#45;placement="top" tooltip="{{c.nick}}"> -->
+        <div class="bottom-copay" ng-repeat="c in $root.wallet.getRegisteredPeerIds()">
           <video ng-if="$root.videoInfo[c.peerId]"
             avatar peer="{{c}}"
             autoplay
@@ -182,6 +186,9 @@
             ng-class="($root.wallet.getOnlinePeerIDs().indexOf(c.peerId) != -1) ? 'online' : 'offline'"
             src="./img/satoshi.gif"
           />
+          <div class="size-12 text-center text-gray" stype="margin-top:4px">
+          {{c.nick || 'NN'}}
+          </div>
         </div>
       </div>
     </div>
diff --git a/js/controllers/footer.js b/js/controllers/footer.js
index 280fff354..3d25c88c8 100644
--- a/js/controllers/footer.js
+++ b/js/controllers/footer.js
@@ -17,6 +17,8 @@ angular.module('copayApp.controllers').controller('FooterController', function($
     $scope.version = copay.version;
 
     $scope.getVideoURL = function(copayer) {
+      if (config.disableVideo) return;
+      
       var vi = $rootScope.videoInfo[copayer]
       if (!vi) return;
 
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 5647c44bd..ff5018bbf 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -61,7 +61,8 @@ angular.module('copayApp.services')
       w.on('ready', function(myPeerID) {
         $rootScope.wallet = w;
         $location.path('addresses');
-        video.setOwnPeer(myPeerID, w, handlePeerVideo);
+        if (!config.disableVideo)
+          video.setOwnPeer(myPeerID, w, handlePeerVideo);
       });
 
       w.on('publicKeyRingUpdated', function(dontDigest) {
@@ -83,7 +84,7 @@ angular.module('copayApp.services')
         root.onErrorDigest(msg);
       });
       w.on('connect', function(peerID) {
-        if (peerID) {
+        if (peerID && !config.disableVideo) {
           video.callPeer(peerID, handlePeerVideo);
         }
         $rootScope.$digest();
diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js
index f0af7d78f..35360d5c7 100644
--- a/test/test.TxProposals.js
+++ b/test/test.TxProposals.js
@@ -180,7 +180,7 @@ describe('TxProposals model', function() {
     uuk[0].split(',')[0].should.equal(unspentTest[0].txid);
   });
 
-  it.skip('#merge with self', function () {
+  it('#merge with self', function () {
     var priv = new PrivateKey(config);
     var w = new TxProposals({
       networkName: config.networkName,
@@ -398,7 +398,7 @@ var _dumpChunks = function (scriptSig, label) {
   });
 
 
-  it.skip('#merge, merge signatures case 3', function () {
+  it('#merge, merge signatures case 3', function () {
 
     var priv = new PrivateKey(config);
     var priv2 = new PrivateKey(config);

From 5c6c02104da6ccce618cc5df2dd01fece032d7c1 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 9 Jun 2014 16:09:22 -0300
Subject: [PATCH 2/4] fixes https://github.com/bitpay/copay/issues/613

---
 js/models/core/Wallet.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index a26ef3423..970567a5f 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -569,7 +569,7 @@ Wallet.prototype.getBalance = function(cb) {
 
     // we multiply and divide by COIN to avoid rounding errors when adding
     for (var a in balanceByAddr) {
-      balanceByAddr[a] = balanceByAddr[a] / COIN;
+      balanceByAddr[a] = balanceByAddr[a].toFixed(0) / COIN;
     }
     balance = balance / COIN;
 
@@ -579,7 +579,7 @@ Wallet.prototype.getBalance = function(cb) {
       safeBalance += amt;
     }
 
-    safeBalance = safeBalance / COIN;
+    safeBalance = safeBalance.toFixed(0) / COIN;
     return cb(null, balance, balanceByAddr, safeBalance);
   });
 };

From eb5d9cd90a232f010ab20181ae0fb3cdac354eec Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 9 Jun 2014 16:17:00 -0300
Subject: [PATCH 3/4] fix bad message from peer on walletId type

---
 js/models/core/Wallet.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 970567a5f..202cdff91 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -131,8 +131,10 @@ Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
 };
 
 Wallet.prototype._handleData = function(senderId, data, isInbound) {
+
   // TODO check message signature
-  if (this.id !== data.walletId) {
+  
+  if (data.type !== 'walletId' && this.id !== data.walletId) {
     this.emit('badMessage', senderId);
     this.log('badMessage FROM:', senderId); //TODO
     return;

From f02f77fb698c8a73c48101c75a7c7a1cd7be8c9c Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 9 Jun 2014 16:20:23 -0300
Subject: [PATCH 4/4] add bitcore"s own stun/turn servers

---
 config.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/config.js b/config.js
index 12a7794cf..8c0745de5 100644
--- a/config.js
+++ b/config.js
@@ -43,19 +43,26 @@ var defaultConfig = {
       'iceServers': [
         // Pass in STUN and TURN servers for maximum network compatibility
         {
-          url: 'stun:stun.l.google.com:19302'
+          url: 'stun:162.242.219.26'
         }, {
-          url: 'stun:stun1.l.google.com:19302'
-        }, {
-          url: 'stun:stun2.l.google.com:19302'
-        }, {
-          url: 'stun:stun3.l.google.com:19302'
-        }, {
-          url: 'stun:stun4.l.google.com:19302'
-        }, {
-          url: 'stun:stunserver.org'
+          url: 'turn:162.242.219.26',
+          username: 'bitcore',
+          credential: 'bitcore',
         }
-        // Options fot TURN servers with p2p communications are not possible.
+        // {
+        //   url: 'stun:stun.l.google.com:19302'
+        // }, {
+        //   url: 'stun:stun1.l.google.com:19302'
+        // }, {
+        //   url: 'stun:stun2.l.google.com:19302'
+        // }, {
+        //   url: 'stun:stun3.l.google.com:19302'
+        // }, {
+        //   url: 'stun:stun4.l.google.com:19302'
+        // }, {
+        //   url: 'stun:stunserver.org'
+        // }
+        // // Options fot TURN servers with p2p communications are not possible.
         // {
         //   url: 'turn:numb.viagenie.ca',
         //   credential: 'muazkh',