From 8736f6509800d2f95559def536093e7129e83890 Mon Sep 17 00:00:00 2001 From: Tam <99626599+mtamkg@users.noreply.github.com> Date: Tue, 10 Oct 2023 15:43:28 +0700 Subject: [PATCH 1/2] Merge pull request #2497 from aura-nw/baseline/serenity_20231009 Baseline/serenity 20231009 (cherry picked from commit b00104cb663b4f28ea110aabf0db8d672c77d624) --- .../private-name-tag.component.ts | 8 ++----- .../proposal-table.component.html | 12 +++++++--- .../transaction-messages.component.html | 22 ++++++++++++------- .../transaction-messages.component.scss | 11 +++++++--- .../transaction-messages.component.ts | 8 +++++++ .../validators-detail.component.scss | 2 +- .../soulbound-feature-tokens.component.html | 12 +++++----- .../soulbound-feature-tokens.component.scss | 17 ++++++++++++++ src/assets/scss/aura-theme/cards.scss | 3 +++ 9 files changed, 69 insertions(+), 26 deletions(-) diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.ts b/src/app/pages/profile/private-name-tag/private-name-tag.component.ts index dcd4af506..a7be064c4 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.ts +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.ts @@ -5,6 +5,7 @@ import { MatTableDataSource } from '@angular/material/table'; import { Subject } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; import { PAGE_EVENT } from 'src/app/core/constants/common.constant'; +import { MAX_LENGTH_SEARCH_TOKEN } from 'src/app/core/constants/token.constant'; import { TableTemplate } from 'src/app/core/models/common.model'; import { CommonService } from 'src/app/core/services/common.service'; import { NameTagService } from 'src/app/core/services/name-tag.service'; @@ -14,8 +15,6 @@ import { Globals } from 'src/app/global/global'; import { PaginatorComponent } from 'src/app/shared/components/paginator/paginator.component'; import { PopupCommonComponent } from 'src/app/shared/components/popup-common/popup-common.component'; import { PopupNameTagComponent } from '../popup-name-tag/popup-name-tag.component'; -import { MAX_LENGTH_SEARCH_TOKEN } from 'src/app/core/constants/token.constant'; -import { Router } from '@angular/router'; @Component({ selector: 'app-private-name-tag', @@ -36,7 +35,6 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { ]; displayedColumns: string[] = this.templates.map((dta) => dta.matColumnDef); countFav = 0; - modalReference: any; pageData: PageEvent = { length: PAGE_EVENT.LENGTH, pageSize: 10, @@ -47,7 +45,6 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { destroy$ = new Subject(); dataSource: MatTableDataSource = new MatTableDataSource([]); dataSourceMobile = []; - dataTable = []; maxLengthSearch = MAX_LENGTH_SEARCH_TOKEN; constructor( @@ -56,7 +53,6 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { private dialog: MatDialog, private toastr: NgxToastrService, private global: Globals, - private router: Router, ) {} ngOnInit(): void { @@ -98,7 +94,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { getListPrivateName() { this.textSearch = this.textSearch?.trim(); const payload = { - limit: 100, + limit: 10, keyword: this.textSearch || '', offset: this.pageData.pageIndex * this.pageData.pageSize, }; diff --git a/src/app/pages/proposal/proposal-table/proposal-table.component.html b/src/app/pages/proposal/proposal-table/proposal-table.component.html index 893ff2278..5775da2ce 100644 --- a/src/app/pages/proposal/proposal-table/proposal-table.component.html +++ b/src/app/pages/proposal/proposal-table/proposal-table.component.html @@ -115,8 +115,10 @@ { label: 'Voter', class: !commonService.checkDisplayTooltip(data.voter) - ? 'name-tag-label mb-0 text--primary' - : 'mb-0 text--primary', + ? commonService.checkPrivate(data.voter) + ? 'name-tag private-name-tag mb-0 text--primary' + : 'name-tag text--primary mb-0' + : 'text--primary', info: !data?.voter ? '-' : !commonService.checkDisplayTooltip(data.voter) @@ -203,7 +205,11 @@ [content]="[ { label: 'Depositor', - class: !commonService.checkDisplayTooltip(data.depositors) ? 'name-tag-label mb-0' : 'mb-0', + class: !commonService.checkDisplayTooltip(data.voter) + ? commonService.checkPrivate(data.voter) + ? 'name-tag private-name-tag mb-0 text--primary' + : 'name-tag text--primary mb-0' + : 'text--primary', info: !data?.depositors ? '-' : !commonService.checkDisplayTooltip(data.depositors) 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 5c0acf5ca..e492783d5 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 @@ -433,15 +433,21 @@
From
- - {{ transactionDetail?.messages[0]?.inputs[0]?.address }} - +
+ +
To
- - {{ item?.address }} - +
+ +
diff --git a/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.scss b/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.scss index 2d87de777..5bce6d4b3 100644 --- a/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.scss +++ b/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.scss @@ -80,7 +80,7 @@ } .body-multisend { max-height: 440px; - overflow-y: scroll; + overflow-y: auto; .txt-label { min-width: 75px; } @@ -99,7 +99,12 @@ } @media (max-width: 1366px) { - overflow-y: scroll; + overflow-y: auto; + } + .box-name-tag { + &:after { + border-right: 15px solid var(--aura-gray-10) !important; + } } } @@ -194,4 +199,4 @@ mat-expansion-panel:last-child .mat-expansion-panel-content .content-log { } } } -} +} \ No newline at end of file diff --git a/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.ts b/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.ts index 5278d9100..c4def1a7b 100644 --- a/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.ts +++ b/src/app/pages/transaction/transaction-detail/transaction-messages/transaction-messages.component.ts @@ -7,6 +7,7 @@ import { CommonService } from 'src/app/core/services/common.service'; import { ProposalService } from 'src/app/core/services/proposal.service'; import { TransactionService } from 'src/app/core/services/transaction.service'; import { balanceOf } from 'src/app/core/utils/common/parsing'; +import { isContract } from 'src/app/core/utils/common/validation'; import { DATEFORMAT } from '../../../../core/constants/common.constant'; import { PROPOSAL_VOTE } from '../../../../core/constants/proposal.constant'; import { TYPE_TRANSACTION } from '../../../../core/constants/transaction.constant'; @@ -991,4 +992,11 @@ export class TransactionMessagesComponent implements OnInit { changeShowData(idx) { this.isDisplay[idx] = !this.isDisplay[idx]; } + + isContractAddress(address) { + if (isContract(address)) { + return true; + } + return false; + } } diff --git a/src/app/pages/validators/validators-detail/validators-detail.component.scss b/src/app/pages/validators/validators-detail/validators-detail.component.scss index a61fcd7e7..cf539a7b8 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.scss +++ b/src/app/pages/validators/validators-detail/validators-detail.component.scss @@ -8,7 +8,7 @@ border-radius: 8px; padding: var(--spacer-2); @media (min-width: 991.98px) { - padding: var(--spacer-6); + padding: var(--spacer-5); } } diff --git a/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.html b/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.html index 05c82a7e0..28ac1a409 100644 --- a/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.html +++ b/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.html @@ -22,15 +22,17 @@

ABTs ({{ totalABT || 0 }})

-
+
-
+
ABTs ({{ totalABT || 0 }}) [nftLink]="'/tokens/token-abt/' + token.contract_address + '/' + encodeData(token.token_id)" [nftItem]="token" [nftType]="getTypeFile(token)"> -
+
CW-4973
diff --git a/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.scss b/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.scss index dbc6ec2e1..e24f5c21b 100644 --- a/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.scss +++ b/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.scss @@ -10,6 +10,19 @@ width: 100%; flex-grow: 1; overflow-x: auto; + .sbt-validator { + display: flex; + >div { + min-width: 110px; + margin-right: 15px; + @media (min-width: 912px) { + margin-right: 30px; + } + } + &__label { + display: none; + } + } &::-webkit-scrollbar { height: 0; } @@ -29,6 +42,10 @@ flex-wrap: wrap; flex-basis: 20%; min-width: 180px; + &.sbt-validator { + min-width: auto; + max-width: 110px; + } } &:not(:last-child) { margin-right: var(--spacer-2); diff --git a/src/assets/scss/aura-theme/cards.scss b/src/assets/scss/aura-theme/cards.scss index 60e8dd74d..789068d05 100644 --- a/src/assets/scss/aura-theme/cards.scss +++ b/src/assets/scss/aura-theme/cards.scss @@ -89,6 +89,9 @@ font-size: 1.4rem; } } + &.sbt-validator { + display: none !important; + } } .token-id { overflow: hidden; From cc4fcd4f58ded506c82e2cab8049fc5b59409865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=AA=20Tri=E1=BB=81u=20Thi=C3=AAn?= <40551377+letrieuthien@users.noreply.github.com> Date: Tue, 10 Oct 2023 17:12:07 +0700 Subject: [PATCH 2/2] Merge pull request #2500 from aura-nw/baseline/serenity_20231009 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge pull request #2499 from aura-nw/fixing/develop_update_code_priv… (cherry picked from commit d98a9fbfb0069dc3735b783a9969101262a8c335) --- .../soulbound-account-token-list.component.scss | 2 -- .../soulbound-feature-tokens.component.html | 4 ++-- .../soulbound-feature-tokens.component.scss | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.scss b/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.scss index 33e57872f..d8b98b3fd 100644 --- a/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.scss +++ b/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.scss @@ -25,8 +25,6 @@ @media (min-width: 1199.98px) { flex: 0 1 100%; overflow-x: auto; - //display: flex; - //align-items: center; justify-content: flex-end; border-top: none; border-left: 1px solid var(--aura-gray-9); diff --git a/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.html b/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.html index 28ac1a409..20cb89417 100644 --- a/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.html +++ b/src/app/shared/components/soulbound-feature-tokens/soulbound-feature-tokens.component.html @@ -31,9 +31,9 @@

ABTs ({{ totalABT || 0 }})

? 'AccountDetail row row-cols-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5 g-2 g-md-3 g-lg-4 g-xl-5 w-100 flex-nowrap flex-grow-1 pb-2' : 'sbt-validator' }}"> -
+
-
+
div { min-width: 110px; - margin-right: 15px; + margin-right: 5px; @media (min-width: 912px) { margin-right: 30px; } @@ -54,7 +54,6 @@ } } &:hover { - background: rgba(54, 56, 67, 0.5); border-radius: 8px; .btn-preview { opacity: 1;