Merge pull request #117 from NazarUsov/testnet/issues

Fix view for transaction
hyle-team · May 16, 2024 · 007aeef · 007aeef
2 parents 996579f + 92b0b09
commit 007aeef
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
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
@@ -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';
                                     </ng-container>
                                 </ng-container>
 
+                                <ng-container *ngIf="isInitiator(transaction) && !hasZano(transaction.subtransfers)">
+                                    <div [ngClass]="'received'" class="status text-ellipsis" fxLayout="row"
+                                         fxLayoutAlign=" center">
+                                        <img alt="" class="status-transaction mr-1"
+                                             src="assets/icons/aqua/receive.svg" />
+
+                                        <span
+                                            class="status-transaction-text">{{ 'HISTORY.RECEIVED' | translate }}</span>
+                                    </div>
+                                </ng-container>
+
                                 <ng-template #noSubtransfersStatusTemplate>
                                     <div [ngClass]="'received'" class="status text-ellipsis" fxLayout="row"
                                          fxLayoutAlign=" center">
@@ -200,7 +211,7 @@ import { zanoAssetInfo } from '@parts/data/assets';
                                                             *ngIf="isFinalizator(transaction)">{{ subtransfer.amount.negated() | intToMoney }}</ng-container>
                                                     </span>
                                                     <span *ngIf="subtransfer.is_income">
-                                                        {{ subtransfer.amount | intToMoney }}
+                                                        {{ (isInitiator(transaction) ? subtransfer.amount.plus(transaction.fee) : subtransfer.amount) | intToMoney }}
                                                     </span>
                                                     {{ (subtransfer.asset_id | getAssetInfo)?.ticker || '???' }}
                                                 </div>
@@ -220,6 +231,10 @@ import { zanoAssetInfo } from '@parts/data/assets';
                                             </ng-container>
                                         </ng-container>
                                     </ng-container>
+
+                                    <ng-container *ngIf="isInitiator(transaction) && !hasZano(transaction.subtransfers)">
+                                        {{ transaction.fee | intToMoney }} {{ variablesService.defaultCurrency }}
+                                    </ng-container>
                                 </ng-container>
 
                                 <ng-template #noSubtransfersAmountTemplate>
@@ -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
@@ -186,7 +186,8 @@ const objTabs: { [key in TabNameKeys]: Tab } = {
                         </div>
                     </div>
                 </div>
-                <ng-container *ngIf="variablesService.currentWallet.has_bare_unspent_outputs">
+                <ng-container *ngIf="!variablesService.currentWallet.is_auditable && !variablesService.currentWallet.is_watch_only">
+                  <ng-container *ngIf="variablesService.currentWallet.has_bare_unspent_outputs">
                     <hr fxFlex="0 0 1px" style="height: 3.6rem; border: none; border-right: 1px solid #ffffff10">
                     <div class="migrate-alert" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="2rem">
                         <button class="btn-migrate" type="button" (click)="openMigrateWalletToZarcanum()">{{ 'WALLET.MIGRATE.BUTTON2' | translate }}</button>
@@ -200,6 +201,7 @@ const objTabs: { [key in TabNameKeys]: Tab } = {
                         </div>
                     </div>
                 </ng-container>
+                </ng-container>
             </div>
             <div class="right">
                 <div class="dropdown">