Skip to content

Commit

Permalink
Add delegate in the transaction detail popup
Browse files Browse the repository at this point in the history
  • Loading branch information
FDubath committed Feb 14, 2021
1 parent a7fd184 commit 816081a
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 0 deletions.
18 changes: 18 additions & 0 deletions app/includes/readonlyTransactions.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,24 @@
<div><label translate="TRA_details_date">date</label> {{selectedTrans.time*1000 | date : 'yyyy-MM-dd HH:mm' }}</div>

<div ng-show="selectedTrans.addr_from==watched_address">


<div ng-show="selectedTrans.delegate">
<div><strong translate="TRA_Delegated"></strong></div>
<div> {{selectedTrans.delegate_name }}</div>
<span>
<div class="identiconWrapper without_text_tr">
<div id="addressIdenticon" title="Address Indenticon" img="1" blockie-address="{{selectedTrans.delegate }}" watch-var="selectedTrans" ></div>
</div>
</span>
<textarea cols="9" rows="5" class="adrtxtSml" readonly="readonly" >{{selectedTrans.delegate }} </textarea>

</div>





<div><strong><span translate="TRA_Paid" class="paid"></span> &nbsp;{{(selectedTrans.recieved + selectedTrans.tax)/100. | number : 2}} {{selectedTrans.currency}}</strong></div>
<div><strong translate="TRA_To"></strong> {{selectedTrans.to_name }}</div>
<span>
Expand Down
1 change: 1 addition & 0 deletions app/scripts/controllers/readonlytransactionsCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ var readonlytransactionsCtrl = function($scope, $locale, $sce, walletService,con
$scope.transactions[ind].data.from_name = contactservice.getContactName($scope.contacts, $scope.transactions[ind].data.addr_from);
$scope.transactions[ind].data.memo = $scope.getTransactionMessage($scope.transactions[ind].data);
$scope.transactions[ind].data.currency='';
$scope.transactions[ind].data.delegate_name=contactservice.getContactName($scope.contacts, $scope.transactions[ind].data.delegate);
if ($scope.transactions[ind].data.type=='Transfer' || $scope.transactions[ind].data.type=='Pledge'){
$scope.transactions[ind].data.currency=globalFuncs.currencies.CUR_nanti;
} else if ($scope.transactions[ind].data.type=='TransferCredit'){
Expand Down
1 change: 1 addition & 0 deletions app/scripts/translations/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@ TRA_details_date: 'Date',
TRA_details_amount: 'Amount transferred',
TRA_Registered: 'Transaction registered',
TRA_Confirmed: 'Transaction completed',
TRA_Delegated: 'Transaction ordered by:',
TRA_Close: 'Close',
TRA_memo_title: 'Notes',
TRA_no_valid_memo: 'This file does not contain valid Notes.',
Expand Down
1 change: 1 addition & 0 deletions app/scripts/translations/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ TRA_details_date: 'Date:',
TRA_details_amount: 'Montant transféré',
TRA_Registered: 'Transaction enregistrée',
TRA_Confirmed: 'Transaction effectuée',
TRA_Delegated: 'Transaction déclanchée par:',
TRA_Close: 'Fermer',
TRA_memo_title: 'Mémo:',
TRA_no_valid_memo: 'Ce fichier ne contient pas de mémo valide.',
Expand Down

0 comments on commit 816081a

Please sign in to comment.