@@ -200,7 +211,7 @@ import { zanoAssetInfo } from '@parts/data/assets';
*ngIf="isFinalizator(transaction)">{{ subtransfer.amount.negated() | intToMoney }}
- {{ subtransfer.amount | intToMoney }}
+ {{ (isInitiator(transaction) ? subtransfer.amount.plus(transaction.fee) : subtransfer.amount) | intToMoney }}
{{ (subtransfer.asset_id | getAssetInfo)?.ticker || '???' }}
@@ -220,6 +231,10 @@ import { zanoAssetInfo } from '@parts/data/assets';
+
+
+ {{ transaction.fee | intToMoney }} {{ variablesService.defaultCurrency }}
+
@@ -589,6 +604,10 @@ export class HistoryComponent implements OnInit, OnDestroy {
});
}
+ hasZano(subtransfers: Subtransfers): boolean {
+ return Boolean(subtransfers.find(({ asset_id }) => asset_id === zanoAssetInfo.asset_id));
+ }
+
setPage(pageNumber: number): void {
// this is will allow pagination for wallets that was open from existed wallets'
if (pageNumber === this.variablesService.currentWallet.currentPage) {
diff --git a/html_source/src/app/pages/wallet/wallet/wallet.component.ts b/html_source/src/app/pages/wallet/wallet/wallet.component.ts
index 760ff8eb..050fb56d 100644
--- a/html_source/src/app/pages/wallet/wallet/wallet.component.ts
+++ b/html_source/src/app/pages/wallet/wallet/wallet.component.ts
@@ -186,7 +186,8 @@ const objTabs: { [key in TabNameKeys]: Tab } = {
-
+
+
@@ -200,6 +201,7 @@ const objTabs: { [key in TabNameKeys]: Tab } = {
+