From 7618488bc3d680715f166926f3ca46db638fbab9 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Wed, 10 Sep 2014 15:28:13 -0300
Subject: [PATCH 1/7] Fixed

---
 js/controllers/copayers.js |  8 +++++++-
 views/copayers.html        | 33 ++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js
index fc140593b..cf3b880cc 100644
--- a/js/controllers/copayers.js
+++ b/js/controllers/copayers.js
@@ -5,6 +5,12 @@ angular.module('copayApp.controllers').controller('CopayersController',
 
     $scope.hideAdv = true;
 
+
+    $scope.skipBackup = function() {
+      var w = $rootScope.wallet;
+      w.setBackupReady();
+    };
+
     $scope.backup = function() {
       var w = $rootScope.wallet;
       w.setBackupReady();
@@ -37,4 +43,4 @@ angular.module('copayApp.controllers').controller('CopayersController',
       return $rootScope.wallet.publicKeyRing.isBackupReady(copayer.copayerId);
     }
 
-  });
+  });
\ No newline at end of file
diff --git a/views/copayers.html b/views/copayers.html
index cbd00e805..ddd2a02a5 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -51,6 +51,7 @@
         </div>
 
         <div class="box-setup-copayers p20">
+          <span translate>Creating and storing a backup will allow to restore funds of the wallet</span>
           <div class="oh">
             <div ng-include="'views/includes/copayer.html'"></div> 
             <div ng-if="!$root.wallet.publicKeyRing.isComplete()">
@@ -75,21 +76,23 @@
           </div>
         </div>
 
-        <div class="text-right">
-          <div class="left text-left m10b">
-            <a class="expand small"  ng-click="hideAdv=!hideAdv">
-              <span translate ng-hide="!hideAdv">Show</span> 
-              <span translate ng-hide="hideAdv">Hide</span> 
-              <span translate>advanced options</span>
-            </a>
-            <div ng-hide="hideAdv">
-              <a translate class="text-warning" ng-really-click="deleteWallet()"
-                ng-really-message="Are you sure to delete this wallet from this computer?">Delete wallet</a> 
-              <span class="text-gray">|</span> 
-              <a translate class="text-primary m20r" ng-click="downloadBackup()"
-                ng-show="!$root.wallet.publicKeyRing.isComplete()">Download seed backup</a> 
-            </div>
-          </div>
+<!--         <div class="text-right">
+          <button class="button secondary m0"
+            ng-click="skipBackup()"
+            ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
+            ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
+            <span translate ng-show="$root.wallet.publicKeyRing.isComplete()" >
+              Skip Backup
+            </span>
+          </button> -->
+
+          <a class="small"  ng-click="skipBackup()"      
+            ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
+            ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
+             <span translate ng-show="$root.wallet.publicKeyRing.isComplete()" >
+              Skip Backup
+            </span>
+          </a>
           <button class="button primary m0"
             ng-click="backup()"
             ng-show="!$root.wallet.publicKeyRing.isBackupReady()"

From 63cffcc921d912fb46e651233f8c78656fe54090 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Wed, 10 Sep 2014 17:36:17 -0300
Subject: [PATCH 2/7] If the copayer upload a backup it does not wait for
 others

---
 js/controllers/import.js       |  7 +++----
 js/models/core/Wallet.js       |  8 ++++++--
 js/services/controllerUtils.js |  2 +-
 views/copayers.html            | 11 -----------
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/js/controllers/import.js b/js/controllers/import.js
index e52f77e86..c186ad0da 100644
--- a/js/controllers/import.js
+++ b/js/controllers/import.js
@@ -2,12 +2,11 @@
 
 angular.module('copayApp.controllers').controller('ImportController',
   function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) {
-
     controllerUtils.redirIfLogged();
 
     $scope.title = 'Import a backup';
     $scope.importStatus = 'Importing wallet - Reading backup...';
-    $scope.hideAdv=true;
+    $scope.hideAdv = true;
 
     var reader = new FileReader();
 
@@ -59,7 +58,7 @@ angular.module('copayApp.controllers').controller('ImportController',
           $rootScope.wallet = w;
           controllerUtils.startNetwork($rootScope.wallet, $scope);
         });
-        
+
       });
     };
 
@@ -105,6 +104,6 @@ angular.module('copayApp.controllers').controller('ImportController',
 
       if (backupFile) {
         reader.readAsBinaryString(backupFile);
-      } 
+      }
     };
   });
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index f9af99d39..809c7aaa3 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -86,6 +86,9 @@ function Wallet(opts) {
   this.lastTimestamp = opts.lastTimestamp || undefined;
   this.lastMessageFrom = {};
 
+  //to avoid confirmation of copayer's backups if is imported from a file
+  this.isImported = opts.isImported;
+
   this.paymentRequests = opts.paymentRequests || {};
 
   //network nonces are 8 byte buffers, representing a big endian number
@@ -867,6 +870,7 @@ Wallet.fromObj = function(o, storage, network, blockchain) {
   opts.storage = storage;
   opts.network = network;
   opts.blockchain = blockchain;
+  opts.isImported = true;
 
   return new Wallet(opts);
 };
@@ -2389,7 +2393,7 @@ Wallet.prototype.isShared = function() {
  * @return {boolean}
  */
 Wallet.prototype.isReady = function() {
-  var ret = this.publicKeyRing.isComplete() && this.publicKeyRing.isFullyBackup();
+  var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported);
   return ret;
 };
 
@@ -2522,4 +2526,4 @@ Wallet.request = function(options, callback) {
   return ret;
 };
 
-module.exports = Wallet;
\ No newline at end of file
+module.exports = Wallet;
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index a11e19238..fc80672e5 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -108,7 +108,7 @@ angular.module('copayApp.services')
         }, 3000);
       });
       w.on('txProposalEvent', function(e) {
-        
+
         var user = w.publicKeyRing.nicknameForCopayer(e.cId);
         switch (e.type) {
           case 'signed':
diff --git a/views/copayers.html b/views/copayers.html
index ddd2a02a5..a9c7427f9 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -75,17 +75,6 @@
           </div>
           </div>
         </div>
-
-<!--         <div class="text-right">
-          <button class="button secondary m0"
-            ng-click="skipBackup()"
-            ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
-            ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
-            <span translate ng-show="$root.wallet.publicKeyRing.isComplete()" >
-              Skip Backup
-            </span>
-          </button> -->
-
           <a class="small"  ng-click="skipBackup()"      
             ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
             ng-disabled="!$root.wallet.publicKeyRing.isComplete()">

From e8190730030b8a37e077eaccb865115ab83b965b Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Thu, 11 Sep 2014 10:28:56 -0300
Subject: [PATCH 3/7] Conflicts solved

---
 js/models/core/Wallet.js |  2 +-
 test/test.Wallet.js      | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 809c7aaa3..c2278b820 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -87,7 +87,7 @@ function Wallet(opts) {
   this.lastMessageFrom = {};
 
   //to avoid confirmation of copayer's backups if is imported from a file
-  this.isImported = opts.isImported;
+  this.isImported = opts.isImported || false;
 
   this.paymentRequests = opts.paymentRequests || {};
 
diff --git a/test/test.Wallet.js b/test/test.Wallet.js
index d6b765b46..983cfc076 100644
--- a/test/test.Wallet.js
+++ b/test/test.Wallet.js
@@ -829,6 +829,23 @@ describe('Wallet model', function() {
     });
   });
 
+  describe('#createTxSync', function() {
+    it('should fail if amount below min value', function() {
+      var w = cachedCreateW2();
+      var utxo = createUTXO(w);
+
+      var badCreate = function() {
+        w.createTxSync(
+          'mgGJEugdPnvhmRuFdbdQcFfoFLc1XXeB79',
+          '123',
+          null,
+          utxo
+        );
+      }
+      chai.expect(badCreate).to.throw('invalid amount');
+    });
+  });
+
   describe('removeTxWithSpentInputs', function() {
     it('should remove pending TxProposal with spent inputs', function(done) {
       var w = cachedCreateW2();
@@ -1533,4 +1550,4 @@ describe('Wallet model', function() {
     should.exist(n.networkNonce);
   });
 
-});
\ No newline at end of file
+});

From 2a4b054ba129fe462a930056e19026f269197d68 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Thu, 11 Sep 2014 11:30:55 -0300
Subject: [PATCH 4/7] Solving conflicts

---
 test/test.Wallet.js | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/test/test.Wallet.js b/test/test.Wallet.js
index 983cfc076..e55128119 100644
--- a/test/test.Wallet.js
+++ b/test/test.Wallet.js
@@ -829,23 +829,6 @@ describe('Wallet model', function() {
     });
   });
 
-  describe('#createTxSync', function() {
-    it('should fail if amount below min value', function() {
-      var w = cachedCreateW2();
-      var utxo = createUTXO(w);
-
-      var badCreate = function() {
-        w.createTxSync(
-          'mgGJEugdPnvhmRuFdbdQcFfoFLc1XXeB79',
-          '123',
-          null,
-          utxo
-        );
-      }
-      chai.expect(badCreate).to.throw('invalid amount');
-    });
-  });
-
   describe('removeTxWithSpentInputs', function() {
     it('should remove pending TxProposal with spent inputs', function(done) {
       var w = cachedCreateW2();

From 7de88f2cc813256b78f7b67c3f0535d446a91aa6 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Thu, 11 Sep 2014 11:54:14 -0300
Subject: [PATCH 5/7] fix text color

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

diff --git a/views/copayers.html b/views/copayers.html
index a9c7427f9..1b7f82bdc 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -51,7 +51,7 @@
         </div>
 
         <div class="box-setup-copayers p20">
-          <span translate>Creating and storing a backup will allow to restore funds of the wallet</span>
+          <p class="text-gray m10b" translate>Creating and storing a backup will allow to restore funds of the wallet</p>
           <div class="oh">
             <div ng-include="'views/includes/copayer.html'"></div> 
             <div ng-if="!$root.wallet.publicKeyRing.isComplete()">

From 7095750d6fa1860ce0de57d2beae71f67e9acab7 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Thu, 11 Sep 2014 13:01:22 -0300
Subject: [PATCH 6/7] fix style

---
 css/src/main.css    |  2 +-
 views/copayers.html | 18 +++++++++---------
 views/join.html     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index bea1ac145..16d4d0d2a 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -1046,7 +1046,7 @@ a.text-warning:hover {color: #FD7262;}
   background: #2C3E50;
   -moz-box-shadow:    0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20);
   box-shadow:         0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20);
-  margin-bottom: 5px;
+  margin-bottom: 15px;
 }
 
 .box-setup-copay-required {
diff --git a/views/copayers.html b/views/copayers.html
index 1b7f82bdc..22f0749d3 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -51,7 +51,7 @@
         </div>
 
         <div class="box-setup-copayers p20">
-          <p class="text-gray m10b" translate>Creating and storing a backup will allow to restore funds of the wallet</p>
+          <p class="text-primary m10b" translate>Creating and storing a backup will allow to restore funds of the wallet</p>
           <div class="oh">
             <div ng-include="'views/includes/copayer.html'"></div> 
             <div ng-if="!$root.wallet.publicKeyRing.isComplete()">
@@ -75,14 +75,7 @@
           </div>
           </div>
         </div>
-          <a class="small"  ng-click="skipBackup()"      
-            ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
-            ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
-             <span translate ng-show="$root.wallet.publicKeyRing.isComplete()" >
-              Skip Backup
-            </span>
-          </a>
-          <button class="button primary m0"
+          <button class="button primary right m0"
             ng-click="backup()"
             ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
             ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
@@ -100,6 +93,13 @@
               <span translate>yet to join.</span>
             </span>
           </button>
+          <a class="text-primary m15t m20r right"  ng-click="skipBackup()"      
+            ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
+            ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
+             <span class="size-12" translate ng-show="$root.wallet.publicKeyRing.isComplete()" >
+              Skip Backup
+            </span>
+          </a>
           <button class="button primary"
             disabled="disabled"
             ng-show="$root.wallet.publicKeyRing.isBackupReady()">
diff --git a/views/join.html b/views/join.html
index f000c11f9..9f972d352 100644
--- a/views/join.html
+++ b/views/join.html
@@ -69,7 +69,7 @@
             name="joinPasswordConfirm"
             ng-model="joinPasswordConfirm" 
             match="joinPassword" required>
-            <a class="expand small"  ng-click="hideAdv=!hideAdv">
+            <a class="expand small left"  ng-click="hideAdv=!hideAdv">
               <span translate ng-hide="!hideAdv">Show</span> 
               <span translate ng-hide="hideAdv">Hide</span> 
               <span translate>advanced options</span>

From 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Thu, 11 Sep 2014 15:22:24 -0300
Subject: [PATCH 7/7] Showing message only when the copayer may create a backup

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

diff --git a/views/copayers.html b/views/copayers.html
index 22f0749d3..090574f3e 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -51,7 +51,7 @@
         </div>
 
         <div class="box-setup-copayers p20">
-          <p class="text-primary m10b" translate>Creating and storing a backup will allow to restore funds of the wallet</p>
+          <p class="text-primary m10b" ng-show="$root.wallet && $root.wallet.publicKeyRing.isComplete()" translate>Creating and storing a backup will allow to restore funds of the wallet</p>
           <div class="oh">
             <div ng-include="'views/includes/copayer.html'"></div> 
             <div ng-if="!$root.wallet.publicKeyRing.isComplete()">