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

Merge pull request #5377 from gabrielbazan7/fix/scannerAddbook

Browse source 
fix addressbook add scanner and some refactors
This commit is contained in:
Gustavo Maximiliano Cortez 2017-01-03 09:27:05 -03:00 • committed by GitHub
commit 9fffc255b0
6 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/views/addressbook.add.html
View file

@ -47,7 +47,7 @@
valid-address required>
</label>
<div class="qr-scan-icon">
<qr-scanner on-scan="onQrCodeScanned(data, addressbookForm)"></qr-scanner>
<qr-scanner on-scan="onQrCodeScannedAddressBook(data, addressbookForm)"></qr-scanner>
</div>
</div>
</div>

2
www/views/join.html
View file

@ -36,7 +36,7 @@
wallet-secret required>
</label>
<div class="qr-scan-icon">
<qr-scanner class="qr-icon size-24" on-scan="join.onQrCodeScanned(data)"></qr-scanner>
<qr-scanner class="qr-icon size-24" on-scan="join.onQrCodeScannedJoin(data)"></qr-scanner>
</div>
</div>
<div class="item item-divider"></div>

1
www/views/onboarding/welcome.html
View file

@ -1,6 +1,5 @@
<ion-view id="onboard-welcome" class="onboarding">
<ion-content ng-controller="welcomeController" ng-init="createProfile()" scroll="false">
<!-- <qr-scanner id="qrcode" on-scan="goImport(data)"></qr-scanner> -->
<div id="logo-tagline">
<img src='img/bitpay-logo.svg' id="logo" />
<p id="lead" translate>Take control of your money,<br />get started with bitcoin.</p>