Merge pull request #2094 from matiu/ref/txproposalevents

refactor tx proposal events

views/includes/bottombar-mobile.html

@@ -4,7 +4,7 @@
         <i class="size-36 {{item.icon}} db"></i> 
         <div class="size-10 tu">
           {{item.title}} 
-          <span class="label alert round" ng-if="item.link=='homeWallet' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
+          <span class="label alert round" ng-if="item.link=='homeWallet' && $root.wallet.pendingTxProposalsCountForUs > 0">{{$root.wallet.pendingTxProposalsCountForUs}}</span>
         </div>
       </a>
     </div> 

views/includes/sidebar.html

@@ -86,8 +86,8 @@
       <a href="#!/{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
         <i class="size-21 m20r {{item.icon}}"></i> {{item.title|translate}}
         <span class="right">
-          <span class="label alert" ng-if="item.link=='homeWallet' && $root.pendingTxCount > 0">
-            {{$root.pendingTxCount}}
+          <span class="label alert" ng-if="item.link=='homeWallet' && $root.wallet.pendingTxProposalsCountForUs > 0">
+            {{$root.wallet.pendingTxProposalsCountForUs}}
           </span>
         </span>
       </a>

views/includes/transaction.html

@@ -33,7 +33,7 @@
 </div>
 
 
-<div class="last-transactions-footer">
+<div class="last-transactions-footer" ng-init="myId = $root.wallet.getMyCopayerId()">
   <div class="row collapse">
     <div class="small-12 columns" ng-show="!tx.sentTs">
       <div ng-show="tx.signedBy[myId]">
@@ -60,8 +60,9 @@
           </div>
         </div>
       </div>
+
       <div ng-show="!tx.missingSignatures && !tx.sentTs">
-        <button class="primary tiny m0" ng-click="send(tx.ntxid)" ng-disabled="loading"> <i class="fi-upload-cloud"></i>
+        <button class="primary tiny m0" ng-click="broadcast(tx.ntxid)" ng-disabled="loading"> <i class="fi-upload-cloud"></i>
           <span translate>Broadcast Transaction</span>
         </button>
       </div>