From 5b8b94ec19f66be6502a5c6c5ba4bef141d9ce84 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 2 Aug 2016 15:43:03 -0300
Subject: [PATCH] shows scanned data - do not disable textarea

---
 public/views/import.html     | 12 ++----------
 src/js/controllers/import.js |  3 +--
 src/sass/main.scss           |  6 ------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/public/views/import.html b/public/views/import.html
index 58f2a9739..b1ea99694 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -50,19 +50,11 @@
             <span translate>Type the Recovery Phrase (usually 12 words)</span>:
           </label>
 
-          <div class="qr-scanner-input-import" ng-show="!dataFromQR">
+          <div class="qr-scanner-input-import">
             <qr-scanner on-scan="processWalletInfo(data)"></qr-scanner>
           </div>
 
-          <div class="lock-fromQR" ng-show="dataFromQR">
-            <div class="left m10l">
-              <i class="fi-lock color-greeni"></i>
-            </div>
-            <div class="right icon-close-import" ng-click="dataFromQR = null">
-              <i class="icon-close-circle size-14"></i>
-            </div>
-          </div>
-          <textarea class="form-control m10t" ng-disabled="dataFromQR" name="words" ng-model="words" rows="2" autocapitalize="off" spellcheck="false"></textarea>
+          <textarea class="form-control m10t" name="words" ng-model="words" rows="3" autocapitalize="off" spellcheck="false"></textarea>
 
           <div class="m10t oh" ng-init="hideAdv=true">
             <a class="button outline light-gray expand tiny p10i" ng-click="hideAdv=!hideAdv">
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index f0337a7de..5bda53f0e 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -62,8 +62,7 @@ angular.module('copayApp.controllers').controller('importController',
       $scope.testnetEnabled = info.network == 'testnet' ? true : false;
 
       $timeout(function() {
-        $scope.words = null;
-        $scope.dataFromQR = info.data;
+        $scope.words = $scope.dataFromQR = info.data;
         $rootScope.$apply();
       }, 1);
     };
diff --git a/src/sass/main.scss b/src/sass/main.scss
index 41f1a7904..985a219c3 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -895,12 +895,6 @@ ul.manage li {
   background-color: #1ABC9C;
 }
 
-.lock-fromQR {
-  position: absolute;
-  width: 100%;
-  margin-top: 20px;
-}
-
 .tx-proposal i {
   padding: .1rem .3rem;
   background-color: #A5B2BF;