unify strings to "payment". Add retry on balance update

public/views/modals/tx-details.html

@@ -22,7 +22,7 @@
     </div>
   </div>
 
-  <h4 class="title m0" translate>Information</h4>
+  <h4 class="title m0" translate>Details</h4>
   <ul class="no-bullet size-14 m0">
     <li ng-if="btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyAddress(btx.addressTo)">
     <span class="text-gray" translate>To</span>:
@@ -68,7 +68,7 @@
   </ul>
 
   <div ng-if="btx.actions[0] && isShared">
-    <h4 class="title m0" translate>Signatures</h4>
+    <h4 class="title m0" translate>Participants</h4>
     <ul class="no-bullet size-14 m0">
       <li class="line-b p10 text-gray" ng-repeat="c in btx.actions">
       <span class="right">

public/views/modals/tx-status.html

@@ -1,5 +1,5 @@
 
-<div ng-if="statusStr && statusStr == 'Transaction broadcasted'" class="popup-txsent">
+<div ng-if="type == 'broadcasted'" class="popup-txsent">
   <i class="small-centered columns fi-check m20tp"></i>
   <div class="text-center size-18 text-white text-bold tu p20">
     <span translate>Payment Sent</span>
@@ -9,20 +9,33 @@
   </div>
 </div>
 
-<div ng-if="statusStr && statusStr == 'Transaction proposal signed'" class="popup-txsigned">
+
+<div ng-if="type == 'created'" class="popup-txsigned">
   <i class="small-centered columns fi-check m20tp"></i>
   <div class="text-center size-18 text-primary tu text-bold p20">
-    {{statusStr|translate}}
+    <span translate>Payment Proposal Created</span>
   </div>
   <div class="text-center">
     <a class="button outline round light-gray tiny small-4" ng-click="cancel()" translate>OKAY</a>
   </div>
 </div>
 
-<div ng-if="statusStr && statusStr == 'Transaction was rejected'" class="popup-txrejected">
+
+
+<div ng-if="type == 'accepted'" class="popup-txsigned">
+  <i class="small-centered columns fi-check m20tp"></i>
+  <div class="text-center size-18 text-primary tu text-bold p20">
+    <span translate>Payment Accepted</span>
+  </div>
+  <div class="text-center">
+    <a class="button outline round light-gray tiny small-4" ng-click="cancel()" translate>OKAY</a>
+  </div>
+</div>
+
+<div ng-if="type=='rejected'" class="popup-txrejected">
   <i class="fi-x small-centered columns m20tp"></i>
   <div class="text-center size-18 tu text-warning text-bold p20">
-    {{statusStr|translate}}
+    <span translate>Payment Rejected</span>
   </div>
   <div class="text-center">
     <a class="button outline light-gray round tiny small-4" ng-click="cancel()" translate>OKAY</a>

public/views/modals/txp-details.html

@@ -7,12 +7,12 @@
   </section>
   <section class="middle tab-bar-section">
     <h1 class="title ellipsis" ng-style="{'color':color}" translate>
-      Transaction proposal
+      Payment Proposal
     </h1>
   </section>
 </nav>
 <div class="p45t" ng-init="updateCopayerList()">
-  <h4 class="title m0" translate>Information</h4>
+  <h4 class="title m0" translate>Details</h4>
   <ul class="no-bullet size-14 m0">
     <li class="line-b p10 oh" ng-click="copyAddress(tx.toAddress)">
       <span class="text-gray" translate>To</span>:
@@ -66,7 +66,7 @@
   </div>
 
   <div ng-if="tx.actions[0] && !txRejected && !txBroadcasted">
-    <h4 class="title m0" translate>Signatures</h4>
+    <h4 class="title m0" translate>Participants</h4>
     <ul class="no-bullet size-14 m0">
       <li class="line-b p10 text-gray" ng-repeat="ac in tx.actions">
         <i class="icon-contact size-24"></i>
@@ -87,7 +87,7 @@
 
 
   <div class="row column m20t text-center text-warning" ng-if="tx.removed" translate>
-    The transaction was removed by creator
+    The payment was removed by creator
   </div>
 
   <div class="row m20t" ng-if="tx.pendingForUs">
@@ -103,7 +103,7 @@
         ng-style="{'background-color':color}"
         ng-disabled="loading">
         <i class="fi-check"></i>
-        <span translate>Sign</span>
+        <span translate>Accept</span>
       </button>
     </div>
   </div>
@@ -111,7 +111,7 @@
   <div class="text-center text-gray" ng-show="tx.status != 'pending'">
     <div class="m10t"
       ng-show="tx.status=='accepted'" translate>
-      Transaction accepted...
+      Payment accepted...
     </div>
     <div class="m10t"
       ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
@@ -119,27 +119,27 @@
       <button class="primary round"
         ng-click="broadcast(tx)"
         ng-disabled="loading"> <i class="fi-upload-cloud"></i>
-        <span translate>Broadcast Transaction</span>
+        <span translate>Broadcast Payment</span>
       </button>
     </div>
     <div class="text-success m10t"
       ng-show="tx.status=='broadcasted'" translate>
-      Transaction sent!
+      Payment sent!
     </div>
     <div class="text-center text-warning"
       ng-show="tx.status=='rejected'" translate>
-      Transaction finally rejected
+      Payment finally rejected
     </div>
   </div>
 
   <div class="row column m20t" ng-if="tx.couldRemove">
     <div class="text-gray size-12 text-center m20b" show="tx.couldRemove" translate>
-      * Only transactions created by yourself with no peer signatures can be removed
+      * Only payment proposals created by yourself with no peer actions can be removed
     </div>
     <button class="tiny expand round outline dark-gray" ng-click="remove(tx)"
       ng-disabled="loading" ng-show="tx.couldRemove">
       <i class="fi-trash size-14 m5r"></i>
-      <span translate>Remove transaction</span>
+      <span translate>Delete Payment Proposal</span>
     </button>
   </div>
 

public/views/walletHome.html

@@ -152,7 +152,7 @@
 
       <div ng-if="index.txps[0]">
         <div ng-show="index.requiresMultipleSignatures">
-          <h4 class="title m0" translate>Spend proposals</h4>
+          <h4 class="title m0" translate>Payment Proposals</h4>
           <div class="last-transactions pr" ng-repeat="tx in index.txps"
             ng-include="'views/includes/transaction.html'">
           </div>
@@ -266,20 +266,31 @@
 
     -->
     <div id="send" class="send tab-view">
-      <div ng-show="index.lockedBalance">
+      <div>
         <h4 class="title m0">
-          <div class="left">
-            <i class="fi-info size-36 m10r lh"></i>
+
+          <div  ng-show="!index.lockedBalance">
+            <div class="size-12">
+              <span class="db text-bold">
+                <span translate>Available Balance</span>:
+                {{index.availableBalanceStr }}
+              </span>
+            </div>
           </div>
-          <div class="size-12">
-            <span class="db text-bold">
-              <span translate>Available Balance</span>:
-              {{index.availableBalanceStr }}
-            </span>
-            <span class="text-gray">
-              {{index.lockedBalanceStr}}
-              <span translate>in pending transactions</span>
-            </span>
+          <div  ng-show="index.lockedBalance">
+            <div class="left">
+              <i class="fi-info size-36 m10r lh"></i>
+            </div>
+            <div class="size-12">
+              <span class="db text-bold">
+                <span translate>Available Balance</span>:
+                {{index.availableBalanceStr }}
+              </span>
+              <span class="text-gray" >
+                {{index.lockedBalanceStr}}
+                <span translate>in pending payments</span>
+              </span>
+            </div>
           </div>
         </h4>
       </div>