mirror of https://github.com/BTCPrivate/copay.git
commit
fe74ec1aae
|
@ -233,9 +233,13 @@ angular.module('copayApp.services')
|
||||||
|
|
||||||
w.on('txProposalEvent', function(e) {
|
w.on('txProposalEvent', function(e) {
|
||||||
if (root.isFocused(wid)) {
|
if (root.isFocused(wid)) {
|
||||||
pendingTxsService.update();
|
pendingTxsService.update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
balanceService.update(w, function() {
|
||||||
|
$rootScope.$digest();
|
||||||
|
}, root.isFocused(wid));
|
||||||
|
|
||||||
// TODO: add wallet name notification
|
// TODO: add wallet name notification
|
||||||
var user = w.publicKeyRing.nicknameForCopayer(e.cId);
|
var user = w.publicKeyRing.nicknameForCopayer(e.cId);
|
||||||
var name = w.getName();
|
var name = w.getName();
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
<div ng-init="username = $root.iden.getName()">
|
<div>
|
||||||
<div class="text-center off-canvas-list">
|
<div class="text-center off-canvas-list">
|
||||||
<a href="#!/profile" class="columns m10v" title="Profile">
|
<a href="#!/profile" class="columns m10v" title="Profile">
|
||||||
<div class="photo-container">
|
<div class="photo-container">
|
||||||
<img gravatar-src="'{{username}}'" gravatar-size="35">
|
<img gravatar-src="'{{$root.iden.getName()}}'" gravatar-size="35">
|
||||||
</div>
|
</div>
|
||||||
<p class="text-black m5">{{username}}</p>
|
<p class="text-black m5">{{$root.iden.getName()}}</p>
|
||||||
<span class="db text-gray size-10" >
|
<span class="db text-gray size-10" >
|
||||||
<i class="fi-torso"></i> {{'ViewProfile' | translate }}
|
<i class="fi-torso"></i> {{'ViewProfile' | translate }}
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -58,12 +58,9 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row" ng-init="showAlternative = false">
|
||||||
<div class="large-6 medium-6 columns">
|
<div class="large-12 medium-12 columns">
|
||||||
<div class="row collapse">
|
<div class="m5b right">
|
||||||
<label for="amount" class="small-7 columns m5b"><span translate>Amount</span>
|
|
||||||
<small translate ng-hide="!sendForm.amount.$pristine && amount">required</small>
|
|
||||||
</label>
|
|
||||||
<span translate class="has-error right size-12" ng-show="sendForm.amount.$invalid &&
|
<span translate class="has-error right size-12" ng-show="sendForm.amount.$invalid &&
|
||||||
!sendForm.amount.$pristine && (notValidAmount || amount)">
|
!sendForm.amount.$pristine && (notValidAmount || amount)">
|
||||||
<span class="icon-input"><i class="fi-x"></i></span>
|
<span class="icon-input"><i class="fi-x"></i></span>
|
||||||
|
@ -71,42 +68,51 @@
|
||||||
</span>
|
</span>
|
||||||
<small class="icon-input right" ng-show="!sendForm.amount.$invalid &&
|
<small class="icon-input right" ng-show="!sendForm.amount.$invalid &&
|
||||||
!sendForm.amount.$pristine"><i class="fi-check"></i></small>
|
!sendForm.amount.$pristine"><i class="fi-check"></i></small>
|
||||||
|
</div>
|
||||||
|
<div ng-show="!showAlternative">
|
||||||
<div class="small-9 columns">
|
<div class="row collapse">
|
||||||
<div class="input">
|
|
||||||
<input type="number" id="amount"
|
<label for="amount"><span translate>Amount in</span> {{$root.wallet.settings.unitName}}
|
||||||
ng-disabled="loading || ($root.merchant && +$root.merchant.total > 0) || isPayUri"
|
<small translate ng-hide="!sendForm.amount.$pristine && amount">required</small>
|
||||||
name="amount" placeholder="{{'Amount'|translate}}" ng-model="amount"
|
</label>
|
||||||
ng-minlength="0.00000001" ng-maxlength="10000000000" valid-amount required
|
|
||||||
autocomplete="off">
|
<div class="small-9 columns">
|
||||||
<i class="icon-bitcoin"></i>
|
<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>
|
</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>
|
||||||
</div>
|
<div ng-show="showAlternative">
|
||||||
<div class="large-6 medium-6 columns">
|
<div class="row collapse">
|
||||||
<div class="row collapse">
|
<label for="alternative"><span translate>Amount in</span> {{ alternativeName }}
|
||||||
<label for="alternative"><span translate>Amount in</span> {{ alternativeName }} </label>
|
<small translate ng-hide="!sendForm.amount.$pristine && amount">required</small>
|
||||||
<div class="small-9 columns">
|
</label>
|
||||||
<div class="input">
|
<div class="small-9 columns">
|
||||||
<input type="number" id="alternative"
|
<div class="input">
|
||||||
ng-disabled="loading || !isRateAvailable || ($root.merchant && +$root.merchant.total > 0) ||
|
<input type="number" id="alternative"
|
||||||
isPayUri"
|
ng-disabled="loading || !isRateAvailable || ($root.merchant && +$root.merchant.total > 0) ||
|
||||||
name="alternative" placeholder="{{'Amount'|translate}}" ng-model="alternative" requiredautocomplete="off">
|
isPayUri"
|
||||||
<i class="icon-usd"></i>
|
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>
|
|
||||||
<div class="small-3 columns">
|
|
||||||
<span class="postfix">{{alternativeIsoCode}}</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue