Skip to content

Commit

Permalink
Merge pull request #1682 from aura-nw/baseline/main_20230319
Browse files Browse the repository at this point in the history
Baseline/main 20230319
  • Loading branch information
nhphuc2411 authored Mar 19, 2023
2 parents 38cf3e9 + bc6640e commit 4ad6d1b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export class HorizontaltopbarComponent implements OnInit, AfterViewInit {

checkEnv() {
this.env = this.environmentService.configValue.env;

this.innerWidth = window.innerWidth;
switch (this.env) {
case 'serenity':
Expand All @@ -147,7 +148,7 @@ export class HorizontaltopbarComponent implements OnInit, AfterViewInit {
this.pageTitle = this.innerWidth > 992 ? 'Euphoria Testnet Network' : 'Euphoria Testnet';
break;
case 'mainnet':
this.pageTitle = '';
this.pageTitle = this.environmentService.configValue.chainId;
break;
default:
this.pageTitle = this.innerWidth > 992 ? 'Develop Testnet Network' : 'Develop Testnet';
Expand Down
21 changes: 11 additions & 10 deletions src/app/pages/dashboard/dashboard.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,6 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
this.getCoinInfo(this.chartRange);
this.currDate = moment(new Date()).format('DDMMYYYY_HHMMSS');
this.getVotingPeriod();
// re-draw chart when connect coin98 app in mobile
this.walletService.wallet$.subscribe((wallet) => {
if (this.originalData.length === 0) {
this.originalData = this.cacheData;
this.chart.remove();
this.chart = createChart(document.getElementById('chart'), DASHBOARD_CHART_OPTIONS);
this.areaSeries = this.chart.addAreaSeries(DASHBOARD_AREA_SERIES_CHART_OPTIONS);
this.subscribeVisibleLogicalRangeChange();
}
});
}

// config chart
Expand Down Expand Up @@ -456,5 +446,16 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
this.staking_APR = ((inflation * (1 - communityTax)) / (bonded_tokens / supply));
}
}, 500);

// re-draw chart when connect coin98 app in mobile
this.walletService.wallet$.subscribe((wallet) => {
if (this.originalData.length === 0) {
this.originalData = this.cacheData;
this.chart.remove();
this.chart = createChart(document.getElementById('chart'), DASHBOARD_CHART_OPTIONS);
this.areaSeries = this.chart.addAreaSeries(DASHBOARD_AREA_SERIES_CHART_OPTIONS);
this.subscribeVisibleLogicalRangeChange();
}
});
}
}
16 changes: 8 additions & 8 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
<link rel="icon" type="image/png" href="./assets/images/logo/auraTitleLogo.png">
<link rel="shortcut icon" href="./assets/images/logo/auraTitleLogo.png" />

<meta name="description" content="Aura Blockchain Explorer" />
<meta name="keywords" content="Aura Blockchain Explorer">
<meta name="description" content="AuraScan - Aura Network Blockchain Explorer" />
<meta name="keywords" content="AuraScan, AURA, blockchain, crypto, currency, explorer, search">

<!-- Google / Search Engine Tags -->
<meta itemprop="name" content="Aura Blockchain Explorer">
<meta itemprop="description" content="Aura Blockchain Explorer">
<meta itemprop="name" content="AuraScan - Aura Network Blockchain Explorer">
<meta itemprop="description" content="Explore and search for anything happening on Aura Network with AuraScan - transactions, addresses, tokens, prices, and other activities.">
<meta itemprop="image" content="http://aurascan.io/assets/images/logo.png">

<!-- Facebook Meta Tags -->
<meta property="og:url" content="https://aurascan.io">
<meta property="og:type" content="website">
<meta property="og:title" content="Aura Blockchain Explorer">
<meta property="og:description" content="Aura Blockchain Explorer">
<meta property="og:title" content="AuraScan - Aura Network Blockchain Explorer">
<meta property="og:description" content="Explore and search for anything happening on Aura Network with AuraScan - transactions, addresses, tokens, prices, and other activities.">
<meta property="og:image" content="http://aurascan.io/assets/images/logo.png">

<!-- Twitter Meta Tags -->
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="Aura Blockchain Explorer">
<meta name="twitter:description" content="Aura Blockchain Explorer">
<meta name="twitter:title" content="AuraScan - Aura Network Blockchain Explorer">
<meta name="twitter:description" content="Explore and search for anything happening on Aura Network with AuraScan - transactions, addresses, tokens, prices, and other activities.">
<meta name="twitter:image" content="http://aurascan.io/assets/images/logo.png">

<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
Expand Down

0 comments on commit 4ad6d1b

Please sign in to comment.