From 10ae7b61d7a168658649a78c1c35ef4f917a3b81 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 2 Oct 2015 16:04:11 -0300
Subject: [PATCH 1/2] Disable button while sending funds

---
 public/views/paperWallet.html     |  8 +++++---
 src/js/controllers/paperWallet.js | 11 ++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html
index e0f145c14..332094c19 100644
--- a/public/views/paperWallet.html
+++ b/public/views/paperWallet.html
@@ -5,7 +5,7 @@
 </div>
 
 <div class="content p20v" ng-controller="paperWalletController as paperWallet">
-  <div class="onGoingProcess" ng-show="paperWallet.scanning">
+  <div class="onGoingProcess" ng-show="paperWallet.scanning || paperWallet.sending">
     <div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
       <div class="spinner">
         <div class="rect1"></div>
@@ -14,7 +14,8 @@
         <div class="rect4"></div>
         <div class="rect5"></div>
       </div>
-      <span translate>Scanning wallet funds...</span>
+      <span ng-show="paperWallet.scanning" translate>Scanning wallet funds...</span>
+      <span ng-show="paperWallet.sending" translate>Sending funds...</span>
     </div>
   </div>
   <div class="box-notification text-warning" ng-show="paperWallet.error">
@@ -56,10 +57,11 @@
        </div>
 
       <button 
+        ng-disabled="paperWallet.sending"
         ng-style="{'background-color':index.backgroundColor}" 
         class="button black round expand" 
         ng-click="paperWallet.transaction()" 
-        translate>sweep wallet
+        translate>Sweep Wallet
       </button>
       <div class="text-center">
         <div class="size-12 text-gray" translate>Funds will be transfered to</div>
diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js
index 44135aa1c..85d839259 100644
--- a/src/js/controllers/paperWallet.js
+++ b/src/js/controllers/paperWallet.js
@@ -81,12 +81,21 @@ angular.module('copayApp.controllers').controller('paperWalletController',
     };
 
     self.transaction = function() {
-      self.doTransaction(rawTx).then(function(err, response) {
+      self.error = null;
+      self.sending = true;
+      $timeout(function() {
+        self.doTransaction(rawTx).then(function(err, response) {
+          self.sending = false;
           self.goHome();
         },
         function(err) {
+          self.sending = false;
           self.error = err.toString();
+          $timeout(function() {
+            $scope.$apply();
+          }, 1);
         });
+      }, 100);
     };
 
     self.goHome = function() {

From cb98f4ce831f490e5e85f1cb12b46ab9cb28c7f4 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 2 Oct 2015 16:14:09 -0300
Subject: [PATCH 2/2] Fix conflict

---
 src/js/controllers/paperWallet.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js
index 85d839259..29d45a73f 100644
--- a/src/js/controllers/paperWallet.js
+++ b/src/js/controllers/paperWallet.js
@@ -1,10 +1,9 @@
 angular.module('copayApp.controllers').controller('paperWalletController',
-  function($scope, $http, $timeout, $rootScope, profileService, go, addressService, isCordova, gettext, bitcore) {
+  function($scope, $http, $timeout, profileService, go, addressService, isCordova, bitcore) {
     self = this;
     var fc = profileService.focusedClient;
     var rawTx;
-
-    if (isCordova) self.message = "Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open."
+    self.isCordova = isCordova;
 
     self.onQrCodeScanned = function(data) {
       $scope.privateKey = data;