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

12
public/views/import.html
View file

@ -50,19 +50,11 @@
<span translate>Type the Recovery Phrase (usually 12 words)</span>: <span translate>Type the Recovery Phrase (usually 12 words)</span>:
</label> </label>
<div class="qr-scanner-input-import" ng-show="!dataFromQR"> <div class="qr-scanner-input-import">
<qr-scanner on-scan="processWalletInfo(data)"></qr-scanner> <qr-scanner on-scan="processWalletInfo(data)"></qr-scanner>
</div> </div>
<div class="lock-fromQR" ng-show="dataFromQR"> <textarea class="form-control m10t" name="words" ng-model="words" rows="3" autocapitalize="off" spellcheck="false"></textarea>
<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>
<div class="m10t oh" ng-init="hideAdv=true"> <div class="m10t oh" ng-init="hideAdv=true">
<a class="button outline light-gray expand tiny p10i" ng-click="hideAdv=!hideAdv"> <a class="button outline light-gray expand tiny p10i" ng-click="hideAdv=!hideAdv">

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

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

6
src/sass/main.scss
View file

@ -895,12 +895,6 @@ ul.manage li {
background-color: #1ABC9C; background-color: #1ABC9C;
} }
.lock-fromQR {
position: absolute;
width: 100%;
margin-top: 20px;
}
.tx-proposal i { .tx-proposal i {
padding: .1rem .3rem; padding: .1rem .3rem;
background-color: #A5B2BF; background-color: #A5B2BF;