Merge pull request #1698 from aura-nw/baseline/main_20230321

Baseline/main 20230321
aura-nw · Mar 21, 2023 · 4ff36ff · 4ff36ff
2 parents 4ad6d1b + 690024d
commit 4ff36ff
Show file tree

Hide file tree

Showing 17 changed files with 153 additions and 138 deletions.
diff --git a/angular.json b/angular.json
@@ -56,9 +56,7 @@
                             "./node_modules/@popperjs/core/dist/umd/popper.min.js",
                             "./node_modules/bootstrap/dist/js/bootstrap.min.js",
                             "./node_modules/jquery/dist/jquery.min.js"
-                        ],
-                        "serviceWorker": true,
-                        "ngswConfigPath": "ngsw-config.json"
+                        ]
                     },
                     "configurations": {
                         "production": {

diff --git a/ngsw-config.json b/ngsw-config.json
diff --git a/package.json b/package.json
@@ -23,7 +23,6 @@
         "@angular/platform-browser": "~12.0.2",
         "@angular/platform-browser-dynamic": "~12.0.2",
         "@angular/router": "~12.0.2",
-        "@angular/service-worker": "~12.0.2",
         "@coin98-com/connect-sdk": "^1.0.9",
         "@cosmjs/cosmwasm-stargate": "^0.28.13",
         "@cosmjs/encoding": "^0.28.13",

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -36,7 +36,6 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { ServiceWorkerModule } from '@angular/service-worker';
 import { NgbModule, NgbNavModule, NgbPopoverModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
@@ -145,12 +144,6 @@ export class MaterialModule {}
     NgbTooltipModule,
     NgbPopoverModule,
     NgbNavModule,
-    ServiceWorkerModule.register('ngsw-worker.js', {
-      enabled: environment.production,
-      // Register the ServiceWorker as soon as the app is stable
-      // or after 30 seconds (whichever comes first).
-      registrationStrategy: 'registerWhenStable:30000',
-    }),
     ToastrModule.forRoot({ positionClass: 'inline', maxOpened: 2 }),
     NgxMaskModule.forRoot(maskConfig),
     ReactiveFormsModule,

diff --git a/src/app/layouts/footer/footer.component.html b/src/app/layouts/footer/footer.component.html
@@ -76,7 +76,7 @@
   </section>
   <section class="bottom-bar pt-lg-6 pb-lg-5 pt-8">
     <div class="container-fluid d-flex flex-column-reverse flex-lg-row justify-content-lg-between align-items-center">
-      <div class="caption-2 mt-6 mt-md-0">Copyright © 2022 Aura Network. All rights reserved</div>
+      <div class="caption-2 mt-6 mt-md-0">Copyright © 2023 Aura Network. All rights reserved</div>
       <div class="d-flex">
         <a href="https://discord.gg/bzm3dyxJxR" target="_blank">
           <i class="mr-3 aura-icon icon--switch-stage icon-discord"></i>

diff --git a/src/app/pages/account/account-detail/account-detail.component.ts b/src/app/pages/account/account-detail/account-detail.component.ts
@@ -155,7 +155,6 @@ export class AccountDetailComponent implements OnInit, AfterViewInit {
   accDetailLoading = true;
   chartLoading = true;
   userAddress = '';
-  lstBalanceAcount = undefined;
   modalReference: any;
   isNoData = false;
 
@@ -356,7 +355,7 @@ export class AccountDetailComponent implements OnInit, AfterViewInit {
 
   getAccountDetail(): void {
     this.isNoData = false;
-    const halftime = 30000;
+    const halftime = 15000;
     this.accountService.getAccountDetail(this.currentAddress).subscribe((res) => {
       this.chartLoading = true;
       this.accDetailLoading = true;
@@ -423,7 +422,6 @@ export class AccountDetailComponent implements OnInit, AfterViewInit {
           f.token_name = f.name;
         });
 
-        this.lstBalanceAcount = this.currentAccountDetail?.balances;
         this.dataSourceToken.data = this.currentAccountDetail?.balances;
         this.pageDataToken.length = this.currentAccountDetail?.balances?.length;
         this.dataSourceTokenBk = this.dataSourceToken;
@@ -466,7 +464,6 @@ export class AccountDetailComponent implements OnInit, AfterViewInit {
         this.searchNullData = true;
       }
       this.dataSourceToken = this.dataSourceTokenBk;
-      this.lstBalanceAcount = data;
       this.dataSourceToken = new MatTableDataSource(data);
     } else {
       this.dataSourceToken = this.dataSourceTokenBk;

diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.ts b/src/app/pages/account/account-detail/token-table/token-table.component.ts
@@ -67,43 +67,48 @@ export class TokenTableComponent implements OnChanges {
   }
 
   getListToken() {
-    this.assetsLoading = true;
     const payload = {
       account_address: this.address,
       limit: this.pageData.pageSize,
       offset: this.pageData.pageSize * this.pageData.pageIndex,
       keyword: this.textSearch,
     };
-    this.accountService.getAssetCW20ByOwner(payload).subscribe((res: ResponseDto) => {
-      let data: any;
-      if (res?.data?.length > 0) {
-        let lstToken = _.get(res, 'data').map((element) => {
-          data = element;
-          if (data) {
-            data.change = data.price_change_percentage_24h;
-            data.isValueUp = true;
-            if (data.change !== '-' && data.change < 0) {
-              data.isValueUp = false;
-              data.change = Number(data.change.toString().substring(1));
+    this.accountService.getAssetCW20ByOwner(payload).subscribe(
+      (res: ResponseDto) => {
+        let data: any;
+        if (res?.data?.length > 0) {
+          let lstToken = _.get(res, 'data').map((element) => {
+            data = element;
+            if (data) {
+              data.change = data.price_change_percentage_24h;
+              data.isValueUp = true;
+              data['balance'] = data['balance'] || 0;
+              if (data.change !== '-' && data.change < 0) {
+                data.isValueUp = false;
+                data.change = Number(data.change.toString().substring(1));
+              }
+              if (data.contract_address !== '-') {
+                const tempConvert = +data.balance / Math.pow(10, data.decimals || 0);
+                data.balance = tempConvert < 0.000001 ? 0 : tempConvert;
+              }
             }
-            if (data.contract_address !== '-') {
-              const tempConvert = +data.balance / Math.pow(10, data.decimals || 0);
-              data.balance = tempConvert < 0.000001 ? 0 : tempConvert;
-            }
-          }
-          return data;
-        });
-
-        lstToken = lstToken.filter((k) => k?.symbol);
-        this.dataSource = new MatTableDataSource<any>(lstToken);
-        this.pageData.length = res.meta.count;
-        this.totalAssets.emit(this.pageData.length);
-      } else {
-        this.pageData.length = 0;
-        this.dataSource.data = [];
-      }
-      this.assetsLoading = false;
-    });
+            return data;
+          });
+
+          lstToken = lstToken.filter((k) => k?.symbol);
+          this.dataSource = new MatTableDataSource<any>(lstToken);
+          this.pageData.length = res.meta.count;
+          this.totalAssets.emit(this.pageData.length);
+        } else {
+          this.pageData.length = 0;
+          this.dataSource.data = [];
+        }
+      },
+      () => {},
+      () => {
+        this.assetsLoading = false;
+      },
+    );
   }
 
   convertValue(value: any, decimal: number) {

diff --git a/src/app/pages/blocks/block-detail/block-detail.component.html b/src/app/pages/blocks/block-detail/block-detail.component.html
@@ -183,7 +183,7 @@ <h2 class="card-header mb-0 text--white pb-0">Transactions</h2>
                         </div>
                         <div *ngSwitchCase="'amount'">
                           <ng-container *ngIf="data[template.matColumnDef] > 0; else displayNonNumber">
-                            {{ data[template.matColumnDef] | mask : 'separator.6' }}
+                            {{ +data[template.matColumnDef] | mask : 'separator.6' }}
                             <span class="text--primary">{{ commonService.mappingNameIBC(data?.denom) }}</span>
                           </ng-container>
                           <ng-template #displayNonNumber>
@@ -227,8 +227,8 @@ <h2 class="card-header mb-0 text--white pb-0">Transactions</h2>
                 {
                   label: 'Amount',
                   info:
-                    data.amount > 0
-                      ? (data.amount | mask : 'separator.6') + '<span class=text--primary> ' + denom + '</span>'
+                    +data.amount > 0
+                      ? (+data.amount | mask : 'separator.6') + '<span class=text--primary> ' + denom + '</span>'
                       : checkAmountValue(data.amount, data.tx_hash)
                 },
                 { label: 'Time', info: commonService.getDateValue(data.timestamp, false)[1] }

diff --git a/src/app/pages/token/token-list/token-cw4973/token-cw4973.component.html b/src/app/pages/token/token-list/token-cw4973/token-cw4973.component.html
@@ -45,7 +45,7 @@ <h1 class="mb-0 text--white fw-500-mob">Account Bound Tokens (ABT)</h1>
               <th mat-header-cell *matHeaderCellDef>Token</th>
               <td mat-cell *matCellDef="let element" class="title-cell py-4">
                 <div class="d-flex">
-                  <a href="/tokens/token-abt/{{ element.contract_address }}" class="text--primary">
+                  <a [routerLink]="['/tokens/token-abt', element.contract_address]" class="text--primary">
                     <span *ngIf="element.token_name"
                       >{{ element.token_name | stringEllipsis : 30 }}
                       <span *ngIf="element.token_symbol">({{ element.token_symbol }})</span></span

diff --git a/src/app/pages/token/token-list/token-cw721/token-cw721.component.html b/src/app/pages/token/token-list/token-cw721/token-cw721.component.html
@@ -52,7 +52,7 @@ <h1 class="mb-0 text--white fw-500-mob">Non-Fungible Tokens (NFT)</h1>
                 <div class="d-flex">
                   <!-- <img [src]="element.image || defaultLogoToken" width="18" height="18" /> -->
                   <div>
-                    <a href="/tokens/token-nft/{{ element.contract_address }}" class="text--primary">
+                    <a [routerLink]="['/tokens/token-nft', element.contract_address]" class="text--primary">
                       {{ element.name | stringEllipsis : 16 }}
                       <span *ngIf="element.symbol">({{ element.symbol }})</span>
                     </a>

diff --git a/...s/transaction/transaction-detail/transaction-messages/transaction-messages.component.html b/...s/transaction/transaction-detail/transaction-messages/transaction-messages.component.html
@@ -370,33 +370,50 @@ <h2 class="card-header mb-0 pb-0 text--white d-block">
     <div class="card-info">
       <ng-container *ngTemplateOutlet="messageHeader; context: { data: { label: transactionDetailType } }">
       </ng-container>
-      <app-messages-item
-        [label]="'To Address'"
-        [value]="transactionDetail?.messages[0]?.to_address"
-        [dataLink]="{ url: '/account' }"></app-messages-item>
-      <div class="row mb-3 body-01">
-        <div class="col-12 col-lg-3 mb-2 mb-lg-0 text--gray-4 body">Validator</div>
-        <div class="col-12 col-lg-9 text--gray-1">{{ transactionDetail?.messages[0]?.description?.moniker }}</div>
-      </div>
       <app-messages-item
         [label]="'Validator Address'"
         [value]="transactionDetail?.messages[0]?.validator_address"
         [dataLink]="{ url: '/account' }"></app-messages-item>
-    </div>
-  </ng-container>
-
-  <ng-container *ngIf="transactionDetail?.type === eTransType.EditValidator">
-    <div class="card-info">
-      <ng-container *ngTemplateOutlet="messageHeader; context: { data: { label: transactionDetailType } }">
-      </ng-container>
       <app-messages-item
-        [label]="'Validator'"
-        [value]="transactionDetail?.messages[0]?.description?.moniker"
-        [dataLink]="{ url: '/account' }"></app-messages-item>
+        [label]="'Details'"
+        [value]="transactionDetail?.messages[0]?.description?.details || '-'"></app-messages-item>
       <app-messages-item
-        [label]="'Validator'"
-        [value]="transactionDetail?.messages[0]?.validator_address"
-        [dataLink]="{ url: '/account' }"></app-messages-item>
+        [label]="'Moniker'"
+        [value]="transactionDetail?.messages[0]?.description?.moniker || '-'"></app-messages-item>
+      <div class="row mb-3 body-01">
+        <div class="col-3 mb-2 mb-lg-0 text--gray-4">Website</div>
+        <div class="col-9">
+          <ng-container *ngIf="transactionDetail?.messages[0]?.description?.website; else noValues">
+            <a
+              class="text--primary"
+              *ngIf="transactionDetail?.messages[0]?.description?.website !== '[do-not-modify]'"
+              [href]="transactionDetail?.messages[0]?.description?.website">
+              {{ transactionDetail?.messages[0]?.description?.website }}
+            </a>
+            <span *ngIf="transactionDetail?.messages[0]?.description?.website === '[do-not-modify]'">{{
+              transactionDetail?.messages[0]?.description?.website
+            }}</span>
+          </ng-container>
+        </div>
+      </div>
+      <app-messages-item
+        [label]="'Identity'"
+        [value]="transactionDetail?.messages[0]?.description?.identity || '-'"></app-messages-item>
+      <app-messages-item
+        [label]="'Commission Rate'"
+        [value]="
+          checkRateFloatNumber(transactionDetail?.messages[0]?.commission_rate) || 0
+            | percent : global.formatNumber2Decimal
+        "></app-messages-item>
+      <div class="row mb-3 body-01">
+        <div class="col-12 col-lg-3 mb-2 mb-lg-0 text--gray-4 body">Min Self Delegation</div>
+        <div class="col-12 col-lg-9 text--gray-1">
+          <ng-container *ngIf="transactionDetail?.messages[0]?.min_self_delegation > 0; else noValues">
+            {{ transactionDetail?.messages[0]?.min_self_delegation | balanceOf | mask : 'separator.6' }}
+            <span class="text--primary">{{ denom }}</span>
+          </ng-container>
+        </div>
+      </div>
     </div>
   </ng-container>
 
@@ -500,19 +517,28 @@ <h2 class="card-header mb-0 pb-0 text--white d-block">
       <div class="row mb-3 body-01">
         <div class="col-3 mb-2 mb-lg-0 text--gray-4">Commission Rate</div>
         <div class="col-9">
-          {{ checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.rate) || 0 | percent : global.formatNumber2Decimal }}
+          {{
+            checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.rate) || 0
+              | percent : global.formatNumber2Decimal
+          }}
         </div>
       </div>
       <div class="row mb-3 body-01">
         <div class="col-3 mb-2 mb-lg-0 text--gray-4">Commission Max Rate</div>
         <div class="col-9">
-          {{ checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.max_rate) || 0 | percent : global.formatNumber2Decimal }}
+          {{
+            checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.max_rate) || 0
+              | percent : global.formatNumber2Decimal
+          }}
         </div>
       </div>
       <div class="row mb-3 body-01">
         <div class="col-12 col-lg-3 mb-2 mb-lg-0 text--gray-4 body">Commission Max Change Rate</div>
         <div class="col-12 col-lg-9">
-          {{ checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.max_change_rate) || 0 | percent : global.formatNumber2Decimal }}
+          {{
+            checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.max_change_rate) || 0
+              | percent : global.formatNumber2Decimal
+          }}
         </div>
       </div>
       <app-messages-item