From 7e56445330f8a32fb86719d39eab78af0a8deaea Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 20 Jan 2016 09:59:41 -0300
Subject: [PATCH 01/17] Restores previous size of QR code

---
 public/views/walletHome.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 18af971ed..bee224a42 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -324,10 +324,10 @@
           <div class="large-12 columns">
             <h2 class="text-center m10t" translate>My Bitcoin address</h2>
             <div class="text-center" ng-click="home.copyAddress(home.addr[index.walletId])" ng-show="home.addr[index.walletId] || home.generatingAddress">
-              <qrcode size="180" data="bitcoin:{{home.addr[index.walletId]}}"></qrcode>
-              <div ng-show="home.generatingAddress" style="position:relative; top:-186px; height:0px">
-                <div style="height:180px; width:180px; margin:auto; background: white">
-                  <div class="spinner" style="margin-top:60px">
+              <qrcode size="220" data="bitcoin:{{home.addr[index.walletId]}}"></qrcode>
+              <div ng-show="home.generatingAddress" style="position:relative; top:-226px; height:0px">
+                <div style="height:220px; width:220px; margin:auto; background: white">
+                  <div class="spinner" style="margin-top:85px">
                     <div class="rect1"></div>
                     <div class="rect2"></div>
                     <div class="rect3"></div>

From 11a679bd98429c947c4138efdc4f6f691abe629b Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 20 Jan 2016 10:06:15 -0300
Subject: [PATCH 02/17] New release v1.7.1

---
 cordova/config.xml                      | 2 +-
 cordova/ios/Copay-Info.plist            | 4 ++--
 cordova/wp/Package.appxmanifest         | 2 +-
 cordova/wp/Properties/WMAppManifest.xml | 2 +-
 package.json                            | 2 +-
 webkitbuilds/.desktop                   | 2 +-
 webkitbuilds/setup-win.iss              | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cordova/config.xml b/cordova/config.xml
index 5e89a1ee9..efe6a273d 100644
--- a/cordova/config.xml
+++ b/cordova/config.xml
@@ -2,7 +2,7 @@
 <widget id="com.bitpay.copay" 
   version="1.7.1"
   android-versionCode="63"
-  ios-CFBundleVersion="1.7.1">
+  ios-CFBundleVersion="1.7.2">
     <name>Copay</name>
     <description>
       A secure bitcoin wallet for friends and companies.
diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist
index 7b01cd8f2..6f53a5723 100644
--- a/cordova/ios/Copay-Info.plist
+++ b/cordova/ios/Copay-Info.plist
@@ -57,11 +57,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.1</string>
+	<string>1.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.7.1</string>
+	<string>1.7.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>
diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest
index 88a522150..dccb5be45 100644
--- a/cordova/wp/Package.appxmanifest
+++ b/cordova/wp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
-  <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="1.7.1.0" />
+  <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="1.7.2.0" />
   <mp:PhoneIdentity PhoneProductId="5381aa50-9069-11e4-84cc-293caf9cbdc8" PhonePublisherId="F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" />
   <Properties>
     <DisplayName>Copay Bitcoin Wallet</DisplayName>
diff --git a/cordova/wp/Properties/WMAppManifest.xml b/cordova/wp/Properties/WMAppManifest.xml
index 93b29b475..f24055486 100644
--- a/cordova/wp/Properties/WMAppManifest.xml
+++ b/cordova/wp/Properties/WMAppManifest.xml
@@ -9,7 +9,7 @@
     <Language code="es" />
     <Language code="ru" />
   </Languages>
-  <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="1.7.1.0" xmlns="" NotificationService="MPN">
+  <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="1.7.2.0" xmlns="" NotificationService="MPN">
     <IconPath IsRelative="true" IsResource="false">Assets\icon@2.png</IconPath>
     <Capabilities>
       <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
diff --git a/package.json b/package.json
index 82906f9fa..72a8549e7 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "copay",
   "description": "A multisignature wallet",
   "author": "BitPay",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "keywords": [
     "wallet",
     "copay",
diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop
index c9b59610a..91a53b6d1 100644
--- a/webkitbuilds/.desktop
+++ b/webkitbuilds/.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=1.7.1
+Version=1.7.2
 Name=Copay
 Comment=A multisignature wallet
 Exec=copay
diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss
index dff677608..fdf0a34d1 100755
--- a/webkitbuilds/setup-win.iss
+++ b/webkitbuilds/setup-win.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Copay"
-#define MyAppVersion "1.7.1"
+#define MyAppVersion "1.7.2"
 #define MyAppPublisher "BitPay"
 #define MyAppURL "https://copay.io"
 #define MyAppExeName "Copay.exe"

From 5300814681af1316eda471667e1b132fc027ef17 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 20 Jan 2016 10:19:49 -0300
Subject: [PATCH 03/17] Updates new version

---
 cordova/config.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cordova/config.xml b/cordova/config.xml
index efe6a273d..dedcdcc57 100644
--- a/cordova/config.xml
+++ b/cordova/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="com.bitpay.copay" 
-  version="1.7.1"
-  android-versionCode="63"
+  version="1.7.2"
+  android-versionCode="64"
   ios-CFBundleVersion="1.7.2">
     <name>Copay</name>
     <description>

From 0595fa07afe92d808a06b095293ecc74f36b04cb Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 20 Jan 2016 10:38:24 -0300
Subject: [PATCH 04/17] Hide share address while generating new address

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

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index bee224a42..eba6ccf03 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -364,7 +364,7 @@
               <span translate>Request a specific amount</span>
             </a>
           </div>
-          <div class="small-12 columns" ng-show="index.isCordova">
+          <div class="small-12 columns" ng-show="index.isCordova && !home.generatingAddress && home.addr[index.walletId]">
             <span class="button outline light-gray small round expand" 
               ng-click="home.shareAddress(home.addr[index.walletId])">
               <span translate>Share address</span>

From 0fbf1a05063db0403d6ba7b55b1bf4e3503d6a8f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 20 Jan 2016 10:49:34 -0300
Subject: [PATCH 05/17] display error is touch id failed

---
 src/js/controllers/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 17a43609e..5cf078261 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1472,7 +1472,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       },
       function(msg) {
         // ERROR
-        return cb(gettext('Invalid Touch ID'));
+        return cb(gettext('Error with Touch ID:') + msg);
       }
     );
   });

From a319a5e011acd16a732e30740090fc29fc5342b8 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Wed, 20 Jan 2016 11:15:44 -0300
Subject: [PATCH 06/17] fix ui bugs on txp details

---
 public/views/modals/txp-details.html | 2 +-
 src/css/mobile.css                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 91a91cb5d..162f1c258 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -23,7 +23,7 @@
     <span class="payment-proposal-to"
       ng-click="copyAddress(tx.toAddress)">
       <i class="fi-bitcoin left"></i>
-      <contact ng-if="!tx.hasMultiplesOutputs" class="dib enable_text_select ellipsis m5t size-14" address="{{tx.toAddress}}"></contact>
+      <contact ng-if="!tx.hasMultiplesOutputs" class="dib enable_text_select ellipsis m5t m5b size-14" address="{{tx.toAddress}}"></contact>
       <span ng-if="tx.hasMultiplesOutputs" translate>
         Multiple recipients
       </span>
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 468f7787a..cd9c9dd94 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -784,12 +784,12 @@ textarea:focus
 }
 
 .payment-proposal-to i {
-  margin-right: 10px;
+  position: absolute;
+  left: 25px;
   padding-right: 10px;
   border-right: 1px solid;
   border-color: rgba(255, 255, 255, 0.1);
   font-size: 20px;
-  vertical-align: middle;
 }
 
 ::-webkit-input-placeholder {

From 4ab36478fe44ed53988f0e634c9b7d21d63dc29d Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Wed, 20 Jan 2016 15:29:43 -0300
Subject: [PATCH 07/17] fix padding bugs

---
 public/views/backup.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index 08efd6c1c..f4923e355 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -32,7 +32,7 @@
     <div ng-show="wordsC.step == 1">
       <div ng-show="wordsC.mnemonicWords || (wordsC.credentialsEncrypted && !wordsC.deleted)">
         <h5 class="text-center" translate>Write your wallet seed</h5>
-        <div class="size-14 text-gray" ng-show="(index.n>1 && index.m != index.n )">
+        <div class="size-14 text-gray columns" ng-show="(index.n>1 && index.m != index.n )">
           <span translate>
             To restore this {{index.m}}-{{index.n}} <b>shared</b> wallet you will need
           </span>:
@@ -43,7 +43,7 @@
           </ol>
           </span>
         </div>
-        <div class="size-14 text-gray" ng-show="(index.n>1 && index.m == index.n )">
+        <div class="size-14 text-gray columns" ng-show="(index.n>1 && index.m == index.n )">
           <span translate>
             To restore this {{index.m}}-{{index.n}} <b>shared</b> wallet you will need
           </span>:

From 8e65298ff9cfd7831cc9768d9bb29339034408c0 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Wed, 20 Jan 2016 15:59:05 -0300
Subject: [PATCH 08/17] add row

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

diff --git a/public/views/backup.html b/public/views/backup.html
index f4923e355..3d129432d 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -30,7 +30,7 @@
     -->
 
     <div ng-show="wordsC.step == 1">
-      <div ng-show="wordsC.mnemonicWords || (wordsC.credentialsEncrypted && !wordsC.deleted)">
+      <div ng-show="wordsC.mnemonicWords || (wordsC.credentialsEncrypted && !wordsC.deleted)" class="row">
         <h5 class="text-center" translate>Write your wallet seed</h5>
         <div class="size-14 text-gray columns" ng-show="(index.n>1 && index.m != index.n )">
           <span translate>

From 0a5c32b9f335e43480a9518ff6cd291cd456bd04 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 20 Jan 2016 15:25:54 -0300
Subject: [PATCH 09/17] Touchid before Unlock on iOS

---
 public/views/modals/txp-details.html |   6 +-
 src/js/controllers/index.js          |   3 +
 src/js/controllers/walletHome.js     | 186 +++++++++++++--------------
 src/js/services/profileService.js    |   1 +
 4 files changed, 99 insertions(+), 97 deletions(-)

diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 162f1c258..fdd9cf4a1 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -170,12 +170,12 @@
     </ul>
   </div> 
 
-  <div class="columns text-center m20t" ng-if="tx.canBeRemoved">
-    <div class="text-gray size-12 m20b" ng-if="!tx.isGlidera && isShared" translate>
+  <div class="columns text-center m20t" ng-if="tx.canBeRemoved || (tx.status == 'accepted' && !tx.broadcastedOn)">
+    <div class="text-gray size-12 m20b" ng-show="!tx.isGlidera && isShared" translate>
       * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
     </div>
     <button class="tiny round outline dark-gray warning" ng-click="remove(tx)"
-      ng-disabled="loading" ng-show="tx.canBeRemoved">
+      ng-disabled="loading">
       <i class="fi-trash size-14 m5r"></i>
       <span translate>Delete Payment Proposal</span>
     </button>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 5cf078261..657ee5927 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1485,6 +1485,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         return cb(err, pass);
       },
     };
+    $timeout(function() {
+      $rootScope.$apply();
+    });
   });
 
   lodash.each(['NewCopayer', 'CopayerUpdated'], function(eventName) {
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index a9b977348..8d63f80f4 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -335,69 +335,70 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
       $scope.sign = function(txp) {
         var fc = profileService.focusedClient;
+        $scope.error = null;
 
         if (!fc.canSign() && !fc.isPrivKeyExternal())
           return;
 
-        if (fc.isPrivKeyEncrypted()) {
-          profileService.unlockFC(function(err) {
-            if (err) {
-              $scope.error = bwsError.msg(err);
-              return;
-            }
-            return $scope.sign(txp);
-          });
-          return;
-        };
-
-        self._setOngoingForSigning();
         $scope.loading = true;
-        $scope.error = null;
         $timeout(function() {
+
           requestTouchid(function(err) {
             if (err) {
-              self.setOngoingProcess();
               $scope.loading = false;
-              profileService.lockFC();
               $scope.error = err;
-              $scope.$digest();
+              $timeout(function() {
+                $scope.$digest();
+              });
               return;
             }
 
-            profileService.signTxProposal(txp, function(err, txpsi) {
-              self.setOngoingProcess();
+            profileService.unlockFC(function(err) {
               if (err) {
-                $scope.$emit('UpdateTx');
                 $scope.loading = false;
-                $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not accept payment'));
-                $scope.$digest();
-              } else {
-                //if txp has required signatures then broadcast it
-                var txpHasRequiredSignatures = txpsi.status == 'accepted';
-                if (txpHasRequiredSignatures) {
-                  self.setOngoingProcess(gettextCatalog.getString('Broadcasting transaction'));
-                  $scope.loading = true;
-                  fc.broadcastTxProposal(txpsi, function(err, txpsb, memo) {
-                    self.setOngoingProcess();
-                    $scope.loading = false;
-                    if (err) {
-                      $scope.$emit('UpdateTx');
-                      $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment'));
-                      $scope.$digest();
-                    } else {
-                      $log.debug('Transaction signed and broadcasted')
-                      if (memo)
-                        $log.info(memo);
-
-                      refreshUntilItChanges = true;
-                      $modalInstance.close(txpsb);
-                    }
-                  });
-                } else {
-                  $scope.loading = false;
-                  $modalInstance.close(txpsi);
-                }
+                $scope.error = bwsError.msg(err);
+                $timeout(function() {
+                  $scope.$digest();
+                });
+                return;
               }
+
+              self._setOngoingForSigning();
+              profileService.signTxProposal(txp, function(err, txpsi) {
+                self.setOngoingProcess();
+                if (err) {
+                  $scope.$emit('UpdateTx');
+                  $scope.loading = false;
+                  $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not accept payment'));
+                  $scope.$digest();
+                } else {
+                  //if txp has required signatures then broadcast it
+                  var txpHasRequiredSignatures = txpsi.status == 'accepted';
+                  if (txpHasRequiredSignatures) {
+                    self.setOngoingProcess(gettextCatalog.getString('Broadcasting transaction'));
+                    $scope.loading = true;
+                    fc.broadcastTxProposal(txpsi, function(err, txpsb, memo) {
+                      self.setOngoingProcess();
+                      $scope.loading = false;
+                      if (err) {
+                        $scope.$emit('UpdateTx');
+                        $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment'));
+                        $scope.$digest();
+                      } else {
+                        $log.debug('Transaction signed and broadcasted')
+                        if (memo)
+                          $log.info(memo);
+
+                        refreshUntilItChanges = true;
+                        $modalInstance.close(txpsb);
+                      }
+                    });
+                  } else {
+                    $scope.loading = false;
+                    $modalInstance.close(txpsi);
+                  }
+                }
+              });
             });
           });
         }, 100);
@@ -833,6 +834,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     var currentSpendUnconfirmed = configWallet.spendUnconfirmed;
     var currentFeeLevel = walletSettings.feeLevel || 'normal';
 
+    this.resetError();
+
     if (isCordova && this.isWindowsPhoneApp) {
       this.hideAddress = false;
       this.hideAmount = false;
@@ -842,15 +845,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     if (form.$invalid) {
       this.error = gettext('Unable to send transaction proposal');
       return;
-    }
-
-    if (fc.isPrivKeyEncrypted()) {
-      profileService.unlockFC(function(err) {
-        if (err) return self.setSendError(err);
-        return self.submitForm();
-      });
-      return;
-    };
+    } 
 
     var comment = form.comment.$modelValue;
 
@@ -869,7 +864,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       }
     };
 
-    self.setOngoingProcess(gettextCatalog.getString('Creating transaction'));
     $timeout(function() {
       var paypro = self._paypro;
       var address, amount;
@@ -879,8 +873,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
       requestTouchid(function(err) {
         if (err) {
-          profileService.lockFC();
-          self.setOngoingProcess();
           self.error = err;
           $timeout(function() {
             $scope.$digest();
@@ -888,42 +880,48 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
           return;
         }
 
-        getFee(function(err, feePerKb) {
-          if (err) $log.debug(err);
-          fc.sendTxProposal({
-            toAddress: address,
-            amount: amount,
-            message: comment,
-            payProUrl: paypro ? paypro.url : null,
-            feePerKb: feePerKb,
-            excludeUnconfirmedUtxos: currentSpendUnconfirmed ? false : true
-          }, function(err, txp) {
-            if (err) {
-              self.setOngoingProcess();
-              profileService.lockFC();
-              return self.setSendError(err);
-            }
-
-            if (!fc.canSign() && !fc.isPrivKeyExternal()) {
-              $log.info('No signing proposal: No private key')
-              self.setOngoingProcess();
-              self.resetForm();
-              txStatus.notify(txp, function() {
-                return $scope.$emit('Local/TxProposalAction');
-              });
-              return;
-            }
-
-            self.signAndBroadcast(txp, function(err) {
-              self.setOngoingProcess();
-              self.resetForm();
+        profileService.unlockFC(function(err) {
+          if (err) {
+            return self.setSendError(err);
+          } 
+        
+          self.setOngoingProcess(gettextCatalog.getString('Creating transaction'));
+          getFee(function(err, feePerKb) {
+            if (err) $log.debug(err);
+            fc.sendTxProposal({
+              toAddress: address,
+              amount: amount,
+              message: comment,
+              payProUrl: paypro ? paypro.url : null,
+              feePerKb: feePerKb,
+              excludeUnconfirmedUtxos: currentSpendUnconfirmed ? false : true
+            }, function(err, txp) {
               if (err) {
-                self.error = err.message ? err.message : gettext('The payment was created but could not be completed. Please try again from home screen');
-                $scope.$emit('Local/TxProposalAction');
-                $timeout(function() {
-                  $scope.$digest();
-                }, 1);
-              } else go.walletHome();
+                self.setOngoingProcess();
+                return self.setSendError(err);
+              }
+
+              if (!fc.canSign() && !fc.isPrivKeyExternal()) {
+                $log.info('No signing proposal: No private key')
+                self.setOngoingProcess();
+                self.resetForm();
+                txStatus.notify(txp, function() {
+                  return $scope.$emit('Local/TxProposalAction');
+                });
+                return;
+              }
+
+              self.signAndBroadcast(txp, function(err) {
+                self.setOngoingProcess();
+                self.resetForm();
+                if (err) {
+                  self.error = err.message ? err.message : gettext('The payment was created but could not be completed. Please try again from home screen');
+                  $scope.$emit('Local/TxProposalAction');
+                  $timeout(function() {
+                    $scope.$digest();
+                  }, 1);
+                } else go.walletHome();
+              });
             });
           });
         });
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 952882480..52e42ce57 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -630,6 +630,7 @@ angular.module('copayApp.services')
 
     root.unlockFC = function(cb) {
       var fc = root.focusedClient;
+      if (!fc.isPrivKeyEncrypted()) return cb();
       $log.debug('Wallet is encrypted');
       $rootScope.$emit('Local/NeedsPassword', false, function(err2, password) {
         if (err2 || !password) {

From 50497c8e52f32f81716d35c224559fa17c70bfe8 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 20 Jan 2016 16:59:23 -0300
Subject: [PATCH 10/17] Wait for locking wallet automatically

---
 src/js/services/profileService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 52e42ce57..cdcb4126c 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -651,7 +651,7 @@ angular.module('copayApp.services')
             $log.debug('Locking wallet automatically');
             root.lockFC();
           };
-        }, 2000);
+        }, 60000);
         return cb();
       });
     };

From 6d35fe12391371b0daf4314c997fbddacbb107d7 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 21 Jan 2016 09:55:28 -0300
Subject: [PATCH 11/17] hide "reject" button in 1-1 + autolock unlocked
 encrypted wallets on startup

---
 public/views/modals/txp-details.html |  2 +-
 src/js/services/profileService.js    | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index fdd9cf4a1..017491ea5 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -42,7 +42,7 @@
     </div>
 
     <div class="oh p20t white" ng-if="tx.pendingForUs">
-      <div class="large-6 medium-6 small-6 columns">
+      <div class="large-6 medium-6 small-6 columns" ng-show="isShared">
         <button class="button outline round dark-gray expand" ng-click="reject(tx);"
                                                               ng-disabled="loading">
           <i class="fi-x"></i>
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index cdcb4126c..d39a382c9 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -99,6 +99,11 @@ angular.module('copayApp.services')
       root.walletClients[credentials.walletId].started = true;
       root.walletClients[credentials.walletId].doNotVerifyPayPro = isChromeApp;
 
+      if (client.hasPrivKeyEncrypted() && !client.isPrivKeyEncrypted()) {
+        $log.warn('Auto locking unlocked wallet:' + credentials.walletId);
+        client.lock();
+      }
+
       client.initialize({}, function(err) {
         if (err) {
           $log.error('Could not init notifications err:', err);
@@ -110,8 +115,8 @@ angular.module('copayApp.services')
 
     root.setWalletClients = function() {
       var credentials = root.profile.credentials;
-      lodash.each(credentials, function(credentials) {
-        root.setWalletClient(credentials);
+      lodash.each(credentials, function(credential) {
+        root.setWalletClient(credential);
       });
       $rootScope.$emit('Local/WalletListUpdated');
     };
@@ -630,7 +635,10 @@ angular.module('copayApp.services')
 
     root.unlockFC = function(cb) {
       var fc = root.focusedClient;
-      if (!fc.isPrivKeyEncrypted()) return cb();
+
+      if (!fc.isPrivKeyEncrypted()) 
+        return cb();
+
       $log.debug('Wallet is encrypted');
       $rootScope.$emit('Local/NeedsPassword', false, function(err2, password) {
         if (err2 || !password) {
@@ -646,12 +654,6 @@ angular.module('copayApp.services')
             message: gettext('Wrong password')
           });
         }
-        $timeout(function() {
-          if (fc.hasPrivKeyEncrypted()) {
-            $log.debug('Locking wallet automatically');
-            root.lockFC();
-          };
-        }, 60000);
         return cb();
       });
     };

From bef3e5789c055742b1e7600e1b1eb8133e02daaa Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 21 Jan 2016 14:52:58 -0300
Subject: [PATCH 12/17] refactor sign

---
 src/js/controllers/index.js       |  14 --
 src/js/controllers/sellGlidera.js | 183 +++++++++++-------------
 src/js/controllers/walletHome.js  | 230 ++++++++----------------------
 src/js/services/profileService.js |  56 +-------
 4 files changed, 141 insertions(+), 342 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 657ee5927..4f5c44b7a 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1463,20 +1463,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.setTab(tab, reset);
   });
 
-  $rootScope.$on('Local/RequestTouchid', function(event, cb) {
-    window.plugins.touchid.verifyFingerprint(
-      gettextCatalog.getString('Scan your fingerprint please'),
-      function(msg) {
-        // OK
-        return cb();
-      },
-      function(msg) {
-        // ERROR
-        return cb(gettext('Error with Touch ID:') + msg);
-      }
-    );
-  });
-
   $rootScope.$on('Local/NeedsPassword', function(event, isSetup, cb) {
     self.askPassword = {
       isSetup: isSetup,
diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js
index cbae3f8f3..a789274c8 100644
--- a/src/js/controllers/sellGlidera.js
+++ b/src/js/controllers/sellGlidera.js
@@ -1,7 +1,7 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('sellGlideraController', 
-  function($scope, $timeout, $log, $modal, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp, animationService) {
+angular.module('copayApp.controllers').controller('sellGlideraController',
+  function($scope, $timeout, $log, $modal, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp, animationService, txSignService) {
 
     var self = this;
     var config = configService.getSync();
@@ -38,7 +38,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
             }, 100);
           }
         });
-      } catch(e) {
+      } catch (e) {
         $log.debug(e);
       };
     };
@@ -57,12 +57,14 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
 
         $scope.selectWallet = function(walletId, walletName) {
           if (!profileService.getClient(walletId).isComplete()) {
-            self.error = bwsError.msg({'code': 'WALLET_NOT_COMPLETE'}, 'Could not choose the wallet');
+            self.error = bwsError.msg({
+              'code': 'WALLET_NOT_COMPLETE'
+            }, 'Could not choose the wallet');
             $modalInstance.dismiss('cancel');
             return;
           }
           $modalInstance.close({
-            'walletId': walletId, 
+            'walletId': walletId,
             'walletName': walletName,
           });
         };
@@ -70,8 +72,8 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
 
       var modalInstance = $modal.open({
         templateUrl: 'views/modals/glidera-wallets.html',
-          windowClass: animationService.modalAnimated.slideUp,
-          controller: ModalInstanceCtrl,
+        windowClass: animationService.modalAnimated.slideUp,
+        controller: ModalInstanceCtrl,
       });
 
       modalInstance.result.finally(function() {
@@ -101,12 +103,11 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
         self.gettingSellPrice = false;
         if (err) {
           self.error = 'Could not get exchange information. Please, try again.';
-        }
-        else {
+        } else {
           self.error = null;
           self.sellPrice = sellPrice;
         }
-      });     
+      });
     };
 
     this.get2faCode = function(token) {
@@ -117,8 +118,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
           self.loading = null;
           if (err) {
             self.error = 'Could not send confirmation code to your phone';
-          }
-          else {
+          } else {
             self.show2faCodeInput = sent;
           }
         });
@@ -129,107 +129,86 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
       var self = this;
       self.error = null;
 
-      this.loading = 'Selling Bitcoin...';
-      $timeout(function() {
-        addressService.getAddress(fc.credentials.walletId, null, function(err, refundAddress) {
-          if (!refundAddress) {
-            self.loading = null;
-            self.error = bwsError.msg(err, 'Could not create address');
-            return;
-          }
-          glideraService.getSellAddress(token, function(error, sellAddress) {
-            if (!sellAddress) {
+
+      txSignService.prepare(function(err) {
+        if (err) {
+          self.error = err;
+          return;
+        }
+        this.loading = 'Selling Bitcoin...';
+        $timeout(function() {
+          addressService.getAddress(fc.credentials.walletId, null, function(err, refundAddress) {
+            if (!refundAddress) {
               self.loading = null;
-              self.error = 'Could not get the destination bitcoin address';
+              self.error = bwsError.msg(err, 'Could not create address');
               return;
             }
-            var amount = parseInt((self.sellPrice.qty * 100000000).toFixed(0));
+            glideraService.getSellAddress(token, function(error, sellAddress) {
+              if (!sellAddress) {
+                self.loading = null;
+                self.error = 'Could not get the destination bitcoin address';
+                return;
+              }
+              var amount = parseInt((self.sellPrice.qty * 100000000).toFixed(0));
 
-            feeService.getCurrentFeeValue(self.currentFeeLevel, function(err, feePerKb) {
-              if (err) $log.debug(err);
-              fc.sendTxProposal({
-                toAddress: sellAddress,
-                amount: amount,
-                message: 'Glidera transaction',
-                customData: {'glideraToken': token},
-                payProUrl: null,
-                feePerKb: feePerKb,
-                excludeUnconfirmedUtxos: self.currentSpendUnconfirmed ? false : true
-              }, function(err, txp) {
-                if (err) {
-                  profileService.lockFC();
-                  $log.error(err);
-                  $timeout(function() {
-                    self.loading = null;
-                    self.error = bwsError.msg(err, 'Error');
-                  }, 1);
-                  return;
-                }
-
-                if (!fc.canSign()) {
-                  self.loading = null;
-                  $log.info('No signing proposal: No private key');
-                  return;
-                }
-
-                _signTx(txp, function(err, txp, rawTx) {
-                  profileService.lockFC();
+              feeService.getCurrentFeeValue(self.currentFeeLevel, function(err, feePerKb) {
+                if (err) $log.debug(err);
+                fc.sendTxProposal({
+                  toAddress: sellAddress,
+                  amount: amount,
+                  message: 'Glidera transaction',
+                  customData: {
+                    'glideraToken': token
+                  },
+                  payProUrl: null,
+                  feePerKb: feePerKb,
+                  excludeUnconfirmedUtxos: self.currentSpendUnconfirmed ? false : true
+                }, function(err, txp) {
                   if (err) {
-                    self.loading = null;
-                    self.error = err;
-                    $scope.$apply();
-                  }
-                  else {
-                    var data = {
-                      refundAddress: refundAddress,
-                      signedTransaction: rawTx,
-                      priceUuid: self.sellPrice.priceUuid,
-                      useCurrentPrice: self.sellPrice.priceUuid ? false : true,
-                      ip: null 
-                    };
-                    glideraService.sell(token, twoFaCode, data, function(err, data) {
+                    profileService.lockFC();
+                    $log.error(err);
+                    $timeout(function() {
                       self.loading = null;
-                      if (err) {
-                        self.error = err;
-                        fc.removeTxProposal(txp, function(err, txpb) {
-                          $timeout(function() {
-                            $scope.$emit('Local/GlideraError');
-                          }, 100);
-                        });
-                      }
-                      else {
-                        self.success = data;
-                        $scope.$emit('Local/GlideraTx');
-                      }
-                    });
+                      self.error = bwsError.msg(err, 'Error');
+                    }, 1);
+                    return;
                   }
+
+                  txSignService.sign(tx, function(err, txp) {
+                    if (err) {
+                      self.loading = null;
+                      self.error = err;
+                      $scope.$apply();
+                    } else {
+                      var rawTx = txp.raw;
+                      var data = {
+                        refundAddress: refundAddress,
+                        signedTransaction: rawTx,
+                        priceUuid: self.sellPrice.priceUuid,
+                        useCurrentPrice: self.sellPrice.priceUuid ? false : true,
+                        ip: null
+                      };
+                      glideraService.sell(token, twoFaCode, data, function(err, data) {
+                        self.loading = null;
+                        if (err) {
+                          self.error = err;
+                          fc.removeTxProposal(txp, function(err, txpb) {
+                            $timeout(function() {
+                              $scope.$emit('Local/GlideraError');
+                            }, 100);
+                          });
+                        } else {
+                          self.success = data;
+                          $scope.$emit('Local/GlideraTx');
+                        }
+                      });
+                    }
+                  });
                 });
               });
             });
           });
-        });
-
-      }, 100);
-    
-    };
-
-    var _signTx = function(txp, cb) {
-      var self = this;
-      fc.signTxProposal(txp, function(err, signedTx) {
-        profileService.lockFC();
-        if (err) {
-          err = bwsError.msg(err, 'Could not accept payment');
-          return cb(err);
-        }
-        else {
-          if (signedTx.status == 'accepted') {
-            return cb(null, txp, signedTx.raw);
-
-          } else {
-            return cb('The transaction could not be signed');
-          }
-        }
+        }, 100);
       });
     };
-
   });
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 8d63f80f4..8bd468743 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, isMobile, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService) {
+angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, isMobile, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService, txSignService) {
 
   var self = this;
   window.ignoreMobilePause = false;
@@ -87,16 +87,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     $rootScope.hideMenuBar = false;
   });
 
-  var requestTouchid = function(cb) {
-    var fc = profileService.focusedClient;
-    config.touchIdFor = config.touchIdFor || {};
-    if (window.touchidAvailable && config.touchIdFor[fc.credentials.walletId]) {
-      $rootScope.$emit('Local/RequestTouchid', cb);
-    } else {
-      return cb();
-    }
-  };
-
   this.onQrCodeScanned = function(data) {
     if (data) go.send();
     $rootScope.$emit('dataScanned', data);
@@ -336,72 +326,25 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       $scope.sign = function(txp) {
         var fc = profileService.focusedClient;
         $scope.error = null;
-
-        if (!fc.canSign() && !fc.isPrivKeyExternal())
-          return;
-
         $scope.loading = true;
-        $timeout(function() {
 
-          requestTouchid(function(err) {
-            if (err) {
-              $scope.loading = false;
-              $scope.error = err;
-              $timeout(function() {
-                $scope.$digest();
-              });
-              return;
-            }
+        txSignService.prepareAndSignAndBroadcast(txp, {
+          reporterFn: self.setOngoingProcess.bind(self)
+        }, function(err, txp) {
+          $scope.loading = false;
+          $scope.$emit('UpdateTx');
 
-            profileService.unlockFC(function(err) {
-              if (err) {
-                $scope.loading = false;
-                $scope.error = bwsError.msg(err);
-                $timeout(function() {
-                  $scope.$digest();
-                });
-                return;
-              }
-
-              self._setOngoingForSigning();
-              profileService.signTxProposal(txp, function(err, txpsi) {
-                self.setOngoingProcess();
-                if (err) {
-                  $scope.$emit('UpdateTx');
-                  $scope.loading = false;
-                  $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not accept payment'));
-                  $scope.$digest();
-                } else {
-                  //if txp has required signatures then broadcast it
-                  var txpHasRequiredSignatures = txpsi.status == 'accepted';
-                  if (txpHasRequiredSignatures) {
-                    self.setOngoingProcess(gettextCatalog.getString('Broadcasting transaction'));
-                    $scope.loading = true;
-                    fc.broadcastTxProposal(txpsi, function(err, txpsb, memo) {
-                      self.setOngoingProcess();
-                      $scope.loading = false;
-                      if (err) {
-                        $scope.$emit('UpdateTx');
-                        $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment'));
-                        $scope.$digest();
-                      } else {
-                        $log.debug('Transaction signed and broadcasted')
-                        if (memo)
-                          $log.info(memo);
-
-                        refreshUntilItChanges = true;
-                        $modalInstance.close(txpsb);
-                      }
-                    });
-                  } else {
-                    $scope.loading = false;
-                    $modalInstance.close(txpsi);
-                  }
-                }
-              });
+          if (err) {
+            $scope.error = err;
+            $timeout(function() {
+              $scope.$digest();
             });
-          });
-        }, 100);
+            return;
+          }
+          refreshUntilItChanges = true;
+          $modalInstance.close(txp);
+          return;
+        });
       };
 
       $scope.reject = function(txp) {
@@ -845,7 +788,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     if (form.$invalid) {
       this.error = gettext('Unable to send transaction proposal');
       return;
-    } 
+    }
 
     var comment = form.comment.$modelValue;
 
@@ -871,57 +814,52 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       address = form.address.$modelValue;
       amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0));
 
-      requestTouchid(function(err) {
+      txSignService.prepare(function(err) {
         if (err) {
-          self.error = err;
-          $timeout(function() {
-            $scope.$digest();
-          }, 1);
-          return;
+          return self.setSendError(err);
         }
+        self.setOngoingProcess(gettextCatalog.getString('Creating transaction'));
+        getFee(function(err, feePerKb) {
+          if (err) $log.debug(err);
+          fc.sendTxProposal({
+            toAddress: address,
+            amount: amount,
+            message: comment,
+            payProUrl: paypro ? paypro.url : null,
+            feePerKb: feePerKb,
+            excludeUnconfirmedUtxos: currentSpendUnconfirmed ? false : true
+          }, function(err, txp) {
+            if (err) {
+              self.setOngoingProcess();
+              return self.setSendError(err);
+            }
 
-        profileService.unlockFC(function(err) {
-          if (err) {
-            return self.setSendError(err);
-          } 
-        
-          self.setOngoingProcess(gettextCatalog.getString('Creating transaction'));
-          getFee(function(err, feePerKb) {
-            if (err) $log.debug(err);
-            fc.sendTxProposal({
-              toAddress: address,
-              amount: amount,
-              message: comment,
-              payProUrl: paypro ? paypro.url : null,
-              feePerKb: feePerKb,
-              excludeUnconfirmedUtxos: currentSpendUnconfirmed ? false : true
-            }, function(err, txp) {
-              if (err) {
-                self.setOngoingProcess();
-                return self.setSendError(err);
-              }
-
-              if (!fc.canSign() && !fc.isPrivKeyExternal()) {
-                $log.info('No signing proposal: No private key')
-                self.setOngoingProcess();
-                self.resetForm();
-                txStatus.notify(txp, function() {
-                  return $scope.$emit('Local/TxProposalAction');
-                });
-                return;
-              }
-
-              self.signAndBroadcast(txp, function(err) {
-                self.setOngoingProcess();
-                self.resetForm();
-                if (err) {
-                  self.error = err.message ? err.message : gettext('The payment was created but could not be completed. Please try again from home screen');
-                  $scope.$emit('Local/TxProposalAction');
-                  $timeout(function() {
-                    $scope.$digest();
-                  }, 1);
-                } else go.walletHome();
+            if (!fc.canSign() && !fc.isPrivKeyExternal()) {
+              self.setOngoingProcess();
+              $log.info('No signing proposal: No private key')
+              self.resetForm();
+              txStatus.notify(txp, function() {
+                return $scope.$emit('Local/TxProposalAction');
               });
+              return;
+            }
+
+            txSignService.signAndBroadcast(txp, {
+              reporterFn: self.setOngoingProcess.bind(self)
+            }, function(err, txp) {
+              self.resetForm();
+              if (err) {
+                self.error = err.message ? err.message : gettext('The payment was created but could not be completed. Please try again from home screen');
+                $scope.$emit('Local/TxProposalAction');
+                $timeout(function() {
+                  $scope.$digest();
+                }, 1);
+              } else {
+                go.walletHome();
+                txStatus.notify(txp, function() {
+                  $scope.$emit('Local/TxProposalAction', true);
+                });
+              };
             });
           });
         });
@@ -929,56 +867,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     }, 100);
   };
 
-  this._setOngoingForSigning = function() {
-    var fc = profileService.focusedClient;
-
-    if (fc.isPrivKeyExternal() && fc.getPrivKeyExternalSourceName() == 'ledger') {
-      self.setOngoingProcess(gettextCatalog.getString('Requesting Ledger Wallet to sign'));
-    } else {
-      self.setOngoingProcess(gettextCatalog.getString('Signing payment'));
-    }
-  };
-
-  this.signAndBroadcast = function(txp, cb) {
-    var fc = profileService.focusedClient;
-
-    this._setOngoingForSigning();
-    profileService.signTxProposal(txp, function(err, signedTx) {
-      self.setOngoingProcess();
-      if (err) {
-        if (!lodash.isObject(err)) {
-          err = { message: err};
-        }
-        err.message = bwsError.msg(err, gettextCatalog.getString('The payment was created but could not be signed. Please try again from home screen'));
-        return cb(err);
-      }
-
-      if (signedTx.status == 'accepted') {
-        self.setOngoingProcess(gettextCatalog.getString('Broadcasting transaction'));
-        fc.broadcastTxProposal(signedTx, function(err, btx, memo) {
-          self.setOngoingProcess();
-          if (err) {
-            err.message = bwsError.msg(err, gettextCatalog.getString('The payment was signed but could not be broadcasted. Please try again from home screen'));
-            return cb(err);
-          }
-          if (memo)
-            $log.info(memo);
-
-          txStatus.notify(btx, function() {
-            $scope.$emit('Local/TxProposalAction', true);
-            return cb();
-          });
-        });
-      } else {
-        self.setOngoingProcess();
-        txStatus.notify(signedTx, function() {
-          $scope.$emit('Local/TxProposalAction');
-          return cb();
-        });
-      }
-    });
-  };
-
   this.setForm = function(to, amount, comment) {
     var form = $scope.sendForm;
     if (to) {
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index d39a382c9..37ff6a700 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -1,6 +1,6 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, gettextCatalog, nodeWebkit, bwsError, uxLanguage, ledger, bitcore, trezor) {
+  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, gettextCatalog, nodeWebkit, bwsError, uxLanguage, bitcore) {
 
     var root = {};
 
@@ -683,59 +683,5 @@ angular.module('copayApp.services')
       return lodash.sortBy(ret, 'name');
     };
 
-    root._signWithLedger = function(txp, cb) {
-      var fc = root.focusedClient;
-      $log.info('Requesting Ledger Chrome app to sign the transaction');
-
-      ledger.signTx(txp, fc.credentials.account, function(result) {
-        $log.debug('Ledger response', result);
-        if (!result.success)
-          return cb(result.message || result.error);
-
-        txp.signatures = lodash.map(result.signatures, function(s) {
-          return s.substring(0, s.length - 2);
-        });
-        return fc.signTxProposal(txp, cb);
-      });
-    };
-
-
-    root._signWithTrezor = function(txp, cb) {
-      var fc = root.focusedClient;
-      $log.info('Requesting Trezor to sign the transaction');
-
-      var xPubKeys = lodash.pluck(fc.credentials.publicKeyRing, 'xPubKey');
-      trezor.signTx(xPubKeys, txp, fc.credentials.account, function(err, result) {
-        if (err) return cb(err);
-
-        $log.debug('Trezor response', result);
-        txp.signatures = result.signatures;
-        return fc.signTxProposal(txp, cb);
-      });
-    };
-
-
-    root.signTxProposal = function(txp, cb) {
-      var fc = root.focusedClient;
-
-      if (fc.isPrivKeyExternal()) {
-        switch (fc.getPrivKeyExternalSourceName()) {
-          case 'ledger':
-            return root._signWithLedger(txp, cb);
-          case 'trezor':
-            return root._signWithTrezor(txp, cb);
-          default:
-            var msg = 'Unsupported External Key:' + fc.getPrivKeyExternalSourceName();
-            $log.error(msg);
-            return cb(msg);
-        }
-      } else {
-        return fc.signTxProposal(txp, function(err, signedTxp) {
-          root.lockFC();
-          return cb(err, signedTxp);
-        });
-      }
-    };
-
     return root;
   });

From 021f82fede64e470c4c5725cc3d539f1a00fa57d Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 21 Jan 2016 15:14:18 -0300
Subject: [PATCH 13/17] fix touchId

---
 src/js/services/txSignService.js | 184 +++++++++++++++++++++++++++++++
 1 file changed, 184 insertions(+)
 create mode 100644 src/js/services/txSignService.js

diff --git a/src/js/services/txSignService.js b/src/js/services/txSignService.js
new file mode 100644
index 000000000..fb71cf289
--- /dev/null
+++ b/src/js/services/txSignService.js
@@ -0,0 +1,184 @@
+'use strict';
+
+angular.module('copayApp.services').factory('txSignService', function($rootScope, profileService, gettextCatalog, lodash, trezor, ledger, configService, bwsError, $log) {
+  var root = {};
+  var config = configService.getSync();
+
+  var reportSigningStatus = function(opts) {
+    if (!opts.reporterFn) return;
+
+    var fc = profileService.focusedClient;
+
+    if (fc.isPrivKeyExternal()) {
+      if (fc.getPrivKeyExternalSourceName() == 'ledger') {
+        opts.reporterFn(gettextCatalog.getString('Requesting Ledger Wallet to sign'));
+      } else if (fc.getPrivKeyExternalSourceName() == 'trezor') {
+        opts.reporterFn(gettextCatalog.getString('Requesting Trezor Wallet to sign'));
+      }
+    } else {
+      opts.reporterFn(gettextCatalog.getString('Signing payment'));
+    }
+  };
+
+  var reportBroadcastingStatus = function(opts) {
+    if (!opts.reporterFn) return;
+
+    opts.reporterFn(gettextCatalog.getString('Broadcasting transaction'));
+  };
+
+  var stopReport = function(opts) {
+    if (!opts.reporterFn) return;
+
+    opts.reporterFn();
+  };
+
+  var requestTouchId = function(cb) {
+    try {
+      window.plugins.touchid.verifyFingerprint(
+        gettextCatalog.getString('Scan your fingerprint please'),
+        function(msg) {
+          $log.debug('Touch ID OK');
+          return cb();
+        },
+        function(msg) {
+          $log.debug('Touch ID Failed:' + msg);
+          return cb(gettext('Touch ID Failed:') + msg);
+        }
+      );
+    } catch (e) {
+      $log.debug('Touch ID Failed:' + e);
+      return cb(gettext('Touch ID Failed:') + e);
+    };
+  };
+
+  root.checkTouchId = function(cb) {
+    var fc = profileService.focusedClient;
+    config.touchIdFor = config.touchIdFor || {};
+    if (window.touchidAvailable && config.touchIdFor[fc.credentials.walletId]) {
+      requestTouchId(cb);
+    } else {
+      return cb();
+    }
+  };
+
+  root.prepare = function(cb) {
+    var fc = profileService.focusedClient;
+    if (!fc.canSign() && !fc.isPrivKeyExternal())
+      return cb('Cannot sign'); // should never happen, no need to translate
+
+    root.checkTouchId(function(err) {
+      if (err) {
+        return cb(err);
+      };
+
+      profileService.unlockFC(function(err) {
+        if (err) {
+          return cb(bwsError.msg(err));
+        };
+
+        return cb();
+      });
+    });
+  };
+
+  var _signWithLedger = function(txp, cb) {
+    var fc = root.focusedClient;
+    $log.info('Requesting Ledger Chrome app to sign the transaction');
+
+    ledger.signTx(txp, fc.credentials.account, function(result) {
+      $log.debug('Ledger response', result);
+      if (!result.success)
+        return cb(result.message || result.error);
+
+      txp.signatures = lodash.map(result.signatures, function(s) {
+        return s.substring(0, s.length - 2);
+      });
+      return fc.signTxProposal(txp, cb);
+    });
+  };
+
+  var _signWithTrezor = function(txp, cb) {
+    var fc = root.focusedClient;
+    $log.info('Requesting Trezor  to sign the transaction');
+
+    var xPubKeys = lodash.pluck(fc.credentials.publicKeyRing, 'xPubKey');
+    trezor.signTx(xPubKeys, txp, fc.credentials.account, function(err, result) {
+      if (err) return cb(err);
+
+      $log.debug('Trezor response', result);
+      txp.signatures = result.signatures;
+      return fc.signTxProposal(txp, cb);
+    });
+  };
+
+  root.sign = function(txp, cb) {
+    var fc = profileService.focusedClient;
+
+    if (fc.isPrivKeyExternal()) {
+      switch (fc.getPrivKeyExternalSourceName()) {
+        case 'ledger':
+          return _signWithLedger(txp, cb);
+        case 'trezor':
+          return _signWithTrezor(txp, cb);
+        default:
+          var msg = 'Unsupported External Key:' + fc.getPrivKeyExternalSourceName();
+          $log.error(msg);
+          return cb(msg);
+      }
+    } else {
+      fc.signTxProposal(txp, function(err, signedTxp) {
+        profileService.lockFC();
+        return cb(err, signedTxp);
+      });
+    }
+  };
+
+  root.signAndBroadcast = function(txp, opts, cb) {
+    reportSigningStatus(opts);
+
+    var fc = profileService.focusedClient;
+    root.sign(txp, function(err, txp) {
+      if (err) {
+        stopReport(opts);
+        return cb(bwsError.msg(err), gettextCatalog.getString('Could not accept payment'));
+      };
+
+      if (txp.status != 'accepted')
+        return (null, txp);
+
+      reportBroadcastingStatus(opts);
+      fc.broadcastTxProposal(txp, function(err, txp, memo) {
+        stopReport(opts);
+
+        if (err) {
+          return cb(bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment')));
+        };
+
+        $log.debug('Transaction signed and broadcasted')
+
+        if (memo)
+          $log.info(memo);
+
+        return cb(null, txp);
+      });
+    });
+  };
+
+  root.prepareAndSignAndBroadcast = function(txp, opts, cb) {
+    reportSigningStatus(opts);
+    root.prepare(function(err) {
+      if (err) {
+        stopReport(opts);
+        return cb(err);
+      };
+      root.signAndBroadcast(txp, opts, function(err, txp) {
+        if (err) {
+          stopReport(opts);
+          return cb(err);
+        };
+        return cb(null, txp);
+      });
+    });
+  };
+  return root;
+});

From d35e4a93dabf2d3cd1c1e0558ea48699e80eb72f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 21 Jan 2016 15:42:59 -0300
Subject: [PATCH 14/17] glidera fixes

---
 src/js/controllers/sellGlidera.js | 8 ++++----
 src/js/services/configService.js  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js
index a789274c8..a3bc09b62 100644
--- a/src/js/controllers/sellGlidera.js
+++ b/src/js/controllers/sellGlidera.js
@@ -112,7 +112,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
 
     this.get2faCode = function(token) {
       var self = this;
-      this.loading = 'Sending 2FA code...';
+      self.loading = 'Sending 2FA code...';
       $timeout(function() {
         glideraService.get2faCode(token, function(err, sent) {
           self.loading = null;
@@ -135,7 +135,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
           self.error = err;
           return;
         }
-        this.loading = 'Selling Bitcoin...';
+        self.loading = 'Selling Bitcoin...';
         $timeout(function() {
           addressService.getAddress(fc.credentials.walletId, null, function(err, refundAddress) {
             if (!refundAddress) {
@@ -174,7 +174,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
                     return;
                   }
 
-                  txSignService.sign(tx, function(err, txp) {
+                  txSignService.sign(txp, function(err, txp) {
                     if (err) {
                       self.loading = null;
                       self.error = err;
@@ -192,7 +192,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
                         self.loading = null;
                         if (err) {
                           self.error = err;
-                          fc.removeTxProposal(txp, function(err, txpb) {
+                          fc.removeTxProposal(txp, function(err, txp) {
                             $timeout(function() {
                               $scope.$emit('Local/GlideraError');
                             }, 100);
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 0d8484ac9..6711ea2a4 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -94,7 +94,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
 
       // Glidera
       // Disabled for testnet
-      configCache.glidera.testnet = false;
+      configCache.glidera.testnet = true;
 
       $log.debug('Preferences read:', configCache)
       return cb(err, configCache);

From 8bdd086108c7af13eaab5b4fb620d14d32515bd5 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 21 Jan 2016 16:42:06 -0300
Subject: [PATCH 15/17] Fix Glidera OAUTH

---
 src/js/controllers/glidera.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js
index df876cf9a..612a8b6a7 100644
--- a/src/js/controllers/glidera.js
+++ b/src/js/controllers/glidera.js
@@ -3,7 +3,6 @@
 angular.module('copayApp.controllers').controller('glideraController', 
   function($rootScope, $scope, $timeout, $modal, profileService, configService, storageService, glideraService, isChromeApp, animationService, lodash) {
 
-    window.ignoreMobilePause = true;
 
     this.getAuthenticateUrl = function() {
       return glideraService.getOauthCodeUrl();

From 08af65c6a4f31610b5e6cb9693a048f10df7b950 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 21 Jan 2016 16:42:44 -0300
Subject: [PATCH 16/17] Fix payment URI on mobile

---
 src/js/controllers/paymentUri.js | 4 +---
 src/js/init.js                   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/paymentUri.js b/src/js/controllers/paymentUri.js
index 3ae5ad766..c202945bf 100644
--- a/src/js/controllers/paymentUri.js
+++ b/src/js/controllers/paymentUri.js
@@ -43,9 +43,7 @@ angular.module('copayApp.controllers').controller('paymentUriController',
 
     this.selectWallet = function(wid) {
       var self = this;
-      if (wid != profileService.focusedClient.credentials.walletId) {
-        profileService.setAndStoreFocus(wid, function() {});
-      }
+      profileService.setAndStoreFocus(wid, function() {});
       $timeout(function() {
         $rootScope.$emit('paymentUri', self.bitcoinURI);
       }, 1000);
diff --git a/src/js/init.js b/src/js/init.js
index 3bcc05d45..298a40883 100644
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -46,7 +46,7 @@ angular.element(document).ready(function() {
         }
         setTimeout(function() {
           var loc = window.location;
-          var ignoreMobilePause = loc.toString().match(/(glidera|buy|sell)/) ? true : false;
+          var ignoreMobilePause = loc.toString().match(/(buy|sell|uri-payment)/) ? true : false;
           window.ignoreMobilePause = ignoreMobilePause;
         }, 100);
       }, false);

From 75421c2735bf4549a16708e6d4108df7c04d7df3 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 21 Jan 2016 16:52:28 -0300
Subject: [PATCH 17/17] Glidera testnet = false

---
 src/js/services/configService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 6711ea2a4..0d8484ac9 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -94,7 +94,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
 
       // Glidera
       // Disabled for testnet
-      configCache.glidera.testnet = true;
+      configCache.glidera.testnet = false;
 
       $log.debug('Preferences read:', configCache)
       return cb(err, configCache);