From f210418b51e8476e90054b9c1c2f093952ac03b6 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 8 Sep 2015 21:11:13 -0300
Subject: [PATCH 1/2] better payment details msg

---
 public/views/modals/txp-details.html | 14 +++++---------
 src/js/controllers/walletHome.js     | 13 +++++++++++--
 2 files changed, 16 insertions(+), 11 deletions(-)

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 @@
   </div>
 
   <div class="text-center text-gray m20t" ng-show="tx.status != 'pending'">
-    <div class="m10t size-12"
-      ng-show="tx.status=='accepted'" translate>
-      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>
+    <div ng-show="tx.status=='accepted'">
+      <div class="m10b size-12" translate>Payment accepted, but not yet broadcasted</div>
+      
       <button class="primary round"
         ng-click="broadcast(tx)"
         ng-disabled="loading"> <i class="fi-upload-cloud"></i>
@@ -148,11 +144,11 @@
     </div>
     <div class="text-success m10t"
       ng-show="tx.status=='broadcasted'" translate>
-      Payment sent!
+      Payment sent
     </div>
     <div class="text-center text-warning m10t"
       ng-show="tx.status=='rejected'" translate>
-      Payment finally rejected
+      Payment rejected
     </div>
   </div>
 
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;
 

From 666eee43212bb0eb4d43dd47e75626bec2202e2e Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 8 Sep 2015 22:39:33 -0300
Subject: [PATCH 2/2] add logic to txp modal related to glidera

---
 public/views/includes/transaction.html |  2 +-
 public/views/modals/txp-details.html   | 10 +++++++---
 src/js/controllers/index.js            |  2 ++
 src/js/controllers/walletHome.js       | 22 ++++++++++++----------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html
index 0a0be0be0..95944e441 100644
--- a/public/views/includes/transaction.html
+++ b/public/views/includes/transaction.html
@@ -1,6 +1,6 @@
 <div class="ng-animate-disabled row collapse last-transactions-content line-b"
   ng-class="{'text-gray':!tx.pendingForUs}"
-  ng-click="home.openTxpModal(tx, index.copayers)">
+  ng-click="home.openTxpModal(tx, index.copayers, !!index.glideraStatus)">
   <div class="small-1 columns text-center" >
     <i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}" style="margin-top:8px;"></i>
     &nbsp;
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index c002a3c0e..6597ffb35 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -133,15 +133,19 @@
   </div>
 
   <div class="text-center text-gray m20t" ng-show="tx.status != 'pending'">
-    <div ng-show="tx.status=='accepted'">
+    <div ng-show="tx.status=='accepted' && !tx.isGlidera" >
       <div class="m10b size-12" translate>Payment accepted, but not yet broadcasted</div>
       
       <button class="primary round"
         ng-click="broadcast(tx)"
-        ng-disabled="loading"> <i class="fi-upload-cloud"></i>
+        ng-disabled="loading"
+        > <i class="fi-upload-cloud"></i>
         <span translate>Broadcast Payment</span>
       </button>
     </div>
+    <div ng-show="tx.status=='accepted' && tx.isGlidera" >
+      <div class="m10 size-12" translate>Payment accepted. It will be broadcasted by Glidera. It case there is a problem, it can be deleted after 6 hours it was created.</div>
+    </div>
     <div class="text-success m10t"
       ng-show="tx.status=='broadcasted'" translate>
       Payment sent
@@ -153,7 +157,7 @@
   </div>
 
   <div class="row columns text-center m20t" ng-if="tx.canBeRemoved">
-    <div class="text-gray size-12 m20b" show="tx.canBeRemoved" translate>
+    <div class="text-gray size-12 m20b" ng-if="!tx.isGlidera" translate>
       * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
     </div>
     <button class="tiny round outline dark-gray warning" ng-click="remove(tx)"
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 3a39f0c1b..c0217b507 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -839,6 +839,8 @@ console.log('[index.js:395]',txps); //TODO
 
   self.initGlidera = function(accessToken) {
     if (self.isShared) return;
+    self.glideraStatus = null;
+
     glideraService.setCredentials(self.network);
 
     var getToken = function(cb) {
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 9c45e630c..cc868c659 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -173,28 +173,30 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     });
   };
 
-  var GLIDERA_LOCK_TIME = 6 * 60 * 60 * 1000;
-
-  this.openTxpModal = function(tx, copayers) {
+  var GLIDERA_LOCK_TIME = 6 * 60 * 60 ;
+  // isGlidera flag is a security mesure so glidera status is not
+  // only determined by the tx.message
+  this.openTxpModal = function(tx, copayers, isGlidera) {
     var fc = profileService.focusedClient;
     var refreshUntilItChanges = false;
     var currentSpendUnconfirmed = $scope.currentSpendUnconfirmed;
     var ModalInstanceCtrl = function($scope, $modalInstance) {
       $scope.error = null;
-      $scope.tx = tx;
       $scope.copayers = copayers
       $scope.copayerId = fc.credentials.copayerId;
       $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;
+      // ToDo: use tx.customData instead of tx.message
+      if (tx.message === 'Glidera transaction' && isGlidera) {
+        tx.isGlidera = true;
+        if (tx.canBeRemoved) {
+          tx.canBeRemoved = (Date.now()/1000 - (tx.ts || tx.createdOn)) > GLIDERA_LOCK_TIME;
+        }
       }
+      $scope.tx = tx;
+
       refreshUntilItChanges = false;
       $scope.currentSpendUnconfirmed = currentSpendUnconfirmed;