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

settings: fix balance bug

Browse source
This commit is contained in:
Manuel Araoz 2014-09-03 15:55:02 -03:00
commit 3691bd5ee0
4 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
index.html
View file

@ -17,8 +17,8 @@
<i class="fi-loop icon-rotate m15r"></i> <i class="fi-loop icon-rotate m15r"></i>
<span translate> Network Error. Attempting to reconnect...</span> <span translate> Network Error. Attempting to reconnect...</span>
</span> </span>
<nav class="tab-bar" ng-class="{'hide-tab-bar' : !$root.wallet || <nav class="tab-bar" ng-if="$root.wallet &&
!$root.wallet.isReady() || $root.wallet.isLocked}"> $root.wallet.isReady() && !$root.wallet.isLocked">
<section class="left-small"> <section class="left-small">
<a class="left-off-canvas-toggle menu-icon" ><span></span></a> <a class="left-off-canvas-toggle menu-icon" ><span></span></a>
</section> </section>
@ -28,7 +28,7 @@
<section class="middle tab-bar-section"> <section class="middle tab-bar-section">
<h1 class="right"> <h1 class="right">
{{totalBalance || 0 |noFractionNumber}} {{$root.unitName}} {{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}
</h1> </h1>
<h1 class="title ellipsis"> <h1 class="title ellipsis">
{{$root.wallet.getName()}} {{$root.wallet.getName()}}

1
js/services/controllerUtils.js
View file

@ -50,7 +50,6 @@ angular.module('copayApp.services')
$scope.loading = false; $scope.loading = false;
}); });
w.on('corrupt', function(peerId) { w.on('corrupt', function(peerId) {
notification.error('Error', 'Received corrupt message from ' + peerId); notification.error('Error', 'Received corrupt message from ' + peerId);
}); });

31
views/includes/sidebar-mobile.html
View file

@ -6,6 +6,37 @@
</a> </a>
<div ng-include="'views/includes/version.html'"></div> <div ng-include="'views/includes/version.html'"></div>
</div> </div>
<div class="line-sidebar-b"></div>
<div class="founds size-12 text-center box-founds p10t">
<div class="m10b">
Balance
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-if="$root.wallet && !$root.updatingBalance"
data-options="disable_for_touch:true"
tooltip="{{totalBalanceBTC |noFractionNumber:8}} BTC"
tooltip-trigger="mouseenter"
tooltip-placement="bottom">{{totalBalance || 0
|noFractionNumber}} {{$root.unitName}}
</span>
</div>
<div>
Locked
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-if="$root.wallet && !$root.updatingBalance"
data-options="disable_for_touch:true"
tooltip="{{lockedBalanceBTC |noFractionNumber:8}} BTC"
tooltip-trigger="mouseenter"
tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
</span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>
</div>
<div class="line-sidebar-b"></div>
</div>
</header> </header>
<div class="line-sidebar-b"></div> <div class="line-sidebar-b"></div>
<div class="founds size-12 box-founds p15" ng-disabled="$root.loading" ng-click="refresh()"> <div class="founds size-12 box-founds p15" ng-disabled="$root.loading" ng-click="refresh()">

4
views/includes/sidebar.html
View file

@ -20,7 +20,7 @@
<span ng-if="$root.updatingBalance"> <span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span> </span>
<span ng-if="!$root.updatingBalance" <span ng-if="$root.wallet && !$root.updatingBalance"
class="has-tip" class="has-tip"
data-options="disable_for_touch:true" data-options="disable_for_touch:true"
tooltip-popup-delay='500' tooltip-popup-delay='500'
@ -33,7 +33,7 @@
<span ng-if="$root.updatingBalance"> <span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span> </span>
<span ng-show="!$root.updatingBalance" <span ng-if="$root.wallet && !$root.updatingBalance"
class="has-tip" class="has-tip"
data-options="disable_for_touch:true" data-options="disable_for_touch:true"
tooltip-popup-delay='500' tooltip-popup-delay='500'