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

UX: just update address balance that received fund.

Browse source 
Changed rootscope for scope to control address page.
Fixes: not alert when address change receive fund
This commit is contained in:
Gustavo Cortez 2014-05-20 19:40:02 -03:00
commit 9428ea55d5
4 changed files with 80 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

67
index.html
View file

@ -32,15 +32,21 @@
</div>
<div class="large-4 medium-4 columns line-dashed-v">
Balance:
<span ng-if="$root.updatingBalance">...</span>
<span ng-if="!$root.updatingBalance">{{totalBalance || 0}}</span>
<i class="fi-bitcoin"></i><br>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-if="!$root.updatingBalance">{{totalBalance || 0}}
<i class="fi-bitcoin"></i>
</span>
</div>
<div class="large-4 medium-4 columns">
Available to Spend:
<span ng-if="$root.updatingBalance">...</span>
<span ng-if="!$root.updatingBalance">{{availableBalance || 0}}</span>
<i class="fi-bitcoin"></i>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-if="!$root.updatingBalance">{{availableBalance || 0}}
<i class="fi-bitcoin"></i>
</span>
</div>
</div>
@ -317,37 +323,58 @@
<div class="addresses" ng-controller="AddressesController">
<div ng-show='$root.wallet.publicKeyRing.isComplete()'>
<div class="row">
<div class="large-9 medium-12 columns" ng-if="addrInfos[0]">
<div class="large-9 medium-12 columns" ng-if="addresses[0]">
<div class="large-8 medium-8 columns">
<a class="panel radius db" ng-repeat="addrInfo in addrInfos" ng-click="$root.selectedAddr = addrInfo.address.toString()" ng-class="selectAddr('{{addrInfo.address.toString()}}')">
<span>{{addrInfo.address.toString()}}</span>
<span ng-if="addrInfo.isChange">(change)</span>
<a class="panel radius db" ng-repeat="addr in addresses"
ng-click="selectAddress(addr)"
ng-class="{selected : addr.address == selectedAddr.address}">
<span>{{addr.address}}</span>
<span ng-if="addr.isChange">(change)</span>
<span class="right">
<span ng-if="$root.updatingBalance">...</span>
<span ng-if="!$root.updatingBalance">{{balanceByAddr[addrInfo.address.toString()] || 0}}</span>
<i class="fi-bitcoin"></i>
<span ng-if="$root.receivedFund[1] == addr.address">
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-if="!$root.updatingBalance">
{{$root.balanceByAddr[addr.address]}}
<i class="fi-bitcoin"></i>
</span>
</span>
<span ng-if="$root.receivedFund[1] != addr.address">
{{addr.balance || 0}}
<i class="fi-bitcoin"></i>
</span>
</span>
</a>
</div>
<div class="large-4 medium-4 columns line-dashed-v text-center">
<qrcode size="160" data="{{selectedAddr}}"></qrcode>
<div class="large-4 medium-4 columns line-dashed-v text-center" ng-show="selectedAddr">
<qrcode size="160" data="{{selectedAddr.address}}"></qrcode>
<p class="m10t">
<strong>
<span ng-if="$root.updatingBalance">...</span>
<span ng-if="!$root.updatingBalance">{{balanceByAddr[selectedAddr] || 0}}</span>
<i class="fi-bitcoin"></i>
<span ng-if="$root.receivedFund[1] == selectedAddr.address">
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-if="!$root.updatingBalance">{{balanceByAddr[selectedAddr.address] || 0}}
<i class="fi-bitcoin"></i>
</span>
</span>
<span ng-if="$root.receivedFund[1] != selectedAddr.address">
{{selectedAddr.balance || 0}}
<i class="fi-bitcoin"></i>
</span>
</strong>
</p>
</div>
</div>
<div class="columns text-center m10t" ng-class="{'large-3' : !!addrInfos[0]}">
<div class="columns text-center m10t" ng-class="{'large-3' : !!addresses[0]}">
<p> Create a New <strong> Address </strong> </p>
<button class="secondary radius expandi new-address" ng-click="newAddr()"
ng-disabled="loading" loading="Creating"> Create </button>
</div>
</div>
</div>
</div>
</div>
</script>
<!-- TRANSACTIONS -->