From 19181a946285c9b8a3c113b82868139bfd4c4aef Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Wed, 7 Oct 2015 15:32:52 -0300
Subject: [PATCH] hide passphrase if pk is not encrypted

---
 public/views/paperWallet.html     | 24 +++++++++++++-----------
 src/js/controllers/paperWallet.js |  8 +++++++-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html
index 55024ecc7..120aadc81 100644
--- a/public/views/paperWallet.html
+++ b/public/views/paperWallet.html
@@ -25,23 +25,25 @@
   <div ng-show="!paperWallet.balance" class="row">
     <div class="large-12 medium-12 columns">  
       <div class="input">
-        <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">
+        <label for="inputData" translate>Paper Wallet Private Key</label>
+        <input type="text" placeholder="{{'Paste your paper wallet private key here'|translate}}" ng-model="inputData" id="inputData" ng-change="paperWallet.onData(inputData)">
         <div class="qr-scanner-input">
           <qr-scanner on-scan="paperWallet.onQrCodeScanned(data)"></qr-scanner>
         </div>
-        <label for="passphrase">
-          <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="index.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>
+        <div ng-show="paperWallet.isPkEncrypted">
+          <label for="passphrase">
+            <span translate>Passphrase</span>
+          </label>
+          <input id="passphrase" type="password" name="passphrase" placeholder="{{'Passphrase'|translate}}" ng-model="passphrase">
+          <p ng-show="index.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>
+        </div>
         <button
-          ng-disabled="paperWallet.scanning || !privateKey"
+          ng-disabled="paperWallet.scanning || !paperWallet.scannedKey"
           ng-style="{'background-color':index.backgroundColor}" 
           class="button black round expand" 
-          ng-click="paperWallet.createTx(privateKey, passphrase)" 
+          ng-click="paperWallet.createTx(inputData, passphrase)" 
           translate>Scan Wallet Funds
         </button>
       </div> 
diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js
index a71638b88..3ca58a778 100644
--- a/src/js/controllers/paperWallet.js
+++ b/src/js/controllers/paperWallet.js
@@ -5,7 +5,13 @@ angular.module('copayApp.controllers').controller('paperWalletController',
     var rawTx;
 
     self.onQrCodeScanned = function(data) {
-      $scope.privateKey = data;
+      $scope.inputData = data;
+      self.onData(data);
+    }
+
+    self.onData = function(data) {
+      self.scannedKey = data;
+      self.isPkEncrypted = (data.charAt(0) == '6');
     }
 
     self.createTx = function(privateKey, passphrase) {