From 5ba388e9114107aec3e6d4c18e1d3722ad8c6613 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 3 Jul 2014 11:37:26 -0300
Subject: [PATCH] add testnet in footer / add links

---
 index.html                  | 21 +++++++++++++++++++--
 js/controllers/footer.js    |  2 ++
 js/controllers/settings.js  |  2 +-
 js/models/core/Wallet.js    |  1 +
 js/models/network/WebRTC.js |  1 -
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 339e7e7ce..cd3169467 100644
--- a/index.html
+++ b/index.html
@@ -156,10 +156,20 @@
   <div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet || !$root.wallet.isReady()}">
     <link rel="stylesheet" ng-href="{{theme}}">
     <div ng-show="!$root.wallet">
-      <div class="large-12 columns text-left">
+      <div class="large-4 columns text-left">
         Copay
         <small>v{{version}}</small>
+        <small ng-if="networkName==='testnet'">[TESTNET]</small>
       </div>
+      <div class="large-4 columns text-center">
+        <small>
+          <A href="https://copay.io" target="_blank">Copay Project Homapage</a>
+        </small>
+      </div>
+      <div class="large-4 columns">
+      </div>
+
+
     </div>
     <div ng-show="$root.wallet && !$root.wallet.isReady()">
       <div class="large-6 medium-6 small-6 columns">
@@ -235,6 +245,7 @@
                 </div>
                 <div ng-show="!wallets.length">
                   <h3>Create a new wallet</h3>
+
                     <p class="text-gray">
                     Copay is a free, open-source, multisignature bitcoin wallet. A single-owner bitcoin wallet's security depends on carefully securing the private keys. With copay you can have multiple people controlling the funds, using bitcoin's multisignature functionality, requiring no trust in any third party.
                     </p>
@@ -827,7 +838,6 @@
               <legend>Wallet Unit</legend>
                 <select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" required>
                 </select>
-                <label for="settingsUnit">Prefered Unit for Wallet</label>
             </fieldset>
             <fieldset>
               <legend>Videoconferencing</legend>
@@ -843,6 +853,9 @@
                 <input id="insight-secure" type="checkbox" ng-model="insightSecure" class="form-control" ng-click="changeInsightSSL()">
                 <label for="insight-secure">Use SSL</label>
 
+                <p class="small">
+                Insight API server is open-source software.  You can run your own instance, check <a href="http://insight.is" target="_blank">Insight API Homepage</a>
+
             </fieldset>
             <fieldset>
               <legend>PeerJS server</legend>
@@ -854,6 +867,10 @@
                 <input type="number" ng-model="networkPort" class="form-control" name="peerjs-port">
                 <input id="peerjs-secure" type="checkbox" ng-model="networkSecure" class="form-control">
                 <label for="peerjs-secure">Use SSL</label>
+
+
+                <p class="small">
+                PeerJS Server is open-source software.  You can run your own instance, or use PeerJS Server cloud. Check <a href="http://peerjs.com" target="_blank">PeerJS Server</a>
             </fieldset>
           </div>
           <div class="row">
diff --git a/js/controllers/footer.js b/js/controllers/footer.js
index f7ee105e6..491958f64 100644
--- a/js/controllers/footer.js
+++ b/js/controllers/footer.js
@@ -2,6 +2,8 @@
 
 angular.module('copayApp.controllers').controller('FooterController', function($rootScope, $sce, $scope, $http) {
 
+    $scope.networkName = config.networkName;
+
   if (config.themes && Array.isArray(config.themes) && config.themes[0]) {
     $scope.themes = config.themes;
   } else {
diff --git a/js/controllers/settings.js b/js/controllers/settings.js
index b38252d5d..afcd60262 100644
--- a/js/controllers/settings.js
+++ b/js/controllers/settings.js
@@ -11,7 +11,7 @@ angular.module('copayApp.controllers').controller('SettingsController',
     $scope.networkHost = config.network.host;
     $scope.networkPort = config.network.port;
     $scope.networkSecure = config.network.secure || false;
-    $scope.disableVideo = typeof config.disableVideo === undefined ?  true : config.disableVideo;
+    $scope.disableVideo = typeof config.disableVideo === undefined ? true : config.disableVideo;
 
     $scope.unitOpts = [{
       name: 'Satoshis (100,000,000 satoshis = 1BTC)',
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index fec67735b..a92b554e9 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -260,6 +260,7 @@ Wallet.decodeSecret = function(secretB) {
   }
 };
 
+
 Wallet.prototype._lockIncomming = function() {
   this.network.lockIncommingConnections(this.publicKeyRing.getAllCopayerIds());
 };
diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js
index bfd2ad10a..f436abb7d 100644
--- a/js/models/network/WebRTC.js
+++ b/js/models/network/WebRTC.js
@@ -48,7 +48,6 @@ Network.prototype.cleanUp = function() {
   this.privkey = null; //TODO: hide privkey in a closure
   this.key = null;
   this.copayerId = null;
-  this.signingKey = null;
   this.allowedCopayerIds = null;
   this.isInboundPeerAuth = [];
   this.copayerForPeer = {};