diff --git a/html_source/src/app/pages/wallet/tabs/history/history.component.ts b/html_source/src/app/pages/wallet/tabs/history/history.component.ts index 6d151053..b11d0ea9 100644 --- a/html_source/src/app/pages/wallet/tabs/history/history.component.ts +++ b/html_source/src/app/pages/wallet/tabs/history/history.component.ts @@ -1,7 +1,7 @@ import { Component, NgZone, OnDestroy, OnInit } from '@angular/core'; import { VariablesService } from '@parts/services/variables.service'; import { ActivatedRoute } from '@angular/router'; -import { Subtransfer, Transaction } from '@api/models/transaction.model'; +import { Subtransfer, Subtransfers, Transaction } from '@api/models/transaction.model'; import BigNumber from 'bignumber.js'; import { PaginationService } from '@store/pagination/pagination.service'; import { PaginationStore } from '@store/pagination/pagination.store'; @@ -169,6 +169,17 @@ import { zanoAssetInfo } from '@parts/data/assets'; + +
+ + + {{ 'HISTORY.RECEIVED' | translate }} +
+
+
@@ -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 } = {
+