From 07b6a2d4d56333eb420657ab97b5f21c8c209d9d Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 2 Oct 2015 15:11:35 -0300
Subject: [PATCH 1/5] Add strings to translate and minor ux details

---
 public/views/paperWallet.html     | 59 ++++++++++++++++---------------
 src/js/controllers/paperWallet.js |  4 +--
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html
index e3ee4a219..0803ab3bb 100644
--- a/public/views/paperWallet.html
+++ b/public/views/paperWallet.html
@@ -5,54 +5,57 @@
 </div>
 
 <div class="content p20v" ng-controller="paperWalletController as paperWallet">
-  <div class="row">
-    <div class="large-12 medium-12 columns">
-
-      <div class="onGoingProcess" ng-show="paperWallet.scanning">
-        <div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
-          <div class="spinner">
-            <div class="rect1"></div>
-            <div class="rect2"></div>
-            <div class="rect3"></div>
-            <div class="rect4"></div>
-            <div class="rect5"></div>
-          </div>
-          <span translate>Scanning wallet funds...</span>
-        </div>
+  <div class="onGoingProcess" ng-show="paperWallet.scanning">
+    <div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
+      <div class="spinner">
+        <div class="rect1"></div>
+        <div class="rect2"></div>
+        <div class="rect3"></div>
+        <div class="rect4"></div>
+        <div class="rect5"></div>
       </div>
-      
-      <div class="text-warning size-14 m20b" ng-show="paperWallet.error">
+      <span translate>Scanning wallet funds...</span>
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-12 medium-12 columns"> 
+      <div class="box-notification text-warning" ng-show="paperWallet.error">
         <i class="fi-alert size-12"></i>
-        <span translate>{{paperWallet.error}}</span>
+        <span>{{paperWallet.error|translate}}</span>
       </div>
       <div ng-show="!paperWallet.balance" class="input">
         <label for="privateKey"><span>Paper Wallet Private Key</span></label>
-          <input type="text" placeholder="Paste your paper wallet private key here" ng-model="privateKey" id="privateKey">
+        <input type="text" placeholder="{{'Paste your paper wallet private key here'|translate}}" ng-model="privateKey" id="privateKey">
         <div class="qr-scanner-input">
           <qr-scanner on-scan="paperWallet.onQrCodeScanned(data)"></qr-scanner>
         </div>
         <label for="passphrase">
-          <span>Passphrase (if you have one): </span>
+          <span translate>Passphrase (if you have one):</span>
         </label>
-        <input id="passphrase" type="password" name="passphrase" placeholder="Passphrase" ng-model="passphrase">
-      </div>
-      <p ng-show="paperWallet.message" translate class="size-14 text-gray">{{paperWallet.message}}</p>
-      <div ng-show="paperWallet.balance">
-        <label for="totalBalance">
-          <h2 translate>Funds founds: {{paperWallet.balance}} BTC</h2>
-        </label>
-      </div>
+        <input id="passphrase" type="password" name="passphrase" placeholder="{{'Passphrase'|translate}}" ng-model="passphrase">
+        <p ng-show="paperWallet.message" translate class="size-14 text-gray">{{paperWallet.message}}</p>
+      </div> 
     </div>
   </div>
   <div class="row">
      <div class="large-12 medium-12 columns" ng-show="paperWallet.balance">
+       <div class="text-center m20b">
+         <h4 class="text-bold" translate>Funds founds</h4>
+         <div class="size-24">
+           {{paperWallet.balance}} BTC
+         </div>
+       </div>
+
       <button 
         ng-style="{'background-color':index.backgroundColor}" 
         class="button black round expand" 
         ng-click="paperWallet.transaction()" 
         translate>sweep wallet
       </button>
-      <span>Funds will be transfered to the wallet: {{index.alias || index.walletName}} </span>               
+      <div class="m10t text-center">
+        <div class="size-12 text-gray" translate>Funds will be transfered to</div>
+        <b>{{index.alias || index.walletName}}</b>
+      </div>
     </div>
     <div class="large-12 medium-12 columns"  ng-show="!paperWallet.balance" >
       <button
diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js
index 5616c74ea..2b5b83ab9 100644
--- a/src/js/controllers/paperWallet.js
+++ b/src/js/controllers/paperWallet.js
@@ -1,5 +1,5 @@
 angular.module('copayApp.controllers').controller('paperWalletController',
-  function($scope, $http, $timeout, $rootScope, profileService, go, addressService, isCordova, gettext) {
+  function($scope, $http, $timeout, profileService, go, addressService) {
     self = this;
     var fc = profileService.focusedClient;
     var rawTx;
@@ -12,7 +12,6 @@ angular.module('copayApp.controllers').controller('paperWalletController',
     self.createTx = function(privateKey, passphrase) {
       self.error = null;
       self.scanning = true;
-
       $timeout(function() {
         self.getRawTx(privateKey, passphrase, function(err, rawtx, utxos) {
           self.scanning = false;
@@ -27,7 +26,6 @@ angular.module('copayApp.controllers').controller('paperWalletController',
           $timeout(function() {
             $scope.$apply();
           }, 1);
-
         });
       }, 100);
     };

From 36e9734ea47997abefe4147d54296a99c587e312 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 2 Oct 2015 15:23:44 -0300
Subject: [PATCH 2/5] Adds strings to translate. Fix layouts

---
 public/views/paperWallet.html     | 40 +++++++++++++++----------------
 src/js/controllers/paperWallet.js |  6 ++---
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html
index 0803ab3bb..f4b954f98 100644
--- a/public/views/paperWallet.html
+++ b/public/views/paperWallet.html
@@ -17,13 +17,13 @@
       <span translate>Scanning wallet funds...</span>
     </div>
   </div>
-  <div class="row">
-    <div class="large-12 medium-12 columns"> 
-      <div class="box-notification text-warning" ng-show="paperWallet.error">
-        <i class="fi-alert size-12"></i>
-        <span>{{paperWallet.error|translate}}</span>
-      </div>
-      <div ng-show="!paperWallet.balance" class="input">
+  <div class="box-notification text-warning" ng-show="paperWallet.error">
+    <i class="fi-alert size-12"></i>
+    <span>{{paperWallet.error|translate}}</span>
+  </div>
+  <div ng-show="!paperWallet.balance" class="row">
+    <div class="large-12 medium-12 columns">  
+      <div class="input">
         <label for="privateKey"><span>Paper Wallet Private Key</span></label>
         <input type="text" placeholder="{{'Paste your paper wallet private key here'|translate}}" ng-model="privateKey" id="privateKey">
         <div class="qr-scanner-input">
@@ -33,12 +33,21 @@
           <span translate>Passphrase (if you have one):</span>
         </label>
         <input id="passphrase" type="password" name="passphrase" placeholder="{{'Passphrase'|translate}}" ng-model="passphrase">
-        <p ng-show="paperWallet.message" translate class="size-14 text-gray">{{paperWallet.message}}</p>
+        <p ng-show="paperWallet.isCordova" translate class="size-12 text-gray">
+          Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open.
+        </p>
+        <button
+          ng-disabled="paperWallet.scanning || !privateKey"
+          ng-style="{'background-color':index.backgroundColor}" 
+          class="button black round expand" 
+          ng-click="paperWallet.createTx(privateKey, passphrase)" 
+          translate>Scan Wallet Funds
+        </button>
       </div> 
     </div>
   </div>
-  <div class="row">
-     <div class="large-12 medium-12 columns" ng-show="paperWallet.balance">
+  <div ng-show="paperWallet.balance" class="row">
+     <div class="large-12 medium-12 columns">
        <div class="text-center m20b">
          <h4 class="text-bold" translate>Funds founds</h4>
          <div class="size-24">
@@ -52,20 +61,11 @@
         ng-click="paperWallet.transaction()" 
         translate>sweep wallet
       </button>
-      <div class="m10t text-center">
+      <div class="text-center">
         <div class="size-12 text-gray" translate>Funds will be transfered to</div>
         <b>{{index.alias || index.walletName}}</b>
       </div>
     </div>
-    <div class="large-12 medium-12 columns"  ng-show="!paperWallet.balance" >
-      <button
-        ng-disabled="paperWallet.scanning || !privateKey"
-        ng-style="{'background-color':index.backgroundColor}" 
-        class="button black round expand" 
-        ng-click="paperWallet.createTx(privateKey, passphrase)" 
-        translate>Scan Wallet Funds
-      </button>               
-    </div>
   </div>
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js
index 2b5b83ab9..6caeb671f 100644
--- a/src/js/controllers/paperWallet.js
+++ b/src/js/controllers/paperWallet.js
@@ -1,9 +1,9 @@
 angular.module('copayApp.controllers').controller('paperWalletController',
-  function($scope, $http, $timeout, profileService, go, addressService) {
+  function($scope, $http, $timeout, profileService, go, addressService, isCordova) {
     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;
@@ -82,4 +82,4 @@ angular.module('copayApp.controllers').controller('paperWalletController',
         rawtx: rawTx
       });
     };
-  });
\ No newline at end of file
+  });

From ba4e63b582a293ec5f17a149c72299b4a1c78582 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 2 Oct 2015 15:25:22 -0300
Subject: [PATCH 3/5] Typo

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

diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html
index f4b954f98..46c959980 100644
--- a/public/views/paperWallet.html
+++ b/public/views/paperWallet.html
@@ -30,7 +30,7 @@
           <qr-scanner on-scan="paperWallet.onQrCodeScanned(data)"></qr-scanner>
         </div>
         <label for="passphrase">
-          <span translate>Passphrase (if you have one):</span>
+          <span translate>Passphrase (if you have one)</span>
         </label>
         <input id="passphrase" type="password" name="passphrase" placeholder="{{'Passphrase'|translate}}" ng-model="passphrase">
         <p ng-show="paperWallet.isCordova" translate class="size-12 text-gray">

From eb73411ea5a1643856fb05fdce017bbdb590dd42 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 2 Oct 2015 15:29:08 -0300
Subject: [PATCH 4/5] .

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

diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js
index 6caeb671f..2eecf1432 100644
--- a/src/js/controllers/paperWallet.js
+++ b/src/js/controllers/paperWallet.js
@@ -3,7 +3,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
     self = this;
     var fc = profileService.focusedClient;
     var rawTx;
-    self.isCordova = !isCordova;
+    self.isCordova = isCordova;
 
     self.onQrCodeScanned = function(data) {
       $scope.privateKey = data;

From 36b73f5567bac381e5a228586bc14d3fee6edab8 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 2 Oct 2015 15:33:43 -0300
Subject: [PATCH 5/5] Missing translate

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

diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html
index 46c959980..e0f145c14 100644
--- a/public/views/paperWallet.html
+++ b/public/views/paperWallet.html
@@ -24,7 +24,7 @@
   <div ng-show="!paperWallet.balance" class="row">
     <div class="large-12 medium-12 columns">  
       <div class="input">
-        <label for="privateKey"><span>Paper Wallet Private Key</span></label>
+        <label for="privateKey" translate>Paper Wallet Private Key</label>
         <input type="text" placeholder="{{'Paste your paper wallet private key here'|translate}}" ng-model="privateKey" id="privateKey">
         <div class="qr-scanner-input">
           <qr-scanner on-scan="paperWallet.onQrCodeScanned(data)"></qr-scanner>