Merge pull request #2078 from cmgustavo/bug/07-ui

Removes loading message from History and change Send title
This commit is contained in:
Matias Alejo Garcia 2014-12-09 23:45:25 -03:00
commit 04ab7d28de
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@ angular.module('copayApp.controllers').controller('SendController',
preconditions.checkState(w);
preconditions.checkState(w.settings.unitToSatoshi);
$rootScope.title = w.isShared() ? 'Create Transaction Proposal' : 'Send';
$rootScope.title = w.isShared() ? 'Send Proposal' : 'Send';
$scope.loading = false;
$scope.error = $scope.success = null;

View File

@ -2,7 +2,7 @@
<div class="row">
<div class="large-12 medium-12 small-12 columns">
<h1 class="hide-for-large-up">{{$root.title}}</h1>
<div ng-if="loading" class="m20b">
<div ng-if="loading && !blockchain_txs[0].txid" class="m20b">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Loading...</span>
</div>