anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

shows scanned data - do not disable textarea

Browse source
This commit is contained in:
Javier 2016-08-02 15:43:03 -03:00
commit 5b8b94ec19
3 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/controllers/import.js
View file

@ -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);
};

6
src/sass/main.scss
View file

@ -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;