Merge pull request #2259 from aura-nw/baseline/main_20230823

Baseline/main 20230823
aura-nw · Aug 24, 2023 · 6ef1f8d · 6ef1f8d
2 parents af22be0 + c13e81b
commit 6ef1f8d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/app/pages/fee-grant/fee-grant.component.ts b/src/app/pages/fee-grant/fee-grant.component.ts
@@ -31,7 +31,6 @@ export class FeeGrantComponent implements OnInit {
         mergeMap((_) => this.walletService.wallet$),
       )
       .subscribe((wallet) => {
-        const urlPath = window.location.pathname.replace(/^\/([^\/]*).*$/, '$1');
         if (wallet) {
           this.currentAddress = wallet.bech32Address;
         }

diff --git a/src/app/pages/soulbound-token/soulbound-contract-list/soulbound-contract-list.component.html b/src/app/pages/soulbound-token/soulbound-contract-list/soulbound-contract-list.component.html
@@ -2,10 +2,10 @@ <h1 class="mb-0 text--white">ABT Creator</h1>
 <section class="mt-6">
   <div class="card">
     <div class="card-body">
-      <ng-container *ngIf="currentAddress">
-        <div *ngIf="!isNoData && !loading" class="h2 mb-4 mb-lg-0 text--white">Smart Contracts</div>
+      <ng-container *ngIf="currentAddress && !loading">
+        <div *ngIf="!isNoData" class="h2 mb-4 mb-lg-0 text--white">Smart Contracts</div>
         <div
-          *ngIf="!isNoData && !loading"
+          *ngIf="!isNoData"
           class="d-flex flex-column flex-lg-row justify-content-lg-between flex-lg-row-reverse align-items-lg-center mb-4">
           <form (ngSubmit)="searchToken()" class="aura-form single-input-field search-form-sbcontract" #searchForm>
             <div class="input-group">
@@ -114,15 +114,15 @@ <h1 class="mb-0 text--white">ABT Creator</h1>
 </section>
 <ng-template #noValues>
   <app-loading-sprint *ngIf="loading"></app-loading-sprint>
-  <ng-container *ngIf="currentAddress">
+  <ng-container *ngIf="currentAddress && !loading">
     <app-table-no-data
       [textNull]="'There isn\'t any smart contract deployed with you as the ABT\'s creator'"
-      *ngIf="!loading && isNoData"></app-table-no-data>
-    <app-table-no-data *ngIf="!loading && !isNoData"></app-table-no-data>
+      *ngIf="isNoData"></app-table-no-data>
+    <app-table-no-data *ngIf="!isNoData"></app-table-no-data>
   </ng-container>
   <ng-container *ngIf="!currentAddress">
     <app-table-no-data
-      [textNull]="'Kindly connect wallet to view the ABT contract deployed with your as creator'"
+      [textNull]="'Kindly connect wallet to view the ABT contract deployed with you as creator'"
       *ngIf="!loading"></app-table-no-data>
   </ng-container>
 </ng-template>
diff --git a/src/app/pages/soulbound-token/soulbound-contract-list/soulbound-contract-list.component.ts b/src/app/pages/soulbound-token/soulbound-contract-list/soulbound-contract-list.component.ts
@@ -59,7 +59,6 @@ export class SoulboundContractListComponent implements OnInit {
         mergeMap((_) => this.walletService.wallet$),
       )
       .subscribe((wallet) => {
-        const urlPath = window.location.pathname.replace(/^\/([^\/]*).*$/, '$1');
         if (wallet) {
           window.addEventListener('keplr_keystorechange', () => {
             this.isNoData = true;
@@ -104,6 +103,7 @@ export class SoulboundContractListComponent implements OnInit {
   }
 
   getListSmartContract() {
+    this.loading = true;
     if (this.currentAddress === null) {
       return;
     }