Merge pull request #119 from NazarUsov/testnet/issues

Hot fix for tab send
hyle-team · Jun 27, 2024 · 60e5528 · 60e5528
2 parents fb814ff + 928d55b
commit 60e5528
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 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
@@ -213,7 +213,7 @@ import { zanoAssetInfo } from '@parts/data/assets';
                                                     <span *ngIf="subtransfer.is_income">
                                                         {{ (isInitiator(transaction) ? subtransfer.amount.plus(transaction.fee) : subtransfer.amount) | intToMoney }}
                                                     </span>
-                                                    {{ (subtransfer.asset_id | getAssetInfo)?.ticker || '???' }}
+                                                    {{ (subtransfer.asset_id | getAssetInfo)?.ticker || '***' }}
                                                 </div>
                                             </ng-container>
                                         </ng-container>
@@ -226,7 +226,7 @@ import { zanoAssetInfo } from '@parts/data/assets';
                                                     <span *ngIf="subtransfer.is_income">
                                                             {{ subtransfer.amount | intToMoney }}
                                                         </span>
-                                                    {{ (subtransfer.asset_id | getAssetInfo)?.ticker || '???' }}
+                                                    {{ (subtransfer.asset_id | getAssetInfo)?.ticker || '***' }}
                                                 </div>
                                             </ng-container>
                                         </ng-container>

diff --git a/html_source/src/app/pages/wallet/tabs/send/modals/send-modal/send-modal.component.ts b/html_source/src/app/pages/wallet/tabs/send/modals/send-modal/send-modal.component.ts
@@ -35,7 +35,7 @@ import { ZanoValidators } from '@parts/utils/zano-validators';
                   </div>
                   <div class="text">
                     {{ sendMoneyParams.amount }}
-                    {{ (sendMoneyParams.asset_id | getAssetInfo)?.ticker || '???' }}
+                    {{ (sendMoneyParams.asset_id | getAssetInfo)?.ticker || '***' }}
                   </div>
                 </div>
 

diff --git a/html_source/src/app/pages/wallet/tabs/send/send.component.ts b/html_source/src/app/pages/wallet/tabs/send/send.component.ts
@@ -23,7 +23,6 @@ import { defaultImgSrc, zanoAssetInfo } from '@parts/data/assets';
     template: `
         <div class="container scrolled-content" fxFlex="1 1 auto">
             <form
-                *ngIf="!(loading$ | async)"
                 (ngSubmit)="showDialog()"
                 [formGroup]="sendMoneyParamsForm"
                 class="form"
@@ -684,6 +683,9 @@ export class SendComponent implements OnInit, OnDestroy {
                 error: () => {
                     this.loading$.next(false);
                 },
+                complete: () => {
+                    this.loading$.next(false);
+                }
             });
     }
 

diff --git a/...tabs/swap/modals/swap-confirm-master-password/swap-confirm-master-password.component.html b/...tabs/swap/modals/swap-confirm-master-password/swap-confirm-master-password.component.html
@@ -14,7 +14,7 @@ <h3 class="title mb-2" fxFlex="0 0 auto">
                         <div class="text">
                             <ng-container *ngFor="let item of data.proposalDetails.to_initiator">
                                 {{ item.amount | intToMoney }}
-                                {{ (item.asset_id | getAssetInfo)?.ticker || '???' }}
+                                {{ (item.asset_id | getAssetInfo)?.ticker || '***' }}
                                 <br />
                             </ng-container>
                         </div>
@@ -29,7 +29,7 @@ <h3 class="title mb-2" fxFlex="0 0 auto">
                         <div class="text">
                             <ng-container *ngFor="let item of data.proposalDetails.to_finalizer">
                                 {{ item.amount | intToMoney }}
-                                {{ (item.asset_id | getAssetInfo)?.ticker || '???' }}
+                                {{ (item.asset_id | getAssetInfo)?.ticker || '***' }}
                                 <br />
                             </ng-container>
                         </div>

diff --git a/html_source/src/app/pages/wallet/tabs/swap/pages/confirm-swap/confirm-swap.component.html b/html_source/src/app/pages/wallet/tabs/swap/pages/confirm-swap/confirm-swap.component.html
@@ -24,7 +24,7 @@
                     </div>
 
                     <div class="text">
-                        <p *ngFor="let item of proposalDetails.to_initiator">{{ item.amount | intToMoney }} {{ (item.asset_id | getAssetInfo)?.ticker || '???' }}</p>
+                        <p *ngFor="let item of proposalDetails.to_initiator">{{ item.amount | intToMoney }} {{ (item.asset_id | getAssetInfo)?.ticker || '***' }}</p>
                     </div>
                 </div>
 
@@ -37,7 +37,7 @@
                     <div class="text">
                         <p *ngFor="let item of proposalDetails.to_finalizer">
                             {{ item.amount | intToMoney }}
-                            {{ (item.asset_id | getAssetInfo)?.ticker || '???' }}
+                            {{ (item.asset_id | getAssetInfo)?.ticker || '***' }}
                         </p>
                     </div>
                 </div>