diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 934073ef9..c002a3c0e 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -133,13 +133,9 @@
-
- Payment accepted...
-
-
-
But not broadcasted. Try to send manually
+
+
Payment accepted, but not yet broadcasted
+
- Payment sent!
+ Payment sent
- Payment finally rejected
+ Payment rejected
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index a307c188a..9c45e630c 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -30,8 +30,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (isChromeApp) {
var animatedSlideUp = 'full';
var animatedSlideRight = 'full';
- }
- else {
+ } else {
var animatedSlideUp = 'full animated slideInUp';
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) {
var fc = profileService.focusedClient;
var refreshUntilItChanges = false;
@@ -186,6 +187,14 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.canSign = fc.canSign();
$scope.loading = null;
$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;
$scope.currentSpendUnconfirmed = currentSpendUnconfirmed;