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

Merge pull request #4644 from JDonadio/bug/scanned-data

Browse source 
Shows scanned data - Import from QR
This commit is contained in:
Gustavo Maximiliano Cortez 2016-08-04 09:18:44 -03:00 • committed by GitHub
commit 75b4455358
3 changed files with 4 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,6 @@ angular.module('copayApp.controllers').controller('importController',
var reader = new FileReader();
var defaults = configService.getDefaults();
var errors = bwcService.getErrors();
$scope.dataFromQR = null;
$scope.bwsurl = defaults.bws.url;
$scope.derivationPath = derivationPathHelper.default;
$scope.account = 1;
@ -36,7 +35,6 @@ angular.module('copayApp.controllers').controller('importController',
$scope.processWalletInfo = function(code) {
if (!code) return;
$scope.dataFromQR = null;
$scope.importErr = false;
$scope.error = null;
var parsedCode = code.split('|');
@ -62,8 +60,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 = info.data;
$rootScope.$apply();
}, 1);
};
@ -252,7 +249,7 @@ angular.module('copayApp.controllers').controller('importController',
opts.networkName = pathData.networkName;
opts.derivationStrategy = pathData.derivationStrategy;
var words = form.words.$modelValue || $scope.dataFromQR;
var words = form.words.$modelValue || null;
$scope.error = null;
if (!words) {

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;