Merge pull request #2526 from cmgustavo/bug/minors-01

Bug/minors 01

public/views/modals/txp-details.html

@@ -19,8 +19,8 @@
     </li>
     <li class="line-b p10">
       <span class="text-gray">Amount:</span>
-      <span class="right">{{tx.amountStr}} 
+      <span class="right">{{amountStr}} 
-        <span class="label gray radius">{{tx.alternativeAmountStr}}</span>
+        <span class="label gray radius">{{alternativeAmountStr}}</span>
       </span>
     </li>
     <li class="line-b p10">
@@ -122,21 +122,13 @@
     </div>
   </div>
 
-  <div ng-show="!hideTxInfo">
+  <div class="text-center" ng-show="tx.status != 'pending'">
-    <div class="row collapse m10t" 
+    <div class="text-success m10t" 
-      ng-show="tx.status=='accepted' && !txBroadcasted && !txRejected">
+      ng-show="tx.status=='accepted'" translate>
-      <button class="primary expand"
+      Transaction sent!
-        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 oh" 
-      ng-show="txBroadcasted">
-      <span translate>Transaction sent!</span>
     </div>
     <div class="text-center text-warning"
-      ng-show="txRejected" translate>
+      ng-show="tx.status=='rejected'" translate>
       Transaction finally rejected
     </div>
   </div>

src/js/controllers/walletHome.js

@@ -29,6 +29,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     var ModalInstanceCtrl = function($scope, $modalInstance) {
       $scope.error = null;
       $scope.tx = tx;
+      $scope.amountStr = tx.amountStr;
+      $scope.alternativeAmountStr = tx.alternativeAmountStr;
       $scope.copayers = copayers
       $scope.loading = null;
       $scope.color = fc.backgroundColor;
@@ -193,7 +195,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       };
 
       $scope.cancel = function() {
-        $modalInstance.dismiss('cancel');
+        $modalInstance.close();
       };
     };
 

src/js/directives/directives.js

@@ -127,7 +127,7 @@ angular.module('copayApp.directives')
       link: function(scope, elem, attrs, ctrl) {
         var validator = function(value) {
           if (value.length > 0) {
-            var m = value.match(/^[1-9A-HJ-NP-Za-km-z]{70,80}$/);
+            var m = value.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/);
             ctrl.$setValidity('walletSecret', m ? true : false);
           }
           return value;

src/js/services/configService.js

@@ -12,8 +12,7 @@ angular.module('copayApp.services').factory('configService', function(localStora
 
     // Bitcore wallet service URL
     bws: {
-      url: 'http://162.242.245.33:3232/bws/api',
+      url: 'https://copay.io:3232/bws/api',
-//      url: 'http://localhost:3001/bws/api',
     },
 
     // insight