diff --git a/angular.json b/angular.json index 6eb7ddbce..be9c39cd5 100644 --- 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 deleted file mode 100644 index d6f1ff472..000000000 --- a/ngsw-config.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "$schema": "./node_modules/@angular/service-worker/config/schema.json", - "index": "/index.html", - "assetGroups": [ - { - "name": "app", - "installMode": "prefetch", - "resources": { - "files": [ - "/favicon.ico", - "/index.html", - "/manifest.webmanifest" - ] - } - }, - { - "name": "assets", - "installMode": "lazy", - "updateMode": "prefetch", - "resources": { - "files": [ - "/assets/**", - "/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)" - ] - } - } - ] -} \ No newline at end of file diff --git a/package.json b/package.json index 1b5a5eb54..4023e59ed 100644 --- 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 index 3b881caa5..f06f86c9b 100644 --- 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 index 422ba5ffa..eaaee7c9d 100644 --- a/src/app/layouts/footer/footer.component.html +++ b/src/app/layouts/footer/footer.component.html @@ -76,7 +76,7 @@
-
Copyright © 2022 Aura Network. All rights reserved
+
Copyright © 2023 Aura Network. All rights reserved
diff --git a/src/app/pages/account/account-detail/account-detail.component.ts b/src/app/pages/account/account-detail/account-detail.component.ts index 531ff6309..293f29f37 100644 --- 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 index 173babfe9..50d92690a 100644 --- 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(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(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 index 74fe1dd12..d86490463 100644 --- 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 @@

Transactions

- {{ data[template.matColumnDef] | mask : 'separator.6' }} + {{ +data[template.matColumnDef] | mask : 'separator.6' }} {{ commonService.mappingNameIBC(data?.denom) }} @@ -227,8 +227,8 @@

Transactions

{ label: 'Amount', info: - data.amount > 0 - ? (data.amount | mask : 'separator.6') + ' ' + denom + '' + +data.amount > 0 + ? (+data.amount | mask : 'separator.6') + ' ' + denom + '' : 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 index 69b765502..7ab7610c6 100644 --- 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 @@

Account Bound Tokens (ABT)

Token
- + {{ element.token_name | stringEllipsis : 30 }} ({{ element.token_symbol }})Non-Fungible Tokens (NFT)
- + {{ element.name | stringEllipsis : 16 }} ({{ element.symbol }}) diff --git a/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.html b/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.html index b9bd1ac8d..28550d51a 100644 --- a/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.html +++ b/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.html @@ -370,33 +370,50 @@

- -
-
Validator
-
{{ transactionDetail?.messages[0]?.description?.moniker }}
-
-
- - - -
- - + [label]="'Details'" + [value]="transactionDetail?.messages[0]?.description?.details || '-'"> + [label]="'Moniker'" + [value]="transactionDetail?.messages[0]?.description?.moniker || '-'"> +
+
Website
+
+ + + {{ transactionDetail?.messages[0]?.description?.website }} + + {{ + transactionDetail?.messages[0]?.description?.website + }} + +
+
+ + +
+
Min Self Delegation
+
+ + {{ transactionDetail?.messages[0]?.min_self_delegation | balanceOf | mask : 'separator.6' }} + {{ denom }} + +
+
@@ -500,19 +517,28 @@

Commission Rate
- {{ checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.rate) || 0 | percent : global.formatNumber2Decimal }} + {{ + checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.rate) || 0 + | percent : global.formatNumber2Decimal + }}
Commission Max Rate
- {{ checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.max_rate) || 0 | percent : global.formatNumber2Decimal }} + {{ + checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.max_rate) || 0 + | percent : global.formatNumber2Decimal + }}
Commission Max Change Rate
- {{ checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.max_change_rate) || 0 | percent : global.formatNumber2Decimal }} + {{ + checkRateFloatNumber(transactionDetail?.messages[0]?.commission?.max_change_rate) || 0 + | percent : global.formatNumber2Decimal + }}
My delegation
- {{ data?.validatorDetail?.amount_staked || 0 | mask: 'separator.6' }} + {{ + !data.validatorDetail?.amount_staked || +data.validatorDetail?.amount_staked < 0.000001 + ? '0' + : (+data.validatorDetail?.amount_staked | mask : 'separator.6') + }} {{ denom }}

Delegable Balance
- {{ availableToken || 0 | mask: 'separator.6' }} + {{ !availableToken || +availableToken < 0.000001 ? '0' : (+availableToken | mask : 'separator.6') }} {{ denom }}
@@ -29,21 +33,32 @@ -
+
-
You can "Delegate" more to this validator
+
+ You can "Delegate" more to this validator +
Or use "Redelagate" to switch your assets to another validator.
-
Or use "Undelegate" to start the unbonding period.
+
+ Or use "Undelegate" to start the unbonding period. +
My delegation
- {{ data?.validatorDetail?.amount_staked || 0 | mask: 'separator.6' }} + {{ + !data.validatorDetail?.amount_staked || +data.validatorDetail?.amount_staked < 0.000001 + ? '0' + : (+data.validatorDetail?.amount_staked | mask : 'separator.6') + }} {{ denom }}
@@ -51,9 +66,9 @@
Pending Reward
{{ - data.validatorDetail?.pending_reward < 0.000001 + !data.validatorDetail?.pending_reward || +data.validatorDetail?.pending_reward < 0.000001 ? '0' - : data.validatorDetail?.pending_reward | mask : 'separator.6' + : (+data.validatorDetail?.pending_reward | mask : 'separator.6') }} {{ denom }}
@@ -61,14 +76,19 @@
Total Reward
- {{ data?.validatorDetail?.reward || 0 | mask: 'separator.6' }} + {{ + !data?.validatorDetail?.reward || +data?.validatorDetail?.reward < 0.000001 + ? '0' + : (+data?.validatorDetail?.reward | mask : 'separator.6') + }} {{ denom }}
Delegable Balance
- {{ availableToken || 0 | mask: 'separator.6' }} {{ denom }} + {{ !availableToken || +availableToken < 0.000001 ? '0' : (+availableToken | mask : 'separator.6') }} + {{ denom }}
@@ -89,9 +109,7 @@
Trying to switch validators?
-
- Use the 'Redelegate' feature to instantly stake your assets to another validator. -
+
Use the 'Redelegate' feature to instantly stake your assets to another validator.
 diff --git a/src/app/pages/validators/validators-detail/delegate-item/delegate-item.component.html b/src/app/pages/validators/validators-detail/delegate-item/delegate-item.component.html index b3d0f9bab..6d2da1749 100644 --- a/src/app/pages/validators/validators-detail/delegate-item/delegate-item.component.html +++ b/src/app/pages/validators/validators-detail/delegate-item/delegate-item.component.html @@ -30,7 +30,7 @@
Voting power - {{ currentValidatorDetail?.percent_power }}%  - ({{ currentValidatorDetail?.power | number: globals.formatNumberToken }} + ({{ currentValidatorDetail?.power | mask : 'separator.6' }} {{ denom }})
diff --git a/src/app/pages/validators/validators-detail/delegate-item/delegate-item.component.ts b/src/app/pages/validators/validators-detail/delegate-item/delegate-item.component.ts index e5bda216f..8b9912069 100644 --- a/src/app/pages/validators/validators-detail/delegate-item/delegate-item.component.ts +++ b/src/app/pages/validators/validators-detail/delegate-item/delegate-item.component.ts @@ -168,7 +168,7 @@ export class DelegateItemComponent implements OnInit { if (!this.isExceedAmount && this.amountFormat > 0) { const executeStaking = async () => { this.isLoading = true; - const { hash, error } = await createSignBroadcast({ + const { hash, error } = await this.walletService.signAndBroadcast({ messageType: SIGNING_MESSAGE_TYPES.STAKE, message: { to: [this.currentValidatorDetail?.operator_address], @@ -210,6 +210,7 @@ export class DelegateItemComponent implements OnInit { } checkStatusExecuteBlock(hash, error, msg) { + this.checkHashAction(hash); if (error) { if (error != 'Request rejected') { this.toastr.error(error); @@ -223,6 +224,17 @@ export class DelegateItemComponent implements OnInit { } } + checkHashAction(hash) { + const myInterval = setInterval(() => { + if (hash) { + this.toastr.loading(hash); + this.isLoading = false; + this.modalReference?.close(); + clearInterval(myInterval); + } + }, 500); + } + resetData() { this.isLoading = false; this.modalReference?.close(); @@ -237,11 +249,11 @@ export class DelegateItemComponent implements OnInit { message = this.mappingErrorService.checkMappingError(message, numberCode); if (numberCode !== undefined) { if (!!!numberCode && numberCode === CodeTransaction.Success) { - this.toastr.success(message); setTimeout(() => { // location.reload(); this.reloadData.emit(); - }, 2000); + }, TIME_OUT_CALL_API); + this.toastr.success(message); } else { this.toastr.error(message); } diff --git a/src/app/pages/validators/validators-detail/validators-detail.component.html b/src/app/pages/validators/validators-detail/validators-detail.component.html index 2946659bf..4065d502b 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.html +++ b/src/app/pages/validators/validators-detail/validators-detail.component.html @@ -139,7 +139,7 @@
Address
Voting Power
- {{ currentValidatorDetail?.power | mask : 'separator.6' }} + {{ +currentValidatorDetail?.power | mask : 'separator.6' }} {{ denom }}
({{ currentValidatorDetail?.percent_power }}%) @@ -157,7 +157,7 @@
Address
Self Bonded
- {{ currentValidatorDetail?.self_bonded | mask : 'separator.6' }} + {{ +currentValidatorDetail?.self_bonded | mask : 'separator.6' }} {{ denom }}
({{ currentValidatorDetail?.percent_self_bonded }}) @@ -480,7 +480,12 @@

Power Events

(data.tx_hash | cutStringPipe : 6 : 6) + '' }, - { label: 'Amount', info: checkAmountStaking(data.amount, data.isStakeMode) }, + { + label: 'Amount', + info: data.isStakeMode + ? '' + '+ ' + (data.amount | mask : 'separator.6') + '' + : '' + '- ' + (data.amount | mask : 'separator.6') + '' + }, { label: 'Time', class: 'card__date text--gray-1 body-01-mob', diff --git a/src/app/pages/validators/validators-detail/validators-detail.component.ts b/src/app/pages/validators/validators-detail/validators-detail.component.ts index 5920d8ed6..f56c94c48 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.ts +++ b/src/app/pages/validators/validators-detail/validators-detail.component.ts @@ -340,21 +340,6 @@ export class ValidatorsDetailComponent implements OnInit, AfterViewChecked { } } - checkAmountStaking(amount, isStakeMode) { - if (isStakeMode) { - return ( - '' + '+ ' + this.numberPipe.transform(amount, this.global.formatNumberToken) + '' - ); - } else { - return ( - '' + - '- ' + - this.numberPipe.transform(amount, this.global.formatNumberToken) + - '' - ); - } - } - getValidatorAvatar(validatorAddress: string): string { return this.validatorService.getValidatorAvatar(validatorAddress); } diff --git a/src/app/pages/validators/validators.component.html b/src/app/pages/validators/validators.component.html index 5ae1689ef..a4c1d2319 100644 --- a/src/app/pages/validators/validators.component.html +++ b/src/app/pages/validators/validators.component.html @@ -273,6 +273,11 @@
{{ validator[template.matColumnDef] | percent : globals.formatNumber2Decimal }}
+ +
+ {{ validator[template.matColumnDef] + '/' + validator['target_count'] }} +
+
{{ calculatorUpTime(validator['cons_address']) }}%