Merge remote-tracking branch 'origin/euphoria' into basline/main_2023…

…0629
aura-nw · Jun 29, 2023 · 1f076de · 1f076de
2 parents 59024e5 + 90c16ee
commit 1f076de
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 57 deletions.
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -35,10 +35,10 @@ const routes: Routes = [
         path: 'tokens',
         loadChildren: () => import('./pages/token/token.module').then((m) => m.TokenModule),
       },
-      // {
-      //   path: 'statistics',
-      //   loadChildren: () => import('./pages/statistics/statistics.module').then((m) => m.StatisticsModule),
-      // },
+      {
+        path: 'statistics',
+        loadChildren: () => import('./pages/statistics/statistics.module').then((m) => m.StatisticsModule),
+      },
       {
         path: 'contracts',
         loadChildren: () => import('./pages/contracts/contracts.module').then((m) => m.ContractsModule),

diff --git a/src/app/core/directives/big-number.directive.ts b/src/app/core/directives/big-number.directive.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Directive, ElementRef, Input } from '@angular/core';
+import { AfterViewInit, Directive, ElementRef, Input, SimpleChanges } from '@angular/core';
 import BigNumber from 'bignumber.js';
 import { MaskPipe } from 'ngx-mask';
 import { Globals } from 'src/app/global/global';
@@ -9,7 +9,7 @@ import { IntlFormat } from '../utils/common/parsing';
 })
 export class BigNumberDirective implements AfterViewInit {
   @Input() decimal: number = 6;
-  @Input() appBigNumber: string;
+  @Input() appBigNumber: any;
   @Input() tokenPrice: any;
   @Input() auraValue: boolean = false;
   @Input() votingPower: boolean = false;
@@ -19,8 +19,13 @@ export class BigNumberDirective implements AfterViewInit {
     this.element = elRef.nativeElement;
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if(changes.appBigNumber.currentValue !== changes.appBigNumber.previousValue){
+      this.convertNumber();
+    }
+  }
+
   ngAfterViewInit(): void {
-    this.convertNumber();
   }
 
   convertNumber() {

diff --git a/src/app/core/services/wallet.service.ts b/src/app/core/services/wallet.service.ts
@@ -380,7 +380,7 @@ export class WalletService implements OnDestroy {
     if (this.isMobileMatched && !this.checkExistedCoin98()) {
       return this.coin98Client.execute(userAddress, contract_address, msg, '', undefined, fee, undefined);
     } else {
-      signer = window.getOfflineSignerOnlyAmino(this.chainId);
+      signer = await window.getOfflineSignerAuto(this.chainId);
     }
 
     return SigningCosmWasmClient.connectWithSigner(this.chainInfo.rpc, signer, fee).then((client) =>

diff --git a/src/app/core/utils/signing/transaction-manager.ts b/src/app/core/utils/signing/transaction-manager.ts
@@ -66,7 +66,7 @@ export async function getNetworkFee(network, address, messageType, memo = ''): P
 
   let gasEstimation = 0;
   try {
-    const signer = window.getOfflineSignerOnlyAmino(network.chainId);
+    const signer = await window.getOfflineSignerAuto(network.chainId);
     const onlineClient = await SigningCosmWasmClient.connectWithSigner(network.rpc, signer);
     gasEstimation = await onlineClient.simulate(address, Array.isArray(messageType) ? messageType : [messageType], '');
   } catch (e) {

diff --git a/src/app/layouts/horizontaltopbar/menu.ts b/src/app/layouts/horizontaltopbar/menu.ts
@@ -26,7 +26,7 @@ export const MENU: MenuItem[] = [
     id: 1,
     label: 'MENUITEMS.DASHBOARDS',
     icon: 'squares-four',
-    link: '/dashboard',
+    link: '/',
     name: MenuName.Dashboard,
   },
   {
@@ -116,29 +116,29 @@ export const MENU: MenuItem[] = [
       },
     ],
   },
-  // {
-  //   id: 6,
-  //   label: 'MENUITEMS.STATISTICS',
-  //   icon: 'chart-line',
-  //   link: '/',
-  //   name: MenuName.Statistic,
-  //   subItems: [
-  //     {
-  //       id: 1,
-  //       label: 'MENUITEMS.CHART-STATS',
-  //       link: '/statistics/charts-stats',
-  //       name: MenuName.ChartStats,
-  //       icon: 'line-segments',
-  //     },
-  //     {
-  //       id: 2,
-  //       label: 'MENUITEMS.TOP-STATISTICS',
-  //       link: '/statistics/top-statistic',
-  //       name: MenuName.TopStatistics,
-  //       icon: 'chart-line-up',
-  //     },
-  //   ],
-  // },
+  {
+    id: 6,
+    label: 'MENUITEMS.STATISTICS',
+    icon: 'chart-line',
+    link: '/',
+    name: MenuName.Statistic,
+    subItems: [
+      {
+        id: 1,
+        label: 'MENUITEMS.CHART-STATS',
+        link: '/statistics/charts-stats',
+        name: MenuName.ChartStats,
+        icon: 'line-segments',
+      },
+      {
+        id: 2,
+        label: 'MENUITEMS.TOP-STATISTICS',
+        link: '/statistics/top-statistic',
+        name: MenuName.TopStatistics,
+        icon: 'chart-line-up',
+      },
+    ],
+  },
   {
     id: 5,
     label: 'MENUITEMS.MORE',
@@ -172,7 +172,7 @@ export const MENU_MOB: MenuItem[] = [
     id: 1,
     label: 'MENUITEMS.DASHBOARDS',
     icon: 'squares-four',
-    link: '/dashboard',
+    link: '/',
     name: MenuName.Dashboard,
   },
   {
@@ -260,20 +260,20 @@ export const MENU_MOB: MenuItem[] = [
         link: '/code-ids/list',
         name: MenuName.CodeList,
       },
-      // {
-      //   id: 3,
-      //   label: 'MENUITEMS.CHART-STATS',
-      //   link: '/statistics/charts-stats',
-      //   name: MenuName.ChartStats,
-      //   icon: 'line-segments',
-      // },
-      // {
-      //   id: 4,
-      //   label: 'MENUITEMS.TOP-STATISTICS',
-      //   link: '/statistics/top-statistic',
-      //   name: MenuName.TopStatistics,
-      //   icon: 'chart-line-up',
-      // },
+      {
+        id: 3,
+        label: 'MENUITEMS.CHART-STATS',
+        link: '/statistics/charts-stats',
+        name: MenuName.ChartStats,
+        icon: 'line-segments',
+      },
+      {
+        id: 4,
+        label: 'MENUITEMS.TOP-STATISTICS',
+        link: '/statistics/top-statistic',
+        name: MenuName.TopStatistics,
+        icon: 'chart-line-up',
+      },
     ],
   },
   {

diff --git a/src/app/layouts/menu-bottom-bar/menu-bottom-bar.component.html b/src/app/layouts/menu-bottom-bar/menu-bottom-bar.component.html
@@ -8,8 +8,7 @@
             class="menu-link text-center d-block"
             (click)="overLayClickEvent()"
             [routerLink]="item.link"
-            routerLinkActive="active"
-            [class.active]="router.url === '/' && item.link === '/dashboard'">
+            [class.active]="router.url === '/' && item.link === '/'">
             <i class="ph-{{ item.icon }} mx-auto h3 mr-2 mb-0"></i>
             <div class="caption fw-500 d-block mt-1">{{ item.label | translate }}</div>
           </a>

diff --git a/src/app/pages/statistics/chart-detail/chart-detail.component.html b/src/app/pages/statistics/chart-detail/chart-detail.component.html
@@ -60,22 +60,16 @@
               <div class="d-flex justify-content-between align-items-center">
                 <div class="body-01 fw-semibold text--gray-1 d-none d-lg-block">{{ theTitle }}</div>
                 <div class="h3-mob mb-0 fw-normal text--gray-1 d-lg-none">{{ theTitle }}</div>
-                <!--                <button class="button chart__options d-lg-none" (click)="exportChart()">-->
-                <!--                  <i class="ph-download-simple"></i>-->
-                <!--                </button>-->
               </div>
               <div class="caption fw-normal d-lg-flex align-items-center">
                 <div class="d-flex">
                   <span class="mr-1 text--gray-2">Source:</span>
-                  <a href="aurascan.com" class="text--blue-3link">Aurascan.com</a>
+                  <a href="/" class="text--blue-3link">aurascan.io</a>
                 </div>
                 <span class="dot mx-2 d-none d-lg-block"></span>
                 <span class="text--gray-3">Click and drag in the plot area to zoom in</span>
               </div>
             </div>
-            <!--            <button class="button chart__options d-none d-lg-block" (click)="exportChart()">-->
-            <!--              <i class="ph-download-simple"></i>-->
-            <!--            </button>-->
           </div>
         </div>
         <div class="divider divider-horizontal"></div>