Bug fixes after rebase.

Please enter the commit message for your changes. Lines starting
This commit is contained in:
Gabrielbazan7 2017-03-17 18:23:50 -04:00 committed by Andy Phillipson
commit 8c00fe27aa
8 changed files with 22 additions and 25 deletions

View file

@ -1,6 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{exteralSource}}</ion-nav-title>
<ion-nav-title>{{externalSource}}</ion-nav-title>
<ion-nav-back-button>
</ion-nav-back-button>
</ion-nav-bar>

View file

@ -50,12 +50,6 @@
</span>
<i class="icon bp-arrow-right"></i>
</a>
<div class="item" ng-show="wallet.isPrivKeyExternal()">
<span translate>Hardware Wallet</span>
<span class="item-note">
{{wallet.getPrivKeyExternalSourceName()}}
</span>
</div>
<div class="item" ng-show="!wallet.isPrivKeyExternal() && !wallet.canSign()">
<span translate></span>
<span class="item-note">

View file

@ -53,19 +53,11 @@
</div>
<div class="row qr">
<div class="text-center col center-block" copy-to-clipboard="addr" ng-repeat="wallet in wallets track by $index" ng-class="walletPosition($index)">
<span style="position: absolute; width: 220px" ng-show="shouldShowReceiveAddressFromHardware()">
<div style="width: 100%; height: 226px; background-color: rgba(255,255,255,0.8);">
<button class="button light-gray small round m10b"
style="background-color: white; border-color: black; color: black; top: 50%; transform: translateY(-50%);"
ng-click="showReceiveAddressFromHardware()">
<span class="overlay" ng-show="shouldShowReceiveAddressFromHardware()">
<button class="button button-standard button-primary" ng-click="showReceiveAddressFromHardware()">
<span translate>Show address</span>
</button>
</div>
</span>
<qrcode ng-if="walletAddrs[wallet.id]" size="220" data="bitcoin:{{walletAddrs[wallet.id]}}" color="#334"></qrcode>
</div>
</div>