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

better payment details msg

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-09-08 21:11:13 -03:00
commit f210418b51
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
public/views/modals/txp-details.html
View file

@ -133,13 +133,9 @@
</div> </div>
<div class="text-center text-gray m20t" ng-show="tx.status != 'pending'"> <div class="text-center text-gray m20t" ng-show="tx.status != 'pending'">
<div class="m10t size-12" <div ng-show="tx.status=='accepted'">
ng-show="tx.status=='accepted'" translate> <div class="m10b size-12" translate>Payment accepted, but not yet broadcasted</div>
Payment accepted...
</div>
<div
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
<div class="m10b size-12" translate>But not broadcasted. Try to send manually</div>
<button class="primary round" <button class="primary round"
ng-click="broadcast(tx)" ng-click="broadcast(tx)"
ng-disabled="loading"> <i class="fi-upload-cloud"></i> ng-disabled="loading"> <i class="fi-upload-cloud"></i>
@ -148,11 +144,11 @@
</div> </div>
<div class="text-success m10t" <div class="text-success m10t"
ng-show="tx.status=='broadcasted'" translate> ng-show="tx.status=='broadcasted'" translate>
Payment sent! Payment sent
</div> </div>
<div class="text-center text-warning m10t" <div class="text-center text-warning m10t"
ng-show="tx.status=='rejected'" translate> ng-show="tx.status=='rejected'" translate>
Payment finally rejected Payment rejected
</div> </div>
</div> </div>

13
src/js/controllers/walletHome.js
View file

@ -30,8 +30,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (isChromeApp) { if (isChromeApp) {
var animatedSlideUp = 'full'; var animatedSlideUp = 'full';
var animatedSlideRight = 'full'; var animatedSlideRight = 'full';
} } else {
else {
var animatedSlideUp = 'full animated slideInUp'; var animatedSlideUp = 'full animated slideInUp';
var animatedSlideRight = 'full animated slideInRight'; var animatedSlideRight = 'full animated slideInRight';
} }
@ -174,6 +173,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}); });
}; };
var GLIDERA_LOCK_TIME = 6 * 60 * 60 * 1000;
this.openTxpModal = function(tx, copayers) { this.openTxpModal = function(tx, copayers) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var refreshUntilItChanges = false; var refreshUntilItChanges = false;
@ -186,6 +187,14 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.canSign = fc.canSign(); $scope.canSign = fc.canSign();
$scope.loading = null; $scope.loading = null;
$scope.color = fc.backgroundColor; $scope.color = fc.backgroundColor;
// ToDo: use custom data
$scope.isGlidera = false;
if (tx.message === 'Glidera transaction') {
$scope.isGlidera = true;
if ($scope.tx.canBeRemoved)
$scope.tx.canBeRemoved = (Date.now() - (tx.ts || tx.createdOn)) > GLIDERA_LOCK_TIME;
}
refreshUntilItChanges = false; refreshUntilItChanges = false;
$scope.currentSpendUnconfirmed = currentSpendUnconfirmed; $scope.currentSpendUnconfirmed = currentSpendUnconfirmed;