BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1990 from cmgustavo/bug/issues-01 

Bug/issues 01
This commit is contained in:
Ivan Socolsky 2014-12-05 16:40:46 -03:00
parent 59fd9127e2 d3b4683341
commit fe74ec1aae
3 changed files with 52 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/services/identityService.js
View File

@ -233,9 +233,13 @@ angular.module('copayApp.services')
w.on('txProposalEvent', function(e) {
if (root.isFocused(wid)) {
pendingTxsService.update();
pendingTxsService.update();
}
balanceService.update(w, function() {
$rootScope.$digest();
}, root.isFocused(wid));
// TODO: add wallet name notification
var user = w.publicKeyRing.nicknameForCopayer(e.cId);
var name = w.getName();

6
views/includes/sidebar-mobile.html
View File

@ -1,10 +1,10 @@
<div ng-init="username = $root.iden.getName()">
<div>
<div class="text-center off-canvas-list">
<a href="#!/profile" class="columns m10v" title="Profile">
<div class="photo-container">
<img gravatar-src="'{{username}}'" gravatar-size="35">
<img gravatar-src="'{{$root.iden.getName()}}'" gravatar-size="35">
</div>
<p class="text-black m5">{{username}}</p>
<p class="text-black m5">{{$root.iden.getName()}}</p>
<span class="db text-gray size-10" >
<i class="fi-torso"></i> {{'ViewProfile' | translate }}
</span>

82
views/send.html
View File

@ -58,12 +58,9 @@
</div>
<div class="row">
<div class="large-6 medium-6 columns">
<div class="row collapse">
<label for="amount" class="small-7 columns m5b"><span translate>Amount</span>
<small translate ng-hide="!sendForm.amount.$pristine && amount">required</small>
</label>
<div class="row" ng-init="showAlternative = false">
<div class="large-12 medium-12 columns">
<div class="m5b right">
<span translate class="has-error right size-12" ng-show="sendForm.amount.$invalid &&
!sendForm.amount.$pristine && (notValidAmount || amount)">
<span class="icon-input"><i class="fi-x"></i></span>
@ -71,42 +68,51 @@
</span>
<small class="icon-input right" ng-show="!sendForm.amount.$invalid &&
!sendForm.amount.$pristine"><i class="fi-check"></i></small>
<div class="small-9 columns">
<div class="input">
<input type="number" id="amount"
ng-disabled="loading || ($root.merchant && +$root.merchant.total > 0) || isPayUri"
name="amount" placeholder="{{'Amount'|translate}}" ng-model="amount"
ng-minlength="0.00000001" ng-maxlength="10000000000" valid-amount required
autocomplete="off">
<i class="icon-bitcoin"></i>
</div>
<div ng-show="!showAlternative">
<div class="row collapse">
<label for="amount"><span translate>Amount in</span> {{$root.wallet.settings.unitName}}
<small translate ng-hide="!sendForm.amount.$pristine && amount">required</small>
</label>
<div class="small-9 columns">
<div class="input">
<input type="number" id="amount"
ng-disabled="loading || ($root.merchant && +$root.merchant.total > 0) || isPayUri"
name="amount" placeholder="{{'Amount'|translate}}" ng-model="amount"
ng-minlength="0.00000001" ng-maxlength="10000000000" valid-amount required
autocomplete="off">
<i class="icon-bitcoin"></i>
</div>
<a class="small input-note" title="{{'Send all funds'|translate}}"
ng-show="topAmount && (!$root.merchant || +$root.merchant.total === 0)"
ng-click="setTopAmount(sendForm)">
<span translate>Use all funds</span> {{$root.wallet.settings.unitName}}
</a>
</div>
<div class="small-3 columns pointer" ng-click="showAlternative = true">
<span class="postfix">{{$root.wallet.settings.unitName}}</span>
</div>
<a class="small input-note" title="{{'Send all funds'|translate}}"
ng-show="topAmount && (!$root.merchant || +$root.merchant.total === 0)"
ng-click="setTopAmount(sendForm)">
<span translate>Use all funds</span> {{$root.wallet.settings.unitName}}
</a>
</div>
<div class="small-3 columns">
<span class="postfix">{{$root.wallet.settings.unitName}}</span>
</div>
</div>
</div>
<div class="large-6 medium-6 columns">
<div class="row collapse">
<label for="alternative"><span translate>Amount in</span> {{ alternativeName }} </label>
<div class="small-9 columns">
<div class="input">
<input type="number" id="alternative"
ng-disabled="loading || !isRateAvailable || ($root.merchant && +$root.merchant.total > 0) ||
isPayUri"
name="alternative" placeholder="{{'Amount'|translate}}" ng-model="alternative" requiredautocomplete="off">
<i class="icon-usd"></i>
<div ng-show="showAlternative">
<div class="row collapse">
<label for="alternative"><span translate>Amount in</span> {{ alternativeName }}
<small translate ng-hide="!sendForm.amount.$pristine && amount">required</small>
</label>
<div class="small-9 columns">
<div class="input">
<input type="number" id="alternative"
ng-disabled="loading || !isRateAvailable || ($root.merchant && +$root.merchant.total > 0) ||
isPayUri"
name="alternative" placeholder="{{'Amount'|translate}}" ng-model="alternative" requiredautocomplete="off">
<i class="icon-usd"></i>
</div>
</div>
<div class="small-3 columns pointer" ng-click="showAlternative = false">
<span class="postfix">{{alternativeIsoCode}}</span>
</div>
</div>
<div class="small-3 columns">
<span class="postfix">{{alternativeIsoCode}}</span>
</div>
</div>
</div>