From 30511f9d7af13d3086216cc23bdffbf6003b43d0 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 17 Apr 2015 18:10:22 -0300
Subject: [PATCH] Fix TXP modal events

---
 public/views/modals/txp-details.html | 23 ++++++++++++++++++-----
 src/css/mobile.css                   |  4 ----
 src/js/controllers/walletHome.js     |  2 +-
 src/js/services/configService.js     |  2 +-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 619a191e3..f5d995b23 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -94,7 +94,7 @@
 
 
   <div class="row column m20t" ng-if="tx.couldRemove">
-      <button class="button expand outline dark-gray m0 expand" ng-click="hideTxInfo = true; remove(tx);" 
+      <button class="button expand outline dark-gray m0 expand" ng-click="remove(tx);" 
         ng-disabled="loading" ng-show="tx.couldRemove">
         <i class="fi-x icon-sign x"></i>  
         <span translate>Remove</span>
@@ -106,14 +106,14 @@
 
   <div class="row m20t" ng-if="tx.pendingForUs">
     <div class="large-5 medium-5 small-6 columns">
-      <button class="button outline dark-gray m0 expand" ng-click="hideTxInfo = true; reject(tx);" 
+      <button class="button outline dark-gray m0 expand" ng-click="reject(tx);" 
         ng-disabled="loading">
         <i class="fi-x"></i>  
         <span translate>Reject</span>
       </button>
     </div>
     <div class="large-5 medium-5 small-6 columns text-right">
-      <button class="button primary m0 expand" ng-click="hideTxInfo = true; sign(tx)" 
+      <button class="button primary m0 expand" ng-click="sign(tx)" 
         ng-style="{'background-color':color}"  
         ng-disabled="loading">
         <i class="fi-check"></i>  
@@ -122,9 +122,22 @@
     </div>
   </div>
 
-  <div class="text-center" ng-show="tx.status != 'pending'">
-    <div class="text-success m10t" 
+  <div class="text-center text-gray" ng-show="tx.status != 'pending'">
+    <div class="m10t" 
       ng-show="tx.status=='accepted'" translate>
+      Transaction accepted...
+    </div>
+    <div class="m10t" 
+      ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
+      <div translate>But not broadcasted. Try to send manually</div>
+      <button class="primary"
+        ng-click="broadcast(tx)"
+        ng-disabled="loading"> <i class="fi-upload-cloud"></i>
+        <span translate>Broadcast Transaction</span>
+      </button>
+    </div>
+    <div class="text-success m10t" 
+      ng-show="tx.status=='broadcasted'" translate>
       Transaction sent!
     </div>
     <div class="text-center text-warning"
diff --git a/src/css/mobile.css b/src/css/mobile.css
index c0d572796..f6b9e88a8 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -9,7 +9,6 @@
 body {
   -webkit-user-select: none;
   -khtml-user-select: none;
-  -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
@@ -17,14 +16,12 @@ body {
 input {
   -webkit-user-select: auto !important;
   -khtml-user-select: auto !important;
-  -moz-user-select: auto !important;
   -ms-user-select: auto !important;
   user-select: auto !important;
 }
 
 * {
   -webkit-user-drag: none;
-  -moz-user-drag: none;
   -ms-user-drag: none;
   user-drag: none;
 }
@@ -36,7 +33,6 @@ body, div, .row {
 .enable_text_select {
   -webkit-user-select: text;
   -khtml-user-select: text;
-  -moz-user-select: text;
   -ms-user-select: text;
   user-select: text;
 }
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index ac089aa87..c1b3386f6 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -37,7 +37,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
         return fc.credentials.networkName.substring(0, 4);
       };
 
-      lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved'], function(eventName) {
+      lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved', 'NewOutgoingTx'], function(eventName) {
         $rootScope.$on(eventName, function() {
           fc.getTx($scope.tx.id, function(err, tx) {
             if (err) {
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index a9c0a1b9d..1efdf20fa 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -12,7 +12,7 @@ angular.module('copayApp.services').factory('configService', function(localStora
 
     // Bitcore wallet service URL
     bws: {
-      url: 'https://copay.io:3232/bws/api',
+      url: 'https://bws.bitpay.com/bws/api',
     },
 
     // insight