From 8d0a608f3fc4f6618dd8475003dca2ac0b428b10 Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 16 Aug 2023 09:38:48 +0700 Subject: [PATCH 001/184] [TamTM6] private name tag part 1 --- .../popup-name-tag.component.html | 136 +++++++++++++ .../popup-name-tag.component.scss | 64 ++++++ .../popup-name-tag.component.ts | 55 +++++ .../private-name-tag.component.html | 190 ++++++++++++++++++ .../private-name-tag.component.scss | 18 ++ .../private-name-tag.component.ts | 90 +++++++++ src/app/pages/profile/profile.component.html | 23 ++- src/app/pages/profile/profile.component.ts | 10 +- src/app/pages/profile/profile.module.ts | 10 +- 9 files changed, 584 insertions(+), 12 deletions(-) create mode 100644 src/app/pages/profile/popup-name-tag/popup-name-tag.component.html create mode 100644 src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss create mode 100644 src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts create mode 100644 src/app/pages/profile/private-name-tag/private-name-tag.component.html create mode 100644 src/app/pages/profile/private-name-tag/private-name-tag.component.scss create mode 100644 src/app/pages/profile/private-name-tag/private-name-tag.component.ts diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html new file mode 100644 index 000000000..8faba6e17 --- /dev/null +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -0,0 +1,136 @@ +
+
+
+
Create Private Name Tag
+ +
+
+
+
+
+ Set favorite in tag list + +
+
+ +
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ +
+
BingX
+
+ + +
+
+ +
+
+
+ +
+
+
+ + +
+
+ +
+
+
+ +
+
+
+
+ Character limit: 0/35
+ Set private name tag to easily identify this address in Aurascan only from your view +
+ + +
+
+ +
+
+ + +
+
+
+ Character limit: 0/200
+ A personal note of this address. Kindly note that DO NOT input any passwords or private key here +
+ +
+
+ + +
+ + +
+
+
+
diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss new file mode 100644 index 000000000..8be3dc39e --- /dev/null +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss @@ -0,0 +1,64 @@ +.card.card-private-name { + @media (min-width: 992px) { + width: 800px; + } + .card-header { + background-color: var(--aura-gray-9); + } + .card-body { + max-height: 85vh; + overflow-y: auto; + .box-content { + height: 530px; + overflow-y: auto; + padding: var(--spacer-6); + padding-right: 28px; + border-bottom: 1px solid var(--aura-gray-9); + } + } + .private-name-form { + .form-label { + font-size: 12px; + color: var(--aura-gray-3); + } + .input-group, + .text-area { + background-color: var(--aura-gray-10) !important; + } + .btn { + height: 40px; + padding: 0 24px; + } + .btn-create { + border: none; + &:disabled { + background: var(--aura-gray-8); + } + } + } + ::ng-deep { + .mat-slide-toggle-thumb { + width: 14px !important; + height: 14px !important; + } + .mat-slide-toggle.mat-checked .mat-slide-toggle-bar { + background-color: #2bbba3; + } + .mat-slide-toggle.mat-checked .mat-slide-toggle-thumb { + background-color: var(--aura-white); + } + .mat-slide-toggle-bar { + height: 20px !important; + border-radius: 12px !important; + } + .mat-slide-toggle-thumb-container { + width: 14px !important; + height: 14px !important; + top: 3px !important; + transform: translate3d(4px, 0, 0) !important; + } + .mat-slide-toggle.mat-checked .mat-slide-toggle-thumb-container { + transform: translate3d(18px, 0, 0) !important; + } + } +} diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts new file mode 100644 index 000000000..5f18a154f --- /dev/null +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -0,0 +1,55 @@ +import { Component, Inject, OnInit } from '@angular/core'; +import { FormBuilder, Validators } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { TranslateService } from '@ngx-translate/core'; +import { EnvironmentService } from 'src/app/core/data-services/environment.service'; + +@Component({ + selector: 'app-popup-name-tag', + templateUrl: './popup-name-tag.component.html', + styleUrls: ['./popup-name-tag.component.scss'], +}) +export class PopupNameTagComponent implements OnInit { + privateNameForm; + isSubmit = false; + errorSpendLimit = ''; + formValid = true; + isAccount = true; + + constructor( + @Inject(MAT_DIALOG_DATA) public data: { data: any }, + public dialogRef: MatDialogRef, + private fb: FormBuilder, + public environmentService: EnvironmentService, + public translate: TranslateService, + ) {} + + ngOnInit(): void { + this.formInit(); + } + + formInit() { + this.privateNameForm = this.fb.group({ + favorite: [''], + type: ['', [Validators.required]], + address: ['', [Validators.required]], + name: ['', [Validators.required, Validators.maxLength(200)]], + note: ['', [Validators.maxLength(200)]], + }); + } + + closeDialog(hash = null) { + this.dialogRef.close(hash); + } + + checkFormValid() {} + + async onSubmit() { + this.isSubmit = true; + console.log(this.privateNameForm.value); + } + + changeFavorite() { + this.privateNameForm.value.favorite = !this.privateNameForm.value.favorite; + } +} diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html new file mode 100644 index 000000000..986dcd3c1 --- /dev/null +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -0,0 +1,190 @@ +
+
Private name tag
+ +
+ +
+
+
Total 0/10 addresses tagged
+
+
+
+ + + +
+
+
+
+ +
+
+ + + + + + + + + + + + +
+
+ 		+ + + {{ template.matColumnDef | cutStringPipe : 8 : 8 }} + +
desc
+ + + + + + {{ commonService.getDateValue(data['date_format'], false)[0] }} + + + + + + + + + {{ data[template.matColumnDef] }} + + + +
+ {{ 'NO DATA' | translate }} +
+
+ +
+ +
+
+
+ + + + + +
+ + + +
diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss new file mode 100644 index 000000000..23fd2e449 --- /dev/null +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss @@ -0,0 +1,18 @@ +.txt-title { + font-size: 2.2rem; + font-weight: 700; + line-height: 2.8rem; + color: var(--aura-gray-4); + @media (min-width: 992px) { + line-height: 4rem; + font-size: 3.2rem; + } +} + +.search-form.private-search-form { + width: 100%; + + @media (min-width: 992px) { + width: 410px; + } +} 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 new file mode 100644 index 000000000..533552850 --- /dev/null +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.ts @@ -0,0 +1,90 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; +import { PageEvent } from '@angular/material/paginator'; +import { MatTableDataSource } from '@angular/material/table'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Subject } from 'rxjs'; +import { debounceTime, takeUntil } from 'rxjs/operators'; +import { PAGE_EVENT } from 'src/app/core/constants/common.constant'; +import { TableTemplate } from 'src/app/core/models/common.model'; +import { CommonService } from 'src/app/core/services/common.service'; +import { PaginatorComponent } from 'src/app/shared/components/paginator/paginator.component'; +import { PopupNameTagComponent } from '../popup-name-tag/popup-name-tag.component'; +import { ToastrService } from 'ngx-toastr'; +import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; + +@Component({ + selector: 'app-private-name-tag', + templateUrl: './private-name-tag.component.html', + styleUrls: ['./private-name-tag.component.scss'], +}) +export class PrivateNameTagComponent implements OnInit { + @ViewChild(PaginatorComponent) pageChange: PaginatorComponent; + + modalReference: any; + pageData: PageEvent = { + length: PAGE_EVENT.LENGTH, + pageSize: 10, + pageIndex: PAGE_EVENT.PAGE_INDEX, + }; + + templates: Array = [ + { matColumnDef: 'favorite', headerCellDef: 'Fav.', headerWidth: 8 }, + { matColumnDef: 'address', headerCellDef: 'Address', headerWidth: 12 }, + { matColumnDef: 'type', headerCellDef: 'Type', headerWidth: 6 }, + { matColumnDef: 'name', headerCellDef: 'Private Name Tag', headerWidth: 12 }, + { matColumnDef: 'add_time', headerCellDef: 'Added Time', headerWidth: 10 }, + { matColumnDef: 'update_time', headerCellDef: 'Updated Time', headerWidth: 10 }, + { matColumnDef: 'action', headerCellDef: '', headerWidth: 8 }, + ]; + displayedColumns: string[] = this.templates.map((dta) => dta.matColumnDef); + + textSearch = ''; + searchSubject = new Subject(); + destroy$ = new Subject(); + dataSource = new MatTableDataSource(); + + constructor( + public commonService: CommonService, + private modalService: NgbModal, + private dialog: MatDialog, + private toastr: NgxToastrService, + ) { + this.searchSubject + .asObservable() + .pipe(debounceTime(500), takeUntil(this.destroy$)) + .subscribe(() => { + this.pageChange.selectPage(0); + }); + } + + ngOnInit(): void {} + + onKeyUp() { + this.searchSubject.next(this.textSearch); + } + + resetFilterSearch() { + this.textSearch = ''; + this.onKeyUp(); + } + + pageEvent(pageIndex: number): void { + this.getListPrivateName(); + } + + getListPrivateName() {} + + openPopup() { + const dialogConfig = new MatDialogConfig(); + dialogConfig.panelClass = 'grant-overlay-panel'; + dialogConfig.disableClose = true; + let dialogRef = this.dialog.open(PopupNameTagComponent, dialogConfig); + + dialogRef.afterClosed().subscribe((result) => { + if (result) { + this.toastr.loading(result); + } + }); + } +} diff --git a/src/app/pages/profile/profile.component.html b/src/app/pages/profile/profile.component.html index 494b077d2..bff7f1891 100644 --- a/src/app/pages/profile/profile.component.html +++ b/src/app/pages/profile/profile.component.html @@ -7,17 +7,29 @@
Profile
Profile settings - + Private name tag + +
@@ -39,6 +51,7 @@
+ diff --git a/src/app/pages/profile/profile.component.ts b/src/app/pages/profile/profile.component.ts index eb7d2b2af..7f6b909e5 100644 --- a/src/app/pages/profile/profile.component.ts +++ b/src/app/pages/profile/profile.component.ts @@ -9,17 +9,17 @@ import { ProfileTab } from 'src/app/core/constants/profile.enum'; }) export class ProfileComponent implements OnInit { profileTab = ProfileTab; - currentTab = ProfileTab.Setting; + currentTab = ProfileTab.PrivateNameTag; activeTabID = 0; PROFILE_TAB = [ { key: ProfileTab.Setting, value: 'Profile settings' }, - // { - // key: ProfileTab.PrivateNameTag, - // value: 'Private name tag' - // }, + { + key: ProfileTab.PrivateNameTag, + value: 'Private name tag' + }, // { // key: ProfileTab.WatchList, // value: 'Watchlist' diff --git a/src/app/pages/profile/profile.module.ts b/src/app/pages/profile/profile.module.ts index f0e93c1b5..c6e7a841a 100644 --- a/src/app/pages/profile/profile.module.ts +++ b/src/app/pages/profile/profile.module.ts @@ -14,9 +14,13 @@ import { ProfileComponent } from './profile.component'; import { MatIconModule } from '@angular/material/icon'; import { UserService } from 'src/app/core/services/user.service'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; +import { PrivateNameTagComponent } from './private-name-tag/private-name-tag.component'; +import { TableNoDataModule } from 'src/app/shared/components/table-no-data/table-no-data.module'; +import { APaginatorModule } from 'src/app/shared/components/a-paginator/a-paginator.module'; +import { PopupNameTagComponent } from './popup-name-tag/popup-name-tag.component'; @NgModule({ - declarations: [ProfileComponent, ProfileSettingsComponent], + declarations: [ProfileComponent, ProfileSettingsComponent, PrivateNameTagComponent, PopupNameTagComponent], imports: [ CommonModule, FormsModule, @@ -30,7 +34,9 @@ import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; ReactiveFormsModule, NameTagModule, MatIconModule, - NgbNavModule + NgbNavModule, + TableNoDataModule, + APaginatorModule, ], providers: [FormBuilder, UserService], }) From f1db465d96b1216b35fac4997299d1f2a6c6856f Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 16 Aug 2023 16:30:10 +0700 Subject: [PATCH 002/184] [TamTM6] update private name tag part 2 --- .../popup-name-tag.component.html | 86 +++++++++++-------- .../popup-name-tag.component.scss | 13 ++- .../popup-name-tag.component.ts | 57 +++++++++++- .../validators/validators.component.html | 3 +- src/assets/scss/aura-theme/form.scss | 2 +- 5 files changed, 115 insertions(+), 46 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 8faba6e17..5ada932be 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -19,8 +19,8 @@
Set favorite in tag list -
-
+
+
@@ -29,106 +29,118 @@ - + (change)="changeType(true)" /> +
- + (change)="changeType(false)" /> +
-
-
+
+
-
BingX
+
{{ publicNameTag }}
-
-
+
+
-
+
+
+ Invalid aura address format +
-
-
+
+
-
+
+ type="text" + class="col-12 mb-4 text--gray-1" + [maxlength]="maxLengthNameTag" + formControlName="name" + (keypress)="checkValidNameTag($event)" + placeholder="Enter private name tag" />
-
- Character limit: 0/35
- Set private name tag to easily identify this address in Aurascan only from your view +
+
+ Character limit: {{ privateNameForm.value.name?.length }}/{{ maxLengthNameTag }}
+ Set private name tag to easily identify this address in Aurascan only from your view +
-
-
+
+
-
+
-
-
- Character limit: 0/200
- A personal note of this address. Kindly note that DO NOT input any passwords or private key here +
+
+ Character limit: {{ privateNameForm.value.note?.length }}/{{ maxLengthNote }}
+ A personal note of this address. Kindly note that DO NOT input any passwords or private key here +
-
+
All fields are required except Personal Note
-
diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss index 8be3dc39e..a62404c92 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss @@ -1,4 +1,5 @@ .card.card-private-name { + padding: var(--spacer-4); @media (min-width: 992px) { width: 800px; } @@ -9,7 +10,7 @@ max-height: 85vh; overflow-y: auto; .box-content { - height: 530px; + min-height: 536px; overflow-y: auto; padding: var(--spacer-6); padding-right: 28px; @@ -21,9 +22,17 @@ font-size: 12px; color: var(--aura-gray-3); } - .input-group, + .input-group { + background-color: var(--aura-gray-10) !important; + height: 40px; + input { + max-width: 95%; + } + } .text-area { background-color: var(--aura-gray-10) !important; + padding: var(--spacer-4); + border-radius: var(--spacer-2); } .btn { height: 40px; diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 5f18a154f..4e21aeb1a 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -2,7 +2,9 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; +import { LENGTH_CHARACTER } from 'src/app/core/constants/common.constant'; import { EnvironmentService } from 'src/app/core/data-services/environment.service'; +import { CommonService } from 'src/app/core/services/common.service'; @Component({ selector: 'app-popup-name-tag', @@ -15,6 +17,11 @@ export class PopupNameTagComponent implements OnInit { errorSpendLimit = ''; formValid = true; isAccount = true; + maxLengthNameTag = 35; + maxLengthNote = 200; + currentCodeID; + publicNameTag = '-'; + isValidAddress = false; constructor( @Inject(MAT_DIALOG_DATA) public data: { data: any }, @@ -22,18 +29,23 @@ export class PopupNameTagComponent implements OnInit { private fb: FormBuilder, public environmentService: EnvironmentService, public translate: TranslateService, + private commonService: CommonService, ) {} ngOnInit(): void { this.formInit(); } + get getAddress() { + return this.privateNameForm.get('address'); + } + formInit() { this.privateNameForm = this.fb.group({ favorite: [''], - type: ['', [Validators.required]], + isAccount: [true, [Validators.required]], address: ['', [Validators.required]], - name: ['', [Validators.required, Validators.maxLength(200)]], + name: ['', [Validators.required, Validators.maxLength(this.maxLengthNameTag)]], note: ['', [Validators.maxLength(200)]], }); } @@ -42,14 +54,51 @@ export class PopupNameTagComponent implements OnInit { this.dialogRef.close(hash); } - checkFormValid() {} + checkFormValid() { + this.isValidAddress = false; + if (this.getAddress.value?.length > 0 && this.getAddress?.value?.trim().startsWith('aura')) { + if ( + (this.getAddress.value?.length === LENGTH_CHARACTER.ADDRESS && this.isAccount) || + (this.getAddress.value?.length === LENGTH_CHARACTER.CONTRACT && !this.isAccount) + ) { + this.isValidAddress = true; + } + } + } async onSubmit() { this.isSubmit = true; - console.log(this.privateNameForm.value); + console.log(this.privateNameForm); } changeFavorite() { this.privateNameForm.value.favorite = !this.privateNameForm.value.favorite; } + + changeType(type) { + this.isAccount = type; + this.privateNameForm.value.isAccount = type; + this.checkFormValid(); + } + + checkValidNameTag(event) { + const regex = new RegExp('^[A-Za-z0-9._ -]+$'); + let key = String.fromCharCode(!event.charCode ? event.which : event.charCode); + if (!regex.test(key)) { + event.preventDefault(); + return; + } + this.privateNameForm.value.name = event.target.value; + } + + checkPublicNameTag() { + this.publicNameTag = '-'; + this.getAddress.value = this.getAddress.value.trim(); + if (this.getAddress.status === 'VALID') { + const temp = this.commonService.setNameTag(this.getAddress.value); + if (temp !== this.getAddress.value) { + this.publicNameTag = temp; + } + } + } } diff --git a/src/app/pages/validators/validators.component.html b/src/app/pages/validators/validators.component.html index 7fbd39b6a..acde5ee05 100644 --- a/src/app/pages/validators/validators.component.html +++ b/src/app/pages/validators/validators.component.html @@ -186,8 +186,7 @@

Validators

[votingPower]="true" [appBigNumber]="data[template.matColumnDef]" [decimal]="0"> - +
Date: Mon, 21 Aug 2023 16:42:06 +0700 Subject: [PATCH 003/184] [TamTM6] service name tag --- src/app/core/services/name-tag.service.ts | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/app/core/services/name-tag.service.ts diff --git a/src/app/core/services/name-tag.service.ts b/src/app/core/services/name-tag.service.ts new file mode 100644 index 000000000..8076d6577 --- /dev/null +++ b/src/app/core/services/name-tag.service.ts @@ -0,0 +1,29 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import * as _ from 'lodash'; +import { EnvironmentService } from '../data-services/environment.service'; +import { CommonService } from './common.service'; + +@Injectable() +export class NameTagService extends CommonService { + chainInfo = this.environmentService.configValue.chain_info; + + constructor(private http: HttpClient, private environmentService: EnvironmentService) { + super(http, environmentService); + } + + getListPrivateNameTag(payload) { + const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); + return this.http.get(`${this.apiUrl}/admin/private-name-tag`, { + params, + }); + } + + createPrivateName(payload) { + const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); + return this.http.post(`${this.apiUrl}/admin/private-name-tag`, { + params, + }); + } +} + From a0a67a1288b8772d053007975bc303f0b4ce34c4 Mon Sep 17 00:00:00 2001 From: mtam Date: Tue, 22 Aug 2023 08:49:59 +0700 Subject: [PATCH 004/184] [TamTM6] private name tag --- .../popup-name-tag.component.html | 2 +- .../popup-name-tag.component.scss | 2 +- .../popup-name-tag.component.ts | 41 ++++++++++++++++++- src/app/pages/profile/profile.module.ts | 3 +- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 5ada932be..80658572b 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -133,7 +133,7 @@
-
@@ -25,16 +22,13 @@ class="text--primary text-break d-flex" [ngClass]="[ isBox && !commonService.checkDisplayTooltip(paramUrl || value) ? 'box-name-tag' : '', - widthAuto ? 'w-auto' : '' + widthAuto ? 'w-auto' : '', + commonService.checkPrivate(paramUrl || value) ? 'private-name-tag' : '' ]" [class.aura-tooltip-object]="!commonService.checkDisplayTooltip(paramUrl || value)"> - +
@@ -45,7 +39,8 @@ class="text-break" [ngClass]="[ isBox && !commonService.checkDisplayTooltip(paramUrl || value) ? 'box-name-tag' : '', - widthAuto ? 'w-auto' : '' + widthAuto ? 'w-auto' : '', + commonService.checkPrivate(paramUrl || value) ? 'private-name-tag' : '' ]" [class.aura-tooltip-object]="!commonService.checkDisplayTooltip(paramUrl || value)"> @@ -65,11 +60,7 @@ - +
diff --git a/src/app/shared/components/name-tag/name-tag.component.ts b/src/app/shared/components/name-tag/name-tag.component.ts index bac362ac5..1978d1682 100644 --- a/src/app/shared/components/name-tag/name-tag.component.ts +++ b/src/app/shared/components/name-tag/name-tag.component.ts @@ -50,4 +50,9 @@ export class NameTagComponent implements OnInit { url = url.match(/^https?:/) ? url : '//' + url; return url; } + + displayContent(value) { + let result = value + '
' + 'Public name: ' + this.commonService.setNameTag(value, this.global.listNameTag); + return result; + } } From 6c90ec155e4123e030c092661bdb78da6b61abdf Mon Sep 17 00:00:00 2001 From: mtam Date: Tue, 22 Aug 2023 11:21:07 +0700 Subject: [PATCH 006/184] [TamTM6] private name tag api --- src/app/app.module.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 2e6cfa748..b784da5a8 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -58,6 +58,7 @@ import { Globals } from './global/global'; import { LayoutsModule } from './layouts/layouts.module'; import { SchemaViewerModule } from './pages/schema-viewer/schema-viewer.module'; import { MediaExpandModule } from './shared/components/media-expand/media-expand.module'; +import { NameTagService } from './core/services/name-tag.service'; export function createTranslateLoader(http: HttpClient): any { return new TranslateHttpLoader(http, 'assets/i18n/', '.json'); @@ -174,6 +175,7 @@ export class MaterialModule {} FeeGrantService, SoulboundService, MappingErrorService, + NameTagService, { provide: DateAdapter, useClass: MomentDateAdapter, From e3d3553fd5f36f256f3bd4c5b4e32dd638b78fb4 Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 23 Aug 2023 09:42:41 +0700 Subject: [PATCH 007/184] [TamTM6] private name tag api --- src/app/app.component.ts | 12 ++++++- src/app/core/pipes/common-pipe.module.ts | 10 ++++-- src/app/core/pipes/common.pipe.ts | 25 +++++++++++++ src/app/core/services/common.service.ts | 18 ++++++++-- src/app/core/services/name-tag.service.ts | 4 +-- .../account-detail.component.html | 36 ++++++++++++++----- .../account-detail.component.scss | 10 ++++++ .../account-detail.component.ts | 26 ++++++-------- .../contract-info-card.component.html | 22 +++++++++--- src/app/pages/login/login.component.ts | 8 +++++ .../popup-name-tag.component.ts | 10 ++++-- src/app/pages/profile/profile.component.ts | 13 ++++--- src/app/pages/profile/profile.module.ts | 16 ++++----- ...oulbound-account-token-list.component.html | 8 +++-- .../top-statistic-overview.component.html | 17 ++++++--- .../top-statistic-overview.component.scss | 5 ++- .../top-statistic-transaction.component.scss | 5 ++- .../validators-detail.component.html | 19 +++++++--- .../validators-detail.component.scss | 35 ++++++++++++++++++ .../validators-detail.component.ts | 11 ++++++ .../authenticate-mail.component.ts | 4 +++ .../components/name-tag/name-tag.component.ts | 11 ++++-- 22 files changed, 254 insertions(+), 71 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b6022dcc3..376a462a4 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -77,6 +77,16 @@ export class AppComponent implements OnInit { keyword: null, }; + // get list name tag if not login email + const userEmail = localStorage.getItem('userEmail'); + if (!userEmail) { + this.commonService.getListNameTag(payload).subscribe((res) => { + this.globals.listNameTag = this.commonService.listNameTag = res.data?.nameTags; + }); + return; + } + + // get list name tag if login email forkJoin({ publicName: this.commonService.getListNameTag(payload), privateName: this.nameTagService.getListPrivateNameTag(payloadPrivate), @@ -102,10 +112,10 @@ export class AppComponent implements OnInit { const onlyInB = onlyInLeft(privateName?.data, listTemp, isSameUser); onlyInB.forEach((element) => { element['name_tag_private'] = element.name_tag; + element['name_tag'] = null; element['isPrivate'] = true; }); const result = [...listTemp, ...onlyInB]; - this.globals.listNameTag = this.commonService.listNameTag = result; }); } diff --git a/src/app/core/pipes/common-pipe.module.ts b/src/app/core/pipes/common-pipe.module.ts index 617dde07b..0f8d91b3d 100644 --- a/src/app/core/pipes/common-pipe.module.ts +++ b/src/app/core/pipes/common-pipe.module.ts @@ -12,6 +12,8 @@ import { convertLogAmount, decodeData, displayTypeToolTip, + displayNameTag, + checkIsPrivate, } from './common.pipe'; import { JsonPipe } from './json.pipe'; @@ -28,7 +30,9 @@ import { JsonPipe } from './json.pipe'; ConvertUauraToAura, convertLogAmount, decodeData, - displayTypeToolTip + displayTypeToolTip, + displayNameTag, + checkIsPrivate ], imports: [CommonModule], exports: [ @@ -43,7 +47,9 @@ import { JsonPipe } from './json.pipe'; ConvertUauraToAura, convertLogAmount, decodeData, - displayTypeToolTip + displayTypeToolTip, + displayNameTag, + checkIsPrivate ], }) export class CommonPipeModule {} diff --git a/src/app/core/pipes/common.pipe.ts b/src/app/core/pipes/common.pipe.ts index 2378a461a..fe952dc43 100644 --- a/src/app/core/pipes/common.pipe.ts +++ b/src/app/core/pipes/common.pipe.ts @@ -5,6 +5,7 @@ import { EnvironmentService } from '../data-services/environment.service'; import { CommonService } from '../services/common.service'; import { balanceOf } from '../utils/common/parsing'; import { MaskPipe } from 'ngx-mask'; +import { Globals } from 'src/app/global/global'; @Pipe({ name: 'calDate' }) export class pipeCalDate implements PipeTransform { @@ -141,3 +142,27 @@ export class displayTypeToolTip implements PipeTransform { return result; } } + +@Pipe({ name: 'displayNameTag' }) +export class displayNameTag implements PipeTransform { + constructor(private global: Globals) {} + transform(address: any): string { + const nameTag = this.global.listNameTag?.find((k) => k.address === address); + let result = nameTag?.name_tag_private || nameTag?.name_tag || address; + return result; + } +} + +@Pipe({ name: 'checkIsPrivate' }) +export class checkIsPrivate implements PipeTransform { + constructor(private global: Globals) {} + transform(address: any): boolean { + let result = false; + const nameTag = this.global.listNameTag?.find((k) => k.address === address && k.isPrivate); + if (nameTag?.name_tag_private) { + result = true; + } + return result; + } +} + diff --git a/src/app/core/services/common.service.ts b/src/app/core/services/common.service.ts index e3cefdc40..de80ea1a9 100644 --- a/src/app/core/services/common.service.ts +++ b/src/app/core/services/common.service.ts @@ -117,10 +117,14 @@ export class CommonService { }); } - setNameTag(address, listNameTag = []) { + setNameTag(address, listNameTag = [], getPrivate = true) { this.listNameTag = this.listNameTag?.length > 0 ? this.listNameTag : listNameTag; const nameTag = this.listNameTag?.find((k) => k.address === address); - return nameTag?.name_tag_private || nameTag?.name_tag || address; + let result = nameTag?.name_tag || address; + if (getPrivate) { + result = nameTag?.name_tag_private || result; + } + return result; } findNameTag(keySearch, listNameTag = []) { @@ -160,6 +164,16 @@ export class CommonService { return result; } + checkPublic(address, listNameTag = []): boolean { + this.listNameTag = this.listNameTag?.length > 0 ? this.listNameTag : listNameTag; + let result = false; + const nameTag = this.listNameTag?.find((k) => k.address === address && k.name_tag?.length > 0); + if (!nameTag || nameTag?.name_tag === address) { + result = true; + } + return result; + } + checkPrivate(address): boolean { let result = false; const nameTag = this.listNameTag?.find((k) => k.address === address && k.isPrivate); diff --git a/src/app/core/services/name-tag.service.ts b/src/app/core/services/name-tag.service.ts index 8076d6577..8b7665aea 100644 --- a/src/app/core/services/name-tag.service.ts +++ b/src/app/core/services/name-tag.service.ts @@ -14,14 +14,14 @@ export class NameTagService extends CommonService { getListPrivateNameTag(payload) { const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); - return this.http.get(`${this.apiUrl}/admin/private-name-tag`, { + return this.http.get(`${this.apiUrl}/user/private-name-tag`, { params, }); } createPrivateName(payload) { const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); - return this.http.post(`${this.apiUrl}/admin/private-name-tag`, { + return this.http.post(`${this.apiUrl}/user/private-name-tag`, { params, }); } diff --git a/src/app/pages/account/account-detail/account-detail.component.html b/src/app/pages/account/account-detail/account-detail.component.html index 34218690c..7c2c184d9 100644 --- a/src/app/pages/account/account-detail/account-detail.component.html +++ b/src/app/pages/account/account-detail/account-detail.component.html @@ -31,13 +31,13 @@

Address

*ngIf="commonService.setNameTag(currentAddress) !== currentAddress" class="name-tag cursor-pointer mt-2 aura-tooltip-contain d-inline-flex">
- {{ commonService.setNameTag(currentAddress) || '-' }} + {{ commonService.setNameTag(currentAddress, null, false) || '-' }} - {{ (commonService.setNameTag(currentAddress) | cutStringPipe : 16) || '-' }} + {{ (commonService.setNameTag(currentAddress, null, false) | cutStringPipe : 16) || '-' }} - {{ (commonService.setNameTag(currentAddress) | cutStringPipe : 8 : 8) || '-' }} + {{ (commonService.setNameTag(currentAddress, null, false) | cutStringPipe : 8 : 8) || '-' }} Address
- + + +
+
+ {{ commonService.setNameTag(currentAddress) || '-' }} + + + {{ (commonService.setNameTag(currentAddress) | cutStringPipe : 16) || '-' }} + + + {{ (commonService.setNameTag(currentAddress) | cutStringPipe : 8 : 8) || '-' }} + + +
+ +
+

Total Value

@@ -151,4 +171,4 @@

Total Value

- \ No newline at end of file + diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index 5421fa1df..7f2dea976 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -118,6 +118,16 @@ section.account-detail { } } +.box-private { + .private-name-tag { + height: 24px; + padding: 0 var(--spacer-2); + background-color: unset; + border-radius: 16px; + border: 1px solid var(--aura-gray-8); + } +} + .btn-private { width: fit-content; } 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 f1296e535..2737ddc09 100644 --- a/src/app/pages/account/account-detail/account-detail.component.ts +++ b/src/app/pages/account/account-detail/account-detail.component.ts @@ -1,10 +1,8 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; -import { AfterViewInit, Component, HostListener, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { Component, HostListener, OnInit, ViewChild } from '@angular/core'; import { MatSelect } from '@angular/material/select'; import { MatSort } from '@angular/material/sort'; -import { MatTableDataSource } from '@angular/material/table'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ChartComponent } from 'ng-apexcharts'; import { Subject, Subscription } from 'rxjs'; @@ -14,19 +12,11 @@ import { SoulboundService } from 'src/app/core/services/soulbound.service'; import { EnvironmentService } from '../../../../app/core/data-services/environment.service'; import { WalletService } from '../../../../app/core/services/wallet.service'; import { ACCOUNT_WALLET_COLOR, TABS_TITLE_ACCOUNT } from '../../../core/constants/account.constant'; -import { - ACCOUNT_WALLET_COLOR_ENUM, - PageEventType, - StakeModeAccount, - TabsAccount, - WalletAcount, -} from '../../../core/constants/account.enum'; -import { DATE_TIME_WITH_MILLISECOND, PAGE_EVENT } from '../../../core/constants/common.constant'; -import { TableTemplate } from '../../../core/models/common.model'; +import { ACCOUNT_WALLET_COLOR_ENUM, StakeModeAccount, WalletAcount } from '../../../core/constants/account.enum'; +import { DATE_TIME_WITH_MILLISECOND } from '../../../core/constants/common.constant'; import { AccountService } from '../../../core/services/account.service'; import { CommonService } from '../../../core/services/common.service'; -import { TransactionService } from '../../../core/services/transaction.service'; -import { Globals, convertDataTransaction } from '../../../global/global'; +import { Globals } from '../../../global/global'; import { CHART_OPTION, ChartOptions, chartCustomOptions } from './chart-options'; @Component({ @@ -78,7 +68,6 @@ export class AccountDetailComponent implements OnInit { isSent = true; constructor( - private transactionService: TransactionService, public commonService: CommonService, private route: ActivatedRoute, private accountService: AccountService, @@ -88,6 +77,7 @@ export class AccountDetailComponent implements OnInit { private modalService: NgbModal, private environmentService: EnvironmentService, private soulboundService: SoulboundService, + private router: Router, ) { this.chartOptions = CHART_OPTION(); } @@ -233,4 +223,8 @@ export class AccountDetailComponent implements OnInit { url = url.match(/^https?:/) ? url : '//' + url; return url; } + + editPrivateName() { + this.router.navigate(['/profile'], { queryParams: { tab: 'private' } }); + } } diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html index dd8e29c02..73cc49885 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html @@ -10,15 +10,23 @@ Public Name: + *ngIf=" + commonService.setNameTag(contractDetail?.address, null, false) !== contractDetail?.address; + else NoNameTag + ">
- {{ commonService.setNameTag(contractDetail?.address) || '-' }} + {{ + commonService.setNameTag(contractDetail?.address, null, false) || '-' + }} + {{ commonService.checkDisplayTooltip(contractDetail?.address) }} - {{ (commonService.setNameTag(contractDetail?.address) | cutStringPipe : 16) || '-' }} + {{ (commonService.setNameTag(contractDetail?.address, null, false) | cutStringPipe : 16) || '-' }} - {{ (commonService.setNameTag(contractDetail?.address) | cutStringPipe : 8 : 8) || '-' }} + {{ + (commonService.setNameTag(contractDetail?.address, null, false) | cutStringPipe : 8 : 8) || '-' + }} Private Name Tag: - + +
+ {{ (commonService.setNameTag(contractDetail?.address) | cutStringPipe : 16) || '' }} +
+ diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 370027485..90eba925d 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -142,6 +142,10 @@ export class LoginComponent implements OnInit { localStorage.setItem('userEmail', JSON.stringify(res.email)); localStorage.setItem('provider', JSON.stringify(res.provider || 'password')); this.route.navigate(['/profile']); + + setTimeout(() => { + location.reload(); + }, 500); } }, error: (error) => { @@ -238,6 +242,10 @@ export class LoginComponent implements OnInit { localStorage.setItem('userEmail', JSON.stringify(res.userEmail)); localStorage.setItem('provider', JSON.stringify(res.provider || 'password')); window.location.href = '/profile'; + + setTimeout(() => { + location.reload(); + }, 500); }, error: (error) => { this.addError(error?.details?.message); diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 9e9c3d34f..9e1ca4d0f 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -3,7 +3,6 @@ import { FormBuilder, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { LENGTH_CHARACTER } from 'src/app/core/constants/common.constant'; -import { MESSAGES_CODE } from 'src/app/core/constants/messages.constant'; import { EnvironmentService } from 'src/app/core/data-services/environment.service'; import { CommonService } from 'src/app/core/services/common.service'; import { NameTagService } from 'src/app/core/services/name-tag.service'; @@ -26,6 +25,11 @@ export class PopupNameTagComponent implements OnInit { publicNameTag = '-'; isValidAddress = false; + nameTagType = { + Account: 'account', + Contract: 'contract', + }; + constructor( @Inject(MAT_DIALOG_DATA) public data: { data: any }, public dialogRef: MatDialogRef, @@ -86,10 +90,10 @@ export class PopupNameTagComponent implements OnInit { const { isAccount, address, name, note } = this.privateNameForm.value; const payload = { - type: isAccount ? 'account' : 'contract', + type: isAccount ? this.nameTagType.Account : this.nameTagType.Contract, address: address, nameTag: name, - note: null, + note: note, }; this.nameTagService.createPrivateName(payload).subscribe({ diff --git a/src/app/pages/profile/profile.component.ts b/src/app/pages/profile/profile.component.ts index 7f6b909e5..bb3d67f67 100644 --- a/src/app/pages/profile/profile.component.ts +++ b/src/app/pages/profile/profile.component.ts @@ -9,24 +9,27 @@ import { ProfileTab } from 'src/app/core/constants/profile.enum'; }) export class ProfileComponent implements OnInit { profileTab = ProfileTab; - currentTab = ProfileTab.PrivateNameTag; + currentTab = ProfileTab.Setting; activeTabID = 0; PROFILE_TAB = [ { key: ProfileTab.Setting, - value: 'Profile settings' + value: 'Profile settings', }, { key: ProfileTab.PrivateNameTag, - value: 'Private name tag' + value: 'Private name tag', }, // { // key: ProfileTab.WatchList, // value: 'Watchlist' // } - ] + ]; - constructor(private route: ActivatedRoute, private router: Router) {} + constructor( + private route: ActivatedRoute, + private router: Router, + ) {} ngOnInit(): void { // check exit email diff --git a/src/app/pages/profile/profile.module.ts b/src/app/pages/profile/profile.module.ts index 9525a8418..3c162cd06 100644 --- a/src/app/pages/profile/profile.module.ts +++ b/src/app/pages/profile/profile.module.ts @@ -1,24 +1,24 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatIconModule } from '@angular/material/icon'; +import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { NgxMaskModule } from 'ngx-mask'; +import { NameTagService } from 'src/app/core/services/name-tag.service'; +import { UserService } from 'src/app/core/services/user.service'; +import { APaginatorModule } from 'src/app/shared/components/a-paginator/a-paginator.module'; import { LoadingImageModule } from 'src/app/shared/components/loading-image/loading-image.module'; import { NameTagModule } from 'src/app/shared/components/name-tag/name-tag.module'; +import { TableNoDataModule } from 'src/app/shared/components/table-no-data/table-no-data.module'; import { MaterialModule } from '../../app.module'; import { CommonPipeModule } from '../../core/pipes/common-pipe.module'; import { SharedModule } from '../../shared/shared.module'; +import { PopupNameTagComponent } from './popup-name-tag/popup-name-tag.component'; +import { PrivateNameTagComponent } from './private-name-tag/private-name-tag.component'; import { ProfileRoutingModule } from './profile-routing.module'; import { ProfileSettingsComponent } from './profile-settings/profile-settings.component'; import { ProfileComponent } from './profile.component'; -import { MatIconModule } from '@angular/material/icon'; -import { UserService } from 'src/app/core/services/user.service'; -import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { PrivateNameTagComponent } from './private-name-tag/private-name-tag.component'; -import { TableNoDataModule } from 'src/app/shared/components/table-no-data/table-no-data.module'; -import { APaginatorModule } from 'src/app/shared/components/a-paginator/a-paginator.module'; -import { PopupNameTagComponent } from './popup-name-tag/popup-name-tag.component'; -import { NameTagService } from 'src/app/core/services/name-tag.service'; @NgModule({ declarations: [ProfileComponent, ProfileSettingsComponent, PrivateNameTagComponent, PopupNameTagComponent], diff --git a/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.html b/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.html index 79b830b7d..91265fe28 100644 --- a/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.html +++ b/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.html @@ -41,7 +41,7 @@ {{ (commonService.setNameTag(userAddress) | cutStringPipe : 8 : 8) || '-' }} - + + [content]="'Public name: ' + commonService.setNameTag(userAddress, null, false)">
@@ -75,7 +75,9 @@
-
+
- +
{{ @@ -48,7 +50,9 @@
- +
{{ @@ -68,7 +72,9 @@
- +
{{ (transactionsData.top_tx_sent[0]?.amount | number) ?? 0 }} @@ -84,7 +90,9 @@
- +
{{ (transactionsData.top_gas_used[0]?.amount | number) ?? 0 }} @@ -95,4 +103,3 @@
- \ No newline at end of file diff --git a/src/app/pages/statistics/top-statistics/top-statistic-overview/top-statistic-overview.component.scss b/src/app/pages/statistics/top-statistics/top-statistic-overview/top-statistic-overview.component.scss index f0bd3e385..6ad9516c6 100644 --- a/src/app/pages/statistics/top-statistics/top-statistic-overview/top-statistic-overview.component.scss +++ b/src/app/pages/statistics/top-statistics/top-statistic-overview/top-statistic-overview.component.scss @@ -12,9 +12,12 @@ } ::ng-deep { + .private-name-tag { + background-color: var(--aura-gray-10) !important; + } .box-name-tag { - background-color: var(--aura-gray-8) !important; &:not(.private-name-tag) { + background-color: var(--aura-gray-8) !important; &:after { border-right: 15px solid var(--aura-gray-9) !important; } diff --git a/src/app/pages/statistics/top-statistics/top-statistic-transaction/top-statistic-transaction.component.scss b/src/app/pages/statistics/top-statistics/top-statistic-transaction/top-statistic-transaction.component.scss index 57479ed85..974471b9a 100644 --- a/src/app/pages/statistics/top-statistics/top-statistic-transaction/top-statistic-transaction.component.scss +++ b/src/app/pages/statistics/top-statistics/top-statistic-transaction/top-statistic-transaction.component.scss @@ -26,13 +26,12 @@ .box-statistic { ::ng-deep { .box-name-tag { - background-color: var(--aura-gray-8) !important; - &:not(.private-name-tag) { + background-color: var(--aura-gray-8) !important; &:after { border-right: 15px solid var(--aura-gray-10) !important; } } } } -} \ No newline at end of file +} 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 249eb0f10..bdab469bf 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.html +++ b/src/app/pages/validators/validators-detail/validators-detail.component.html @@ -347,10 +347,21 @@

Delegators

- +
+
+ {{ data.delegator_address | displayNameTag }} +
+ + + +
{{ data[template.matColumnDef] | mask : 'separator.6' }} {{ denom }} 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 bf74af7b5..4b8bb0d22 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.scss +++ b/src/app/pages/validators/validators-detail/validators-detail.component.scss @@ -150,3 +150,38 @@ form.search-form { } } } + +.box-name-tag { + height: 26px; + display: inline-flex; + align-items: center; + font-size: 1.2rem; + font-weight: 400; + line-height: 1.6rem; + word-break: break-word; + background-color: var(--aura-gray-9); + border-radius: 4px 0px 0px 4px; + padding-left: var(--spacer-2); + padding-right: var(--spacer-5); + &.private-name-tag { + padding: 0 var(--spacer-2); + background-color: unset; + border-radius: 16px; + border: 1px solid var(--aura-gray-8); + } + &:not(.private-name-tag) { + position: relative; + &:after { + content: ''; + position: absolute; + width: 0; + height: 0; + right: 0; + top: 0; + bottom: 0; + border-top: 13px solid transparent; + border-right: 15px solid #24262E; + border-bottom: 13px solid transparent; + } + } +} \ No newline at end of file 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 61b0be40a..bb19173d2 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.ts +++ b/src/app/pages/validators/validators-detail/validators-detail.component.ts @@ -447,4 +447,15 @@ export class ValidatorsDetailComponent implements OnInit { } }); } + + displayContent(value) { + let result = value; + if (!this.commonService.checkPublic(value, this.global.listNameTag)) { + result += '
' + 'Public name: ' + this.commonService.setNameTag(value, this.global.listNameTag, false); + } + if (this.commonService.checkPrivate(value)) { + result += '
' + 'Private name tag: ' + this.commonService.setNameTag(value, this.global.listNameTag); + } + return result; + } } diff --git a/src/app/shared/components/authenticate-mail/authenticate-mail.component.ts b/src/app/shared/components/authenticate-mail/authenticate-mail.component.ts index 0812db5b8..a638c904a 100644 --- a/src/app/shared/components/authenticate-mail/authenticate-mail.component.ts +++ b/src/app/shared/components/authenticate-mail/authenticate-mail.component.ts @@ -60,6 +60,10 @@ export class AuthenticateMailComponent implements OnDestroy { if (this.route.snapshot['_routerState']?.url === '/profile') { this.router.navigate(['/']); } + + setTimeout(() => { + location.reload(); + }, 500); } linkLogin() { diff --git a/src/app/shared/components/name-tag/name-tag.component.ts b/src/app/shared/components/name-tag/name-tag.component.ts index 1978d1682..03b23cd19 100644 --- a/src/app/shared/components/name-tag/name-tag.component.ts +++ b/src/app/shared/components/name-tag/name-tag.component.ts @@ -1,5 +1,4 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; import { LENGTH_CHARACTER } from 'src/app/core/constants/common.constant'; import { CommonService } from 'src/app/core/services/common.service'; import { Globals } from 'src/app/global/global'; @@ -31,7 +30,7 @@ export class NameTagComponent implements OnInit { extendUrlLink = ''; - constructor(public commonService: CommonService, public global: Globals) {} + constructor(public commonService: CommonService, public global: Globals, ) {} ngOnInit(): void { if (this.extendUrl) { @@ -52,7 +51,13 @@ export class NameTagComponent implements OnInit { } displayContent(value) { - let result = value + '
' + 'Public name: ' + this.commonService.setNameTag(value, this.global.listNameTag); + let result = value; + if (!this.commonService.checkPublic(value)) { + result += '
' + 'Public name: ' + this.commonService.setNameTag(value, this.global.listNameTag, false); + } + if (this.commonService.checkPrivate(value)) { + result += '
' + 'Private name tag: ' + this.commonService.setNameTag(value, this.global.listNameTag); + } return result; } } From 001c075304baedef25c799afcdf8f2847071a7a4 Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 23 Aug 2023 11:18:45 +0700 Subject: [PATCH 008/184] [TamTM6] private name tag css, handle error --- src/app/app.component.ts | 5 ++- src/app/core/pipes/common-pipe.module.ts | 6 ---- src/app/core/pipes/common.pipe.ts | 24 ------------- src/app/core/services/name-tag.service.ts | 5 +-- .../account-detail.component.scss | 2 +- .../account-detail.component.ts | 7 +++- .../contract-info-card.component.scss | 2 +- .../popup-name-tag.component.html | 6 ++-- .../popup-name-tag.component.ts | 11 ++++-- .../top-statistic-overview.component.scss | 3 -- .../token-inventory-tab.component.html | 5 ++- .../token-inventory-tab.component.scss | 7 ++-- .../validators-detail.component.html | 23 ++++-------- .../validators-detail.component.scss | 35 ------------------- .../validators-detail.component.ts | 12 +------ .../name-tag/name-tag.component.scss | 2 +- src/assets/scss/custom.scss | 2 +- 17 files changed, 43 insertions(+), 114 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 376a462a4..7ec9b02e1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -33,11 +33,14 @@ export class AppComponent implements OnInit { this.getPriceToken(); setInterval(() => { - this.getListNameTag(); this.getInfoCommon(); this.getPriceToken(); }, 60000); + setInterval(() => { + this.getListNameTag(); + }, 20000); + // if (this.isTestnet) { // let el = document.createElement('div'); // document.body.appendChild(el); diff --git a/src/app/core/pipes/common-pipe.module.ts b/src/app/core/pipes/common-pipe.module.ts index 0f8d91b3d..53186ee90 100644 --- a/src/app/core/pipes/common-pipe.module.ts +++ b/src/app/core/pipes/common-pipe.module.ts @@ -12,8 +12,6 @@ import { convertLogAmount, decodeData, displayTypeToolTip, - displayNameTag, - checkIsPrivate, } from './common.pipe'; import { JsonPipe } from './json.pipe'; @@ -31,8 +29,6 @@ import { JsonPipe } from './json.pipe'; convertLogAmount, decodeData, displayTypeToolTip, - displayNameTag, - checkIsPrivate ], imports: [CommonModule], exports: [ @@ -48,8 +44,6 @@ import { JsonPipe } from './json.pipe'; convertLogAmount, decodeData, displayTypeToolTip, - displayNameTag, - checkIsPrivate ], }) export class CommonPipeModule {} diff --git a/src/app/core/pipes/common.pipe.ts b/src/app/core/pipes/common.pipe.ts index fe952dc43..bd350a9aa 100644 --- a/src/app/core/pipes/common.pipe.ts +++ b/src/app/core/pipes/common.pipe.ts @@ -142,27 +142,3 @@ export class displayTypeToolTip implements PipeTransform { return result; } } - -@Pipe({ name: 'displayNameTag' }) -export class displayNameTag implements PipeTransform { - constructor(private global: Globals) {} - transform(address: any): string { - const nameTag = this.global.listNameTag?.find((k) => k.address === address); - let result = nameTag?.name_tag_private || nameTag?.name_tag || address; - return result; - } -} - -@Pipe({ name: 'checkIsPrivate' }) -export class checkIsPrivate implements PipeTransform { - constructor(private global: Globals) {} - transform(address: any): boolean { - let result = false; - const nameTag = this.global.listNameTag?.find((k) => k.address === address && k.isPrivate); - if (nameTag?.name_tag_private) { - result = true; - } - return result; - } -} - diff --git a/src/app/core/services/name-tag.service.ts b/src/app/core/services/name-tag.service.ts index 8b7665aea..610605507 100644 --- a/src/app/core/services/name-tag.service.ts +++ b/src/app/core/services/name-tag.service.ts @@ -21,9 +21,6 @@ export class NameTagService extends CommonService { createPrivateName(payload) { const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); - return this.http.post(`${this.apiUrl}/user/private-name-tag`, { - params, - }); + return this.http.post(`${this.apiUrl}/user/private-name-tag`, params); } } - diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index 7f2dea976..10bcc771b 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -122,7 +122,7 @@ section.account-detail { .private-name-tag { height: 24px; padding: 0 var(--spacer-2); - background-color: unset; + background-color: var(--aura-gray-10); border-radius: 16px; border: 1px solid var(--aura-gray-8); } 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 2737ddc09..a412c0341 100644 --- a/src/app/pages/account/account-detail/account-detail.component.ts +++ b/src/app/pages/account/account-detail/account-detail.component.ts @@ -225,6 +225,11 @@ export class AccountDetailComponent implements OnInit { } editPrivateName() { - this.router.navigate(['/profile'], { queryParams: { tab: 'private' } }); + const userEmail = localStorage.getItem('userEmail'); + if (userEmail) { + this.router.navigate(['/profile'], { queryParams: { tab: 'private' } }); + } else { + this.router.navigate(['/login']); + } } } diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss index 99b1f4126..cd58b04de 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss @@ -39,7 +39,7 @@ padding-right: var(--spacer-5); &.private-name-tag { padding: 0 var(--spacer-2); - background-color: unset; + background-color: var(--aura-gray-10); border-radius: 16px; border: 1px solid var(--aura-gray-8); } diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 80658572b..08d86f018 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -70,7 +70,7 @@ placeholder="aura..." class="input-address" (change)="checkPublicNameTag()" - (blur)="checkFormValid()" + (blur)="checkFormValid(); isError = false" autocomplete="off" />
@@ -115,6 +116,7 @@ rows="5" matInput formControlName="note" + (blur)="isError = false" [maxLength]="maxLengthNote" placeholder="Enter note" class="form-check-input col-12 text-area" @@ -139,7 +141,7 @@
diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 9e1ca4d0f..5b2da19da 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -24,6 +24,7 @@ export class PopupNameTagComponent implements OnInit { currentCodeID; publicNameTag = '-'; isValidAddress = false; + isError = false; nameTagType = { Account: 'account', @@ -77,8 +78,8 @@ export class PopupNameTagComponent implements OnInit { if (this.getAddress.value?.length > 0 && this.getAddress?.value?.startsWith('aura')) { if ( - (this.getAddress.value?.length === LENGTH_CHARACTER.ADDRESS && this.isAccount) || - (this.getAddress.value?.length === LENGTH_CHARACTER.CONTRACT && !this.isAccount) + (this.getAddress.value.trim()?.length === LENGTH_CHARACTER.ADDRESS && this.isAccount) || + (this.getAddress.value.trim()?.length === LENGTH_CHARACTER.CONTRACT && !this.isAccount) ) { this.isValidAddress = true; } @@ -99,13 +100,16 @@ export class PopupNameTagComponent implements OnInit { this.nameTagService.createPrivateName(payload).subscribe({ next: (res) => { if (res.code && res.code !== 200) { + this.isError = true; this.toastr.error(res.message || 'Error'); return; } + this.closeDialog(); this.toastr.successWithTitle('Private name tag created!', 'Success'); }, error: (error) => { + this.isError = true; this.toastr.error(error?.details.message[0] || 'Error'); }, }); @@ -117,6 +121,7 @@ export class PopupNameTagComponent implements OnInit { changeType(type) { this.isAccount = type; + this.isError = false this.privateNameForm.value.isAccount = type; this.checkFormValid(); } @@ -135,7 +140,7 @@ export class PopupNameTagComponent implements OnInit { this.publicNameTag = '-'; this.getAddress.value = this.getAddress.value.trim(); if (this.getAddress.status === 'VALID') { - const temp = this.commonService.setNameTag(this.getAddress.value); + const temp = this.commonService.setNameTag(this.getAddress.value, null, false); if (temp !== this.getAddress.value) { this.publicNameTag = temp; } diff --git a/src/app/pages/statistics/top-statistics/top-statistic-overview/top-statistic-overview.component.scss b/src/app/pages/statistics/top-statistics/top-statistic-overview/top-statistic-overview.component.scss index 6ad9516c6..94e192903 100644 --- a/src/app/pages/statistics/top-statistics/top-statistic-overview/top-statistic-overview.component.scss +++ b/src/app/pages/statistics/top-statistics/top-statistic-overview/top-statistic-overview.component.scss @@ -12,9 +12,6 @@ } ::ng-deep { - .private-name-tag { - background-color: var(--aura-gray-10) !important; - } .box-name-tag { &:not(.private-name-tag) { background-color: var(--aura-gray-8) !important; diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.html b/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.html index 353862d64..a37d22848 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.html @@ -31,10 +31,13 @@ {{ item.token_id | cutStringPipe : 5 : 5 }}
-
+
Owner: {{ commonService.setNameTag(item.owner) | cutStringPipe : 8 }} diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.scss b/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.scss index f1903db87..a0e3aec76 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.scss +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.scss @@ -9,13 +9,14 @@ background-color: var(--aura-gray-8); border-radius: 4px 0px 0px 4px; padding-left: var(--spacer-1); - padding-right: var(--spacer-2); - min-width: 90px; + padding-right: var(--spacer-5); + // min-width: 90px; &.private-name-tag { padding: 0 var(--spacer-2); - background-color: unset; + background-color: var(--aura-gray-10); border-radius: 16px; border: 1px solid var(--aura-gray-8); + padding-right: var(--spacer-2); } &:not(.private-name-tag) { position: relative; 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 bdab469bf..a898ccd27 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.html +++ b/src/app/pages/validators/validators-detail/validators-detail.component.html @@ -347,21 +347,10 @@

Delegators

-
-
- {{ data.delegator_address | displayNameTag }} -
- - - -
+
{{ data[template.matColumnDef] | mask : 'separator.6' }} {{ denom }} @@ -389,7 +378,9 @@

Delegators

{ label: '', class: !commonService.checkDisplayTooltip(data.delegator_address) - ? 'name-tag text--primary' + ? commonService.checkPrivate(data.delegator_address) + ? 'name-tag private-name-tag text--primary' + : 'name-tag text--primary' : 'text--primary', info: !commonService.checkDisplayTooltip(data.delegator_address) ? (commonService.setNameTag(data.delegator_address) | cutStringPipe : 16) 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 4b8bb0d22..a61fcd7e7 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.scss +++ b/src/app/pages/validators/validators-detail/validators-detail.component.scss @@ -149,39 +149,4 @@ form.search-form { color: var(--aura-primary) !important; } } -} - -.box-name-tag { - height: 26px; - display: inline-flex; - align-items: center; - font-size: 1.2rem; - font-weight: 400; - line-height: 1.6rem; - word-break: break-word; - background-color: var(--aura-gray-9); - border-radius: 4px 0px 0px 4px; - padding-left: var(--spacer-2); - padding-right: var(--spacer-5); - &.private-name-tag { - padding: 0 var(--spacer-2); - background-color: unset; - border-radius: 16px; - border: 1px solid var(--aura-gray-8); - } - &:not(.private-name-tag) { - position: relative; - &:after { - content: ''; - position: absolute; - width: 0; - height: 0; - right: 0; - top: 0; - bottom: 0; - border-top: 13px solid transparent; - border-right: 15px solid #24262E; - border-bottom: 13px solid transparent; - } - } } \ No newline at end of file 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 bb19173d2..23d17fe96 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.ts +++ b/src/app/pages/validators/validators-detail/validators-detail.component.ts @@ -103,6 +103,7 @@ export class ValidatorsDetailComponent implements OnInit { ) {} ngOnInit(): void { + this.commonService['listNameTag'] = this.global?.listNameTag; this.currentAddress = this.route.snapshot.paramMap.get('id'); this.loadData(); this.getDetail(true); @@ -447,15 +448,4 @@ export class ValidatorsDetailComponent implements OnInit { } }); } - - displayContent(value) { - let result = value; - if (!this.commonService.checkPublic(value, this.global.listNameTag)) { - result += '
' + 'Public name: ' + this.commonService.setNameTag(value, this.global.listNameTag, false); - } - if (this.commonService.checkPrivate(value)) { - result += '
' + 'Private name tag: ' + this.commonService.setNameTag(value, this.global.listNameTag); - } - return result; - } } diff --git a/src/app/shared/components/name-tag/name-tag.component.scss b/src/app/shared/components/name-tag/name-tag.component.scss index 436b86d0e..bd5afe837 100644 --- a/src/app/shared/components/name-tag/name-tag.component.scss +++ b/src/app/shared/components/name-tag/name-tag.component.scss @@ -13,7 +13,7 @@ color: var(--aura-gray-2); &.private-name-tag { padding: 0 var(--spacer-2); - background-color: unset; + background-color: var(--aura-gray-10); border-radius: 16px; border: 1px solid var(--aura-gray-8); } diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss index acb708d00..49c1948d8 100644 --- a/src/assets/scss/custom.scss +++ b/src/assets/scss/custom.scss @@ -681,7 +681,7 @@ body { color: var(--aura-gray-light); &.private-name-tag { padding: 0 var(--spacer-2); - background-color: unset; + background-color: var(--aura-gray-10); border-radius: 16px; border: 1px solid var(--aura-gray-8); } From ecd28b2896c6b26a38f4257304205de4942d2390 Mon Sep 17 00:00:00 2001 From: "FISAURA-PHUONGL\\quannn7" Date: Wed, 23 Aug 2023 15:15:43 +0700 Subject: [PATCH 009/184] private name tag table --- src/app/core/models/name-tag.model.ts | 6 ++ src/app/core/services/name-tag.service.ts | 4 +- .../private-name-tag.component.html | 74 +++++++------------ .../private-name-tag.component.ts | 30 ++++++-- .../token-cw20/token-cw20.component.ts | 1 + 5 files changed, 60 insertions(+), 55 deletions(-) create mode 100644 src/app/core/models/name-tag.model.ts diff --git a/src/app/core/models/name-tag.model.ts b/src/app/core/models/name-tag.model.ts new file mode 100644 index 000000000..170006b20 --- /dev/null +++ b/src/app/core/models/name-tag.model.ts @@ -0,0 +1,6 @@ +export class PrivateNameTagDto { + id: number; + address: string; + name_tag: string; + note: string; +} diff --git a/src/app/core/services/name-tag.service.ts b/src/app/core/services/name-tag.service.ts index 8076d6577..8b7665aea 100644 --- a/src/app/core/services/name-tag.service.ts +++ b/src/app/core/services/name-tag.service.ts @@ -14,14 +14,14 @@ export class NameTagService extends CommonService { getListPrivateNameTag(payload) { const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); - return this.http.get(`${this.apiUrl}/admin/private-name-tag`, { + return this.http.get(`${this.apiUrl}/user/private-name-tag`, { params, }); } createPrivateName(payload) { const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); - return this.http.post(`${this.apiUrl}/admin/private-name-tag`, { + return this.http.post(`${this.apiUrl}/user/private-name-tag`, { params, }); } diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 986dcd3c1..95a1c8ae1 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -10,7 +10,7 @@
-
Total 0/10 addresses tagged
+
Total 0/{{ pageData?.length }} addresses tagged
@@ -40,63 +40,41 @@
-
- +
+
- - - -
-
+ 		+
- - - {{ template.matColumnDef | cutStringPipe : 8 : 8 }} - -
desc
- - - - - - {{ commonService.getDateValue(data['date_format'], false)[0] }} - - - - - - - - - {{ data[template.matColumnDef] }} - +
+ +
+
+ + {{ data[template.matColumnDef] | cutStringPipe : 8 : 8 }} + + {{ data.note || '-' }} +
+
+ {{ data[template.matColumnDef].charAt(0).toUpperCase() + data[template.matColumnDef].slice(1) }} +
+ +
+ {{ commonService.getDateValue(data[template.matColumnDef])[0] }} +
+
+ {{ commonService.getDateValue(data[template.matColumnDef])[0] }} +
+
- +
- {{ 'NO DATA' | translate }} -
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 533552850..bc867c40c 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 @@ -12,6 +12,8 @@ import { PaginatorComponent } from 'src/app/shared/components/paginator/paginato import { PopupNameTagComponent } from '../popup-name-tag/popup-name-tag.component'; import { ToastrService } from 'ngx-toastr'; import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; +import { NameTagService } from 'src/app/core/services/name-tag.service'; +import { PrivateNameTagDto } from 'src/app/core/models/name-tag.model'; @Component({ selector: 'app-private-name-tag', @@ -32,8 +34,8 @@ export class PrivateNameTagComponent implements OnInit { { matColumnDef: 'favorite', headerCellDef: 'Fav.', headerWidth: 8 }, { matColumnDef: 'address', headerCellDef: 'Address', headerWidth: 12 }, { matColumnDef: 'type', headerCellDef: 'Type', headerWidth: 6 }, - { matColumnDef: 'name', headerCellDef: 'Private Name Tag', headerWidth: 12 }, - { matColumnDef: 'add_time', headerCellDef: 'Added Time', headerWidth: 10 }, + { matColumnDef: 'name_tag', headerCellDef: 'Private Name Tag', headerWidth: 12 }, + { matColumnDef: 'created_at', headerCellDef: 'Added Time', headerWidth: 10 }, { matColumnDef: 'update_time', headerCellDef: 'Updated Time', headerWidth: 10 }, { matColumnDef: 'action', headerCellDef: '', headerWidth: 8 }, ]; @@ -42,10 +44,12 @@ export class PrivateNameTagComponent implements OnInit { textSearch = ''; searchSubject = new Subject(); destroy$ = new Subject(); - dataSource = new MatTableDataSource(); + dataSource: MatTableDataSource = new MatTableDataSource([]); + dataTable = []; constructor( public commonService: CommonService, + public nameTagService: NameTagService, private modalService: NgbModal, private dialog: MatDialog, private toastr: NgxToastrService, @@ -58,7 +62,10 @@ export class PrivateNameTagComponent implements OnInit { }); } - ngOnInit(): void {} + ngOnInit(): void { + console.log(this.dataSource); + this.getListPrivateName(); + } onKeyUp() { this.searchSubject.next(this.textSearch); @@ -73,7 +80,20 @@ export class PrivateNameTagComponent implements OnInit { this.getListPrivateName(); } - getListPrivateName() {} + getListPrivateName() { + this.textSearch = this.textSearch?.trim(); + const payload = { + limit: this.pageData.pageSize, + offset: this.pageData.pageSize * this.pageData.pageIndex, + keyword: this.textSearch, + }; + + this.nameTagService.getListPrivateNameTag(payload).subscribe((res) => { + console.log(res); + this.dataSource.data = res.data; + this.pageData.length = res?.meta?.count || 0; + }); + } openPopup() { const dialogConfig = new MatDialogConfig(); diff --git a/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts b/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts index 8f47a00e9..1322ecd3f 100644 --- a/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts +++ b/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts @@ -81,6 +81,7 @@ export class TokenCw20Component implements OnInit, OnDestroy { this.pageChange.selectPage(0); } }); + console.log(this.dataSource); } onKeyUp() { From 954ae77f072b25c46ff4eb4a46f68307aa6b5f20 Mon Sep 17 00:00:00 2001 From: mtam Date: Thu, 24 Aug 2023 11:08:53 +0700 Subject: [PATCH 010/184] [TamTM6] update name tag api, list --- src/app/core/services/name-tag.service.ts | 15 +- .../popup-name-tag.component.html | 13 +- .../popup-name-tag.component.ts | 61 ++++++-- .../private-name-tag.component.html | 135 ++++++------------ .../private-name-tag.component.scss | 8 ++ .../private-name-tag.component.ts | 81 +++++++++-- src/app/pages/profile/profile.module.ts | 14 +- .../token-cw20/token-cw20.component.ts | 1 - .../popup-common/popup-common.component.html | 38 +++++ .../popup-common/popup-common.component.scss | 16 +++ .../popup-common/popup-common.component.ts | 26 ++++ 11 files changed, 279 insertions(+), 129 deletions(-) create mode 100644 src/app/shared/components/popup-common/popup-common.component.html create mode 100644 src/app/shared/components/popup-common/popup-common.component.scss create mode 100644 src/app/shared/components/popup-common/popup-common.component.ts diff --git a/src/app/core/services/name-tag.service.ts b/src/app/core/services/name-tag.service.ts index bcb7981a7..1fb45b00d 100644 --- a/src/app/core/services/name-tag.service.ts +++ b/src/app/core/services/name-tag.service.ts @@ -21,8 +21,15 @@ export class NameTagService extends CommonService { createPrivateName(payload) { const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); - return this.http.post(`${this.apiUrl}/user/private-name-tag`, { - params, - }); + return this.http.post(`${this.apiUrl}/user/private-name-tag`, params); + } + + deletePrivateNameTag(id) { + return this.http.delete(`${this.apiUrl}/user/private-name-tag/${id}`); + } + + updatePrivateNameTag(payload) { + const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); + return this.http.patch(`${this.apiUrl}/user/private-name-tag/${params.id}`, params); } -} \ No newline at end of file +} diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 08d86f018..c5d0fc13f 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -1,7 +1,7 @@
-
Create Private Name Tag
+
{{ data ? 'Edit' : 'Create' }} Private Name Tag
- Set favorite in tag list + Set favorite in tag list
@@ -140,9 +142,12 @@
diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 5b2da19da..fe5ba2312 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -44,23 +44,22 @@ export class PopupNameTagComponent implements OnInit { ngOnInit(): void { this.formInit(); - const payload = { - limit: 20, - offset: 0, - keyword: null, - }; - this.nameTagService.getListPrivateNameTag(payload).subscribe((res) => { - console.log(res); - }); + if (this.data) { + this.setDataFrom(this.data); + } } get getAddress() { return this.privateNameForm.get('address'); } + get getFavorite() { + return this.privateNameForm.get('isFavorite'); + } + formInit() { this.privateNameForm = this.fb.group({ - favorite: [''], + isFavorite: [0], isAccount: [true, [Validators.required]], address: ['', [Validators.required]], name: ['', [Validators.required, Validators.maxLength(this.maxLengthNameTag)]], @@ -68,6 +67,14 @@ export class PopupNameTagComponent implements OnInit { }); } + setDataFrom(data) { + this.privateNameForm.controls['isFavorite'].setValue(data.isFavorite); + this.privateNameForm.controls['isAccount'].setValue(data.type === 'account' ? true : false); + this.privateNameForm.controls['address'].setValue(data.address); + this.privateNameForm.controls['name'].setValue(data.nameTag); + this.privateNameForm.controls['note'].setValue(data.note); + } + closeDialog(hash = null) { this.dialogRef.close(hash); } @@ -88,15 +95,24 @@ export class PopupNameTagComponent implements OnInit { async onSubmit() { this.isSubmit = true; - const { isAccount, address, name, note } = this.privateNameForm.value; + const { isFavorite, isAccount, address, name, note } = this.privateNameForm.value; const payload = { + isFavorite: isFavorite, type: isAccount ? this.nameTagType.Account : this.nameTagType.Contract, address: address, nameTag: name, note: note, }; + if (this.data) { + this.editPrivateName(payload); + } else { + this.createPrivateName(payload); + } + } + + createPrivateName(payload) { this.nameTagService.createPrivateName(payload).subscribe({ next: (res) => { if (res.code && res.code !== 200) { @@ -115,13 +131,34 @@ export class PopupNameTagComponent implements OnInit { }); } + editPrivateName(payload) { + this.nameTagService.updatePrivateNameTag(payload).subscribe({ + next: (res) => { + console.log(res); + + if (res.code && res.code !== 200) { + this.isError = true; + this.toastr.error(res.message || 'Error'); + return; + } + + // this.closeDialog(); + // this.toastr.successWithTitle('Private name tag created!', 'Success'); + }, + error: (error) => { + this.isError = true; + this.toastr.error(error?.details.message[0] || 'Error'); + }, + }); + } + changeFavorite() { - this.privateNameForm.value.favorite = !this.privateNameForm.value.favorite; + this.privateNameForm.value.isFavorite = !this.privateNameForm.value.isFavorite; } changeType(type) { this.isAccount = type; - this.isError = false + this.isError = false; this.privateNameForm.value.isAccount = type; this.checkFormValid(); } diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 95a1c8ae1..a59a44e9c 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -10,7 +10,7 @@
-
Total 0/{{ pageData?.length }} addresses tagged
+
Total {{ countFav }}/{{ pageData?.length }} addresses tagged
@@ -40,34 +40,61 @@
-
+
@@ -78,11 +105,13 @@
-
+
+ + + +
+
-
+
+ + +
{{ data[template.matColumnDef] | cutStringPipe : 8 : 8 }} - {{ data.note || '-' }} + {{ data.note || '-' }} +
+
+ {{ data[template.matColumnDef] }}
-
- {{ data[template.matColumnDef].charAt(0).toUpperCase() + data[template.matColumnDef].slice(1) }} +
+
- -
+
{{ commonService.getDateValue(data[template.matColumnDef])[0] }}
-
+
{{ commonService.getDateValue(data[template.matColumnDef])[0] }}
-
+
+
+ + +
+
+ + +
+
-
- + + [pageSize]="pageData.pageSize" + (paginator)="paginatorEmit($event)" + (pageEvent)="pageEvent($event)"> +
@@ -90,79 +119,3 @@ - -
- - - -
diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss index 23fd2e449..65977a232 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss @@ -16,3 +16,11 @@ width: 410px; } } + +:ng-deep .box-name-tag { + height: 24px; + padding: 0 var(--spacer-2); + background-color: var(--aura-gray-10); + border-radius: 16px; + border: 1px solid var(--aura-gray-8); +} 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 bc867c40c..aa2959ef6 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 @@ -8,12 +8,11 @@ import { debounceTime, takeUntil } from 'rxjs/operators'; import { PAGE_EVENT } from 'src/app/core/constants/common.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'; +import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; import { PaginatorComponent } from 'src/app/shared/components/paginator/paginator.component'; import { PopupNameTagComponent } from '../popup-name-tag/popup-name-tag.component'; -import { ToastrService } from 'ngx-toastr'; -import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; -import { NameTagService } from 'src/app/core/services/name-tag.service'; -import { PrivateNameTagDto } from 'src/app/core/models/name-tag.model'; +import { PopupCommonComponent } from 'src/app/shared/components/popup-common/popup-common.component'; @Component({ selector: 'app-private-name-tag', @@ -23,20 +22,21 @@ import { PrivateNameTagDto } from 'src/app/core/models/name-tag.model'; export class PrivateNameTagComponent implements OnInit { @ViewChild(PaginatorComponent) pageChange: PaginatorComponent; + countFav = 0; modalReference: any; pageData: PageEvent = { length: PAGE_EVENT.LENGTH, - pageSize: 10, + pageSize: 5, pageIndex: PAGE_EVENT.PAGE_INDEX, }; templates: Array = [ - { matColumnDef: 'favorite', headerCellDef: 'Fav.', headerWidth: 8 }, + { matColumnDef: 'favorite', headerCellDef: 'Fav', headerWidth: 8 }, { matColumnDef: 'address', headerCellDef: 'Address', headerWidth: 12 }, { matColumnDef: 'type', headerCellDef: 'Type', headerWidth: 6 }, { matColumnDef: 'name_tag', headerCellDef: 'Private Name Tag', headerWidth: 12 }, - { matColumnDef: 'created_at', headerCellDef: 'Added Time', headerWidth: 10 }, - { matColumnDef: 'update_time', headerCellDef: 'Updated Time', headerWidth: 10 }, + { matColumnDef: 'createdAt', headerCellDef: 'Added Time', headerWidth: 10 }, + { matColumnDef: 'updatedAt', headerCellDef: 'Updated Time', headerWidth: 10 }, { matColumnDef: 'action', headerCellDef: '', headerWidth: 8 }, ]; displayedColumns: string[] = this.templates.map((dta) => dta.matColumnDef); @@ -63,7 +63,6 @@ export class PrivateNameTagComponent implements OnInit { } ngOnInit(): void { - console.log(this.dataSource); this.getListPrivateName(); } @@ -76,29 +75,32 @@ export class PrivateNameTagComponent implements OnInit { this.onKeyUp(); } - pageEvent(pageIndex: number): void { + pageEvent(e: PageEvent): void { + this.pageData.pageIndex = e.pageIndex; this.getListPrivateName(); } - getListPrivateName() { + getListPrivateName(nextKey = null) { this.textSearch = this.textSearch?.trim(); const payload = { - limit: this.pageData.pageSize, - offset: this.pageData.pageSize * this.pageData.pageIndex, + limit: 100, keyword: this.textSearch, }; this.nameTagService.getListPrivateNameTag(payload).subscribe((res) => { - console.log(res); + this.countFav = res.data?.filter((k) => k.isFavorite === 1)?.length || 0; this.dataSource.data = res.data; this.pageData.length = res?.meta?.count || 0; }); } - openPopup() { + openPopup(data = null) { const dialogConfig = new MatDialogConfig(); dialogConfig.panelClass = 'grant-overlay-panel'; dialogConfig.disableClose = true; + if (data) { + dialogConfig.data = data; + } let dialogRef = this.dialog.open(PopupNameTagComponent, dialogConfig); dialogRef.afterClosed().subscribe((result) => { @@ -107,4 +109,53 @@ export class PrivateNameTagComponent implements OnInit { } }); } + + openPopupDelete(data) { + let dialogRef = this.dialog.open(PopupCommonComponent, { + panelClass: 'sizeNormal', + data: { + title: 'Remove Private Name Tag', + content: 'Are you sure to remove private name tag for the address ' + data.address + ' ' + data.nameTag + ' ?', + }, + }); + + dialogRef.afterClosed().subscribe((result) => { + if (result !== 'canceled') { + this.deleteNameTag(data.id); + } + }); + } + + deleteNameTag(id) { + this.nameTagService.deletePrivateNameTag(id).subscribe((res) => { + if (res.code && res.code !== 200) { + this.toastr.error(res.message || 'Error'); + return; + } + + this.toastr.successWithTitle('Private name tag removed!', 'Success'); + setTimeout(() => { + this.getListPrivateName(); + }, 500); + }); + } + + editPrivateNameTag() {} + + updateFavorite(data) { + const payload = { + id: data.id, + isFavorite: !data.isFavorite, + }; + + this.nameTagService.updatePrivateNameTag(payload).subscribe((res) => { + setTimeout(() => { + this.getListPrivateName(); + }, 500); + }); + } + + paginatorEmit(event): void { + this.dataSource.paginator = event; + } } diff --git a/src/app/pages/profile/profile.module.ts b/src/app/pages/profile/profile.module.ts index 3c162cd06..f1607f3c7 100644 --- a/src/app/pages/profile/profile.module.ts +++ b/src/app/pages/profile/profile.module.ts @@ -19,9 +19,18 @@ import { PrivateNameTagComponent } from './private-name-tag/private-name-tag.com import { ProfileRoutingModule } from './profile-routing.module'; import { ProfileSettingsComponent } from './profile-settings/profile-settings.component'; import { ProfileComponent } from './profile.component'; +import { PopupCommonComponent } from 'src/app/shared/components/popup-common/popup-common.component'; +import { TooltipCustomizeModule } from 'src/app/shared/components/tooltip-customize/tooltip-customize.module'; +import { PaginatorModule } from 'src/app/shared/components/paginator/paginator.module'; @NgModule({ - declarations: [ProfileComponent, ProfileSettingsComponent, PrivateNameTagComponent, PopupNameTagComponent], + declarations: [ + ProfileComponent, + ProfileSettingsComponent, + PrivateNameTagComponent, + PopupNameTagComponent, + PopupCommonComponent, + ], imports: [ CommonModule, FormsModule, @@ -37,7 +46,8 @@ import { ProfileComponent } from './profile.component'; MatIconModule, NgbNavModule, TableNoDataModule, - APaginatorModule, + PaginatorModule, + TooltipCustomizeModule, ], providers: [FormBuilder, UserService, NameTagService], }) diff --git a/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts b/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts index 1322ecd3f..8f47a00e9 100644 --- a/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts +++ b/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts @@ -81,7 +81,6 @@ export class TokenCw20Component implements OnInit, OnDestroy { this.pageChange.selectPage(0); } }); - console.log(this.dataSource); } onKeyUp() { diff --git a/src/app/shared/components/popup-common/popup-common.component.html b/src/app/shared/components/popup-common/popup-common.component.html new file mode 100644 index 000000000..e5b60c187 --- /dev/null +++ b/src/app/shared/components/popup-common/popup-common.component.html @@ -0,0 +1,38 @@ +
+
+
+ + {{ data.title }} +
+ +
+
+ {{ data.content }} + +
+
+ +
+ + +
+
diff --git a/src/app/shared/components/popup-common/popup-common.component.scss b/src/app/shared/components/popup-common/popup-common.component.scss new file mode 100644 index 000000000..1778d6e2c --- /dev/null +++ b/src/app/shared/components/popup-common/popup-common.component.scss @@ -0,0 +1,16 @@ +::ng-deep { + .sizeNormal { + max-width: 500px !important; + } + + .mat-dialog-container { + background: transparent; + box-shadow: none; + padding: 0; + overflow: visible; + .card .popup-common { + max-width: 550px; + min-width: 300px; + } + } +} diff --git a/src/app/shared/components/popup-common/popup-common.component.ts b/src/app/shared/components/popup-common/popup-common.component.ts new file mode 100644 index 000000000..4c77d4e0b --- /dev/null +++ b/src/app/shared/components/popup-common/popup-common.component.ts @@ -0,0 +1,26 @@ +import { Component, Inject, OnInit } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; + +@Component({ + selector: 'app-popup-common', + templateUrl: './popup-common.component.html', + styleUrls: ['./popup-common.component.scss'], +}) +export class PopupCommonComponent implements OnInit { + isLoading; + constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public dialogRef: MatDialogRef, + ) {} + + ngOnInit(): void { + } + + submitAction(type) { + this.dialogRef.close(type); + } + + closeDialog() { + this.dialogRef.close('canceled'); + } +} From 45fd3b27f5803e262a648377e4f38d616233e88a Mon Sep 17 00:00:00 2001 From: mtam Date: Thu, 24 Aug 2023 16:14:17 +0700 Subject: [PATCH 011/184] [TamTM6] update layout private name tag --- .../popup-name-tag.component.html | 18 +-- .../popup-name-tag.component.scss | 34 ++++- .../popup-name-tag.component.ts | 4 +- .../private-name-tag.component.html | 144 +++++++++--------- .../private-name-tag.component.scss | 22 ++- .../private-name-tag.component.ts | 7 +- src/assets/scss/custom.scss | 6 + 7 files changed, 148 insertions(+), 87 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index c5d0fc13f..1cfb20421 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -2,11 +2,7 @@
{{ data ? 'Edit' : 'Create' }} Private Name Tag
- +
@@ -17,9 +13,9 @@ class="aura-form single-input-field private-name-form" autocomplete="off">
- Set favorite in tag list + + Set favorite in tag list +
@@ -56,7 +52,11 @@
-
{{ publicNameTag }}
+
+ {{ publicNameTag }} +
diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss index a6d5bf546..7c00e7124 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss @@ -1,8 +1,10 @@ .card.card-private-name { - // padding: var(--spacer-4); @media (min-width: 992px) { width: 800px; } + @media (max-width: 414px) { + max-height: 80vh; + } .card-header { background-color: var(--aura-gray-9); } @@ -71,3 +73,33 @@ } } } + +.box-name-tag { + height: 26px; + display: inline-flex; + align-items: center; + font-size: 1.2rem; + font-weight: 400; + line-height: 1.6rem; + word-break: break-word; + background-color: var(--aura-gray-9); + border-radius: 4px 0px 0px 4px; + padding-left: var(--spacer-2); + padding-right: var(--spacer-5); + color: var(--aura-gray-light); + &:not(.private-name-tag) { + position: relative; + &:after { + content: ''; + position: absolute; + width: 0; + height: 0; + right: 0; + top: 0; + bottom: 0; + border-top: 13px solid transparent; + border-right: 15px solid #24262e; + border-bottom: 13px solid transparent; + } + } +} diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index fe5ba2312..0455d53d2 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -68,11 +68,13 @@ export class PopupNameTagComponent implements OnInit { } setDataFrom(data) { + this.isValidAddress = true; this.privateNameForm.controls['isFavorite'].setValue(data.isFavorite); this.privateNameForm.controls['isAccount'].setValue(data.type === 'account' ? true : false); this.privateNameForm.controls['address'].setValue(data.address); this.privateNameForm.controls['name'].setValue(data.nameTag); this.privateNameForm.controls['note'].setValue(data.note); + this.checkPublicNameTag(); } closeDialog(hash = null) { @@ -134,8 +136,6 @@ export class PopupNameTagComponent implements OnInit { editPrivateName(payload) { this.nameTagService.updatePrivateNameTag(payload).subscribe({ next: (res) => { - console.log(res); - if (res.code && res.code !== 200) { this.isError = true; this.toastr.error(res.message || 'Error'); diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index a59a44e9c..0d8215655 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -10,7 +10,7 @@
-
Total {{ countFav }}/{{ pageData?.length }} addresses tagged
+
Total {{ countFav }}/{{ pageData?.length }} addresses tagged
@@ -39,80 +39,82 @@
-
-
- - - - - + +
-
- - - -
-
- 		-
- -
- - +
+ + + + + - + + + + - - -
+
+ + + +
+
+ 		+
+ +
+ + +
+
+ + {{ data[template.matColumnDef] | cutStringPipe : 8 : 8 }} + + 
+                      {{ data.note || '-' }}
+
+
+
+ {{ data[template.matColumnDef] }} +
+
+
{{ data.nameTag | cutStringPipe : 25 }}
+
+
+ {{ commonService.getDateValue(data[template.matColumnDef])[0] }} +
+
+ {{ commonService.getDateValue(data[template.matColumnDef])[0] }} +
+
+
+ +
-
- - {{ data[template.matColumnDef] | cutStringPipe : 8 : 8 }} - - {{ data.note || '-' }} +
+ +
-
- {{ data[template.matColumnDef] }} -
-
- -
-
- {{ commonService.getDateValue(data[template.matColumnDef])[0] }} -
-
- {{ commonService.getDateValue(data[template.matColumnDef])[0] }} -
-
-
- - -
-
- - -
-
- -
-
-
+ +
+
-
- - -
+
+ +
diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss index 65977a232..b7c47b05e 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss @@ -17,8 +17,28 @@ } } -:ng-deep .box-name-tag { +.private-name-table { + th.mat-header-cell:nth-child(1) { + min-width: 60px; + } + th.mat-header-cell:nth-child(7) { + min-width: 80px; + } + th.mat-header-cell:nth-child(2), + th.mat-header-cell:nth-child(4), + th.mat-header-cell:nth-child(5), + th.mat-header-cell:nth-child(6) { + min-width: 150px; + } +} + +.txt-total-name { + color: #e6e7e8; +} + +.profile-private-name-tag { height: 24px; + width: fit-content; padding: 0 var(--spacer-2); background-color: var(--aura-gray-10); border-radius: 16px; 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 aa2959ef6..542b8c488 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 @@ -2,7 +2,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; import { PageEvent } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Subject } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; import { PAGE_EVENT } from 'src/app/core/constants/common.constant'; @@ -10,9 +9,10 @@ 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'; import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; +import { Globals } from 'src/app/global/global'; import { PaginatorComponent } from 'src/app/shared/components/paginator/paginator.component'; -import { PopupNameTagComponent } from '../popup-name-tag/popup-name-tag.component'; import { PopupCommonComponent } from 'src/app/shared/components/popup-common/popup-common.component'; +import { PopupNameTagComponent } from '../popup-name-tag/popup-name-tag.component'; @Component({ selector: 'app-private-name-tag', @@ -50,9 +50,9 @@ export class PrivateNameTagComponent implements OnInit { constructor( public commonService: CommonService, public nameTagService: NameTagService, - private modalService: NgbModal, private dialog: MatDialog, private toastr: NgxToastrService, + private global: Globals, ) { this.searchSubject .asObservable() @@ -63,6 +63,7 @@ export class PrivateNameTagComponent implements OnInit { } ngOnInit(): void { + this.commonService.listNameTag = this.global.listNameTag; this.getListPrivateName(); } diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss index 49c1948d8..4267a6ca6 100644 --- a/src/assets/scss/custom.scss +++ b/src/assets/scss/custom.scss @@ -761,3 +761,9 @@ body { background: url('../../assets/icons/icons-svg/white/error-notice.svg') center; background-size: cover; } + +.ellipsis-text { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} From bdb15093fc0fc19fbec28169bdfa5a130bd0d171 Mon Sep 17 00:00:00 2001 From: "FISAURA-PHUONGL\\quannn7" Date: Thu, 24 Aug 2023 17:29:23 +0700 Subject: [PATCH 012/184] fix edit name tag flow --- src/app/core/services/name-tag.service.ts | 2 +- .../profile/popup-name-tag/popup-name-tag.component.ts | 10 ++++++---- .../private-name-tag/private-name-tag.component.ts | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/core/services/name-tag.service.ts b/src/app/core/services/name-tag.service.ts index 1fb45b00d..5693937d1 100644 --- a/src/app/core/services/name-tag.service.ts +++ b/src/app/core/services/name-tag.service.ts @@ -30,6 +30,6 @@ export class NameTagService extends CommonService { updatePrivateNameTag(payload) { const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); - return this.http.patch(`${this.apiUrl}/user/private-name-tag/${params.id}`, params); + return this.http.patch(`${this.apiUrl}/user/private-name-tag/${payload.id}`, params); } } diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 0455d53d2..30729ca95 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -32,7 +32,7 @@ export class PopupNameTagComponent implements OnInit { }; constructor( - @Inject(MAT_DIALOG_DATA) public data: { data: any }, + @Inject(MAT_DIALOG_DATA) public data: any, public dialogRef: MatDialogRef, private fb: FormBuilder, public environmentService: EnvironmentService, @@ -95,7 +95,7 @@ export class PopupNameTagComponent implements OnInit { } } - async onSubmit() { + onSubmit() { this.isSubmit = true; const { isFavorite, isAccount, address, name, note } = this.privateNameForm.value; @@ -105,6 +105,7 @@ export class PopupNameTagComponent implements OnInit { address: address, nameTag: name, note: note, + id: this.data.id, }; if (this.data) { @@ -142,8 +143,9 @@ export class PopupNameTagComponent implements OnInit { return; } - // this.closeDialog(); - // this.toastr.successWithTitle('Private name tag created!', 'Success'); + this.closeDialog(true); + + this.toastr.successWithTitle('Private name tag created!', 'Success'); }, error: (error) => { this.isError = true; 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 542b8c488..2191186d3 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 @@ -106,6 +106,9 @@ export class PrivateNameTagComponent implements OnInit { dialogRef.afterClosed().subscribe((result) => { if (result) { + setTimeout(() => { + this.getListPrivateName(); + }, 500); this.toastr.loading(result); } }); From 608980a5eb9419d88770fe7d9ce1f8a4c73e8d79 Mon Sep 17 00:00:00 2001 From: "FISAURA-PHUONGL\\quannn7" Date: Mon, 28 Aug 2023 16:15:50 +0700 Subject: [PATCH 013/184] fix small UI bug --- .../pages/profile/popup-name-tag/popup-name-tag.component.ts | 2 +- .../profile/private-name-tag/private-name-tag.component.scss | 3 +++ .../shared/components/popup-common/popup-common.component.html | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 30729ca95..e3fd5f535 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -145,7 +145,7 @@ export class PopupNameTagComponent implements OnInit { this.closeDialog(true); - this.toastr.successWithTitle('Private name tag created!', 'Success'); + this.toastr.successWithTitle('Private name tag edited!', 'Success'); }, error: (error) => { this.isError = true; diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss index b7c47b05e..7b3211f28 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss @@ -43,4 +43,7 @@ background-color: var(--aura-gray-10); border-radius: 16px; border: 1px solid var(--aura-gray-8); + color: var(--aura-primary); + display: flex; + align-items: center; } diff --git a/src/app/shared/components/popup-common/popup-common.component.html b/src/app/shared/components/popup-common/popup-common.component.html index e5b60c187..3038ebd0e 100644 --- a/src/app/shared/components/popup-common/popup-common.component.html +++ b/src/app/shared/components/popup-common/popup-common.component.html @@ -32,7 +32,7 @@ type="button" [disabled]="isLoading" (click)="submitAction(true)"> - Confirm + Remove
From 84deef17e536a225376612867d71066308860f7f Mon Sep 17 00:00:00 2001 From: "FISAURA-PHUONGL\\quannn7" Date: Mon, 28 Aug 2023 16:29:22 +0700 Subject: [PATCH 014/184] change added date format in private name tag table --- .../profile/private-name-tag/private-name-tag.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 0d8215655..bad567edb 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -81,7 +81,7 @@
{{ data.nameTag | cutStringPipe : 25 }}
- {{ commonService.getDateValue(data[template.matColumnDef])[0] }} + {{ data[template.matColumnDef] | customDate : 'yyyy-MM-dd' }}
{{ commonService.getDateValue(data[template.matColumnDef])[0] }} From 1c7f1cacaacc8b0ef50b83e01f81d06a019d27e6 Mon Sep 17 00:00:00 2001 From: "FISAURA-PHUONGL\\quannn7" Date: Mon, 28 Aug 2023 17:32:06 +0700 Subject: [PATCH 015/184] add note tooltip in private name tag table --- .../private-name-tag/private-name-tag.component.html | 8 ++++---- .../tooltip-customize/tooltip-customize.component.scss | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index bad567edb..5c60ea5a4 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -69,10 +69,10 @@ {{ data[template.matColumnDef] | cutStringPipe : 8 : 8 }} - 
-                      {{ data.note || '-' }}
-
+
+ 
{{ data.note || '-' }}
+ +
{{ data[template.matColumnDef] }} diff --git a/src/app/shared/components/tooltip-customize/tooltip-customize.component.scss b/src/app/shared/components/tooltip-customize/tooltip-customize.component.scss index 54a519f8c..34ec65d5c 100644 --- a/src/app/shared/components/tooltip-customize/tooltip-customize.component.scss +++ b/src/app/shared/components/tooltip-customize/tooltip-customize.component.scss @@ -7,6 +7,7 @@ position: relative; text-transform: initial; font-size: 1.2rem; + max-width: 600px; &:before { content: ''; position: absolute; From caf31f9c95f1e5f452c2cecf76a7c09dd123a27b Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Mon, 11 Sep 2023 16:22:24 +0700 Subject: [PATCH 016/184] add token transfer --- .../token-transfer.component.html | 172 ++++++++++++++++++ .../token-transfer.component.scss | 0 .../token-transfer.component.ts | 42 +++++ .../transaction-detail.component.html | 12 ++ .../pages/transaction/transaction.module.ts | 13 +- 5 files changed, 236 insertions(+), 3 deletions(-) create mode 100644 src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html create mode 100644 src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss create mode 100644 src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html new file mode 100644 index 000000000..047858257 --- /dev/null +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -0,0 +1,172 @@ +
+
+
+ +
+
Fungible Token (FT) Transfer
+
Non-Fungible Token (FT) Transfer
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + +
+
+ +
+ +
+
+ {{ element.name | stringEllipsis : 30 }} +
+
+
+ +
+ + +
+
+ +
+
+ {{ element.name | stringEllipsis : 19 }} +
+ +
+
+ +
+ + +
+
+ {{ element.symbol }} +
+
+ 		+
+ Contract + + - +
+ 		+
+ Price +
+ ${{ +element.price | mask : 'separator.6' }} + | +
+ {{ element.isValueUp ? '↑' : '↓' }}{{ element.change | number : global.formatNumber2Decimal }}% + +
+
+
+ 		+ Amount + +
+ +
+
+ <0,001 +
+ +
+
+ 		+
+ Value + + + ${{ element.price * element.balance | number : global.formatNumber2Decimal }} + +
+ +
+
+
+ + + +
+ + +
+ +
+
+
diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts new file mode 100644 index 000000000..49cdfb4c9 --- /dev/null +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts @@ -0,0 +1,42 @@ +import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; +import { PageEvent } from '@angular/material/paginator'; +import { Router } from '@angular/router'; +import { PAGE_EVENT } from 'src/app/core/constants/common.constant'; +import { pipeTypeData } from 'src/app/core/constants/transaction.enum'; +import { Globals } from 'src/app/global/global'; +import { MatTableDataSource } from '@angular/material/table'; +import { TableTemplate } from 'src/app/core/models/common.model'; + +@Component({ + selector: 'app-token-transfer', + templateUrl: './token-transfer.component.html', + styleUrls: ['./token-transfer.component.scss'], + encapsulation: ViewEncapsulation.None, +}) +export class TokenTransferComponent implements OnInit { + @Input() isNFT: boolean; + // @Input() value: any; + // @Input() dataLink: any; + // @Input() denom: any = { display: null, decimal: 6 }; + // @Input() pipeType: string = ''; + + pipeTypeData = pipeTypeData; + dataSource = new MatTableDataSource([]); + pageData: PageEvent = { + length: PAGE_EVENT.LENGTH, + pageSize: 10, + pageIndex: 1, + }; + templates: Array = [ + { matColumnDef: 'asset', headerCellDef: 'asset' }, + { matColumnDef: 'contractAddress', headerCellDef: 'contractAddress' }, + { matColumnDef: 'price', headerCellDef: 'price' }, + { matColumnDef: 'amount', headerCellDef: 'amount' }, + { matColumnDef: 'value', headerCellDef: 'value' }, + ]; + displayedColumns: string[] = this.templates.map((dta) => dta.matColumnDef); + + constructor(public global: Globals, public router: Router) {} + + ngOnInit(): void {} +} diff --git a/src/app/pages/transaction/transaction-detail/transaction-detail.component.html b/src/app/pages/transaction/transaction-detail/transaction-detail.component.html index 8c15818a7..ad062e790 100644 --- a/src/app/pages/transaction/transaction-detail/transaction-detail.component.html +++ b/src/app/pages/transaction/transaction-detail/transaction-detail.component.html @@ -110,6 +110,18 @@

+ +

Token Transfer

+
+
+ +
+
+ +
+
+ +

Messages

Date: Mon, 11 Sep 2023 16:56:10 +0700 Subject: [PATCH 017/184] add token transfer --- .../token-transfer/token-transfer.component.html | 4 ++-- .../token-transfer/token-transfer.component.ts | 15 ++++----------- .../transaction-detail.component.html | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index 047858257..2b18f15a8 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -147,8 +147,8 @@
- + +
+ + + + + + +
+
+
+
+
More Info
+
+
+
+
+
Contract Type
+
{{ contractDetail.code?.type ?? '-' }}
+
+
+
Contract Version
+
{{ contractDetail.code?.code_id_verifications[0]?.compiler_version ?? '-' }}
+
+
+
Contract Creator
+
+ + + at txn + + {{ contractDetail?.tx_hash | cutStringPipe : 6 : 6 }} + +
+
diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss index 99b1f4126..a0f374378 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss @@ -1,30 +1,15 @@ -.box-contract-info { - table.aura-basic-table { - min-height: 224px; - tr, - td { - color: var(--aura-gray-1); - height: 56px; - padding: 0px var(--spacer-4); - } - - tr:first-child td:first-child { - width: 40%; - color: var(--aura-white); - } - } - - @media (max-width: 992px) { - margin-bottom: 16px; +.box-contract-overview { + .card__header { + padding: var(--spacer-4); + padding-bottom: 0; } - - @media (max-width: 414px) { - tr td { - width: 40%; - } + .card__body { + padding: var(--spacer-4); + padding-top: 0; } } + .box-name-tag { height: 26px; display: inline-flex; @@ -37,6 +22,7 @@ border-radius: 4px 0px 0px 4px; padding-left: var(--spacer-2); padding-right: var(--spacer-5); + color: var(--aura-gray-2); &.private-name-tag { padding: 0 var(--spacer-2); background-color: unset; diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.ts b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.ts index d2aa10398..7aceee5be 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.ts +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.ts @@ -1,8 +1,6 @@ import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; -import { LENGTH_CHARACTER } from 'src/app/core/constants/common.constant'; -import { TYPE_CW4973 } from 'src/app/core/constants/contract.constant'; -import { ContractRegisterType } from 'src/app/core/constants/contract.enum'; import { CommonService } from 'src/app/core/services/common.service'; +import {LENGTH_CHARACTER} from "src/app/core/constants/common.constant"; @Component({ selector: 'app-contract-info-card', @@ -10,22 +8,15 @@ import { CommonService } from 'src/app/core/services/common.service'; styleUrls: ['./contract-info-card.component.scss'], }) export class ContractInfoCardComponent implements OnInit, OnChanges { + @Input() type: 'information' | 'moreInfo' = 'information'; @Input() contractDetail: any; - contractRegisterType = ContractRegisterType; - linkNft = 'token-nft'; lengthNormalAddress = LENGTH_CHARACTER.ADDRESS; constructor(public commonService: CommonService) {} ngOnInit(): void {} - ngOnChanges(changes: SimpleChanges): void { - setTimeout(() => { - if (changes?.contractDetail?.currentValue?.name === TYPE_CW4973) { - this.linkNft = 'token-abt'; - } - }, 500); - } + ngOnChanges(changes: SimpleChanges): void {} extendLink(url) { url = url.match(/^https?:/) ? url : '//' + url; diff --git a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html index 5e69421ab..685a9c2ff 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html +++ b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html @@ -26,14 +26,28 @@

Contract

-
- +
+
+ +
-
- +
+
+ +
+
+ +
+
+ +
diff --git a/src/app/pages/contracts/contracts-detail/contracts-detail.component.scss b/src/app/pages/contracts/contracts-detail/contracts-detail.component.scss index 2073fb468..3fe254409 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-detail.component.scss +++ b/src/app/pages/contracts/contracts-detail/contracts-detail.component.scss @@ -11,3 +11,8 @@ width: 15px; height: 15px; } +::ng-deep .contract__card-info .card { + @media (min-width: 991.98px) { + min-height: 237px; + } +} diff --git a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html index e62373779..4707bd2b3 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html @@ -1,68 +1,67 @@
-
- - - - - - - - - - - - - - - - - - - - - - - -
-
-
Contract Overview
-
-
-
-
-
Balance: - - {{ denom }} -
-
Contract Creator:
-
- - - - at txn - - {{ contractDetail?.tx_hash | cutStringPipe : 6 : 6 }} +
+
Contract Overview
+
+
+
+ +
+
Value
+
+ + + (${{ global.price.aura | mask : 'separator.6' }}/{{ denom | uppercase }}) + +
+
+
+
Token Tracker
+
Contract Creator: - - - - at txn - - {{ contractDetail?.tx_hash | cutStringPipe : 8 : 8 }} + + {{ contractDetail?.cw721_contract?.name }} ({{ contractDetail?.cw721_contract?.symbol }}) -
Aura Value: - - - (${{ global.price.aura | mask : 'separator.6' }}/{{ denom | uppercase }}) - -
+ +
+
diff --git a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.scss b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.scss index a2a547e77..428c6bd39 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.scss +++ b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.scss @@ -1,65 +1,10 @@ .box-contract-overview { - table.aura-basic-table { - @media (min-width: 992px) { - min-height: 224px; - } - - tr, - td { - color: var(--aura-gray-1); - height: 56px; - padding: 0 var(--spacer-4); - } - - tr:first-child td:first-child { - width: 30%; - color: var(--aura-white); - } + .card__header { + padding: var(--spacer-4); + padding-bottom: 0; } - - .list-token .select-input-field { - background-color: var(--aura-bg-form); - width: 100%; - padding: 8px 16px; - height: 40px; - border: 1px solid var(--aura-dark-gray); - - @media (min-width: 992px) { - margin-right: 12px; - padding: 7px 22px 7px 24px; - } - - ::ng-deep mat-select-trigger { - display: inline-flex; - align-items: center; - } - } -} - -.selected-token__label { - margin-left: var(--spacer-2); - background: var(--aura-gradient-general); - color: var(--aura-black); - height: 20px; - font-size: 1.2rem; - line-height: 1.6rem; - display: inline-flex; - align-items: center; - justify-content: center; - border-radius: 4px; - padding: 0 var(--spacer-2); -} - -::ng-deep { - .aura-optional-panel.aura-optional-token-panel { - - .mat-option-text { - display: inline-flex; - align-items: center; - } - } - - .mat-select-value { - color: var(--aura-gray-1); + .card__body { + padding: var(--spacer-4); + padding-top: 0; } } diff --git a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.ts b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.ts index 22194d64a..32f11c623 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.ts +++ b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.ts @@ -5,6 +5,7 @@ import { ContractService } from 'src/app/core/services/contract.service'; import { TokenService } from 'src/app/core/services/token.service'; import { balanceOf } from 'src/app/core/utils/common/parsing'; import { Globals } from '../../../../global/global'; +import {ContractRegisterType} from "src/app/core/constants/contract.enum"; @Component({ selector: 'app-contracts-overview-card', @@ -16,7 +17,8 @@ export class ContractsOverviewCardComponent implements OnInit, OnChanges { contractBalance; contractPrice; priceToken = 0; - lengthNormalAddress = LENGTH_CHARACTER.ADDRESS; + contractRegisterType = ContractRegisterType; + linkNft = 'token-nft'; denom = this.environmentService.configValue.chain_info.currencies[0].coinDenom; constructor( diff --git a/src/app/pages/contracts/contracts-list/contracts-list.component.html b/src/app/pages/contracts/contracts-list/contracts-list.component.html index 2c6ece4d5..39dea5acc 100644 --- a/src/app/pages/contracts/contracts-list/contracts-list.component.html +++ b/src/app/pages/contracts/contracts-list/contracts-list.component.html @@ -149,11 +149,33 @@

Contracts

{{ (data[template.matColumnDef] | cutStringPipe : 16) || '-' }} + + + + {{ data['cw20_contract']?.name | stringEllipsis: 16}} + + + {{ data['cw721_contract']?.name | stringEllipsis: 16 }} + + + {{ data['cw721_contract']?.name | stringEllipsis: 16 }} + + - + diff --git a/src/app/pages/contracts/contracts-list/contracts-list.component.scss b/src/app/pages/contracts/contracts-list/contracts-list.component.scss index a94bc263f..433a01b56 100644 --- a/src/app/pages/contracts/contracts-list/contracts-list.component.scss +++ b/src/app/pages/contracts/contracts-list/contracts-list.component.scss @@ -22,17 +22,16 @@ text-overflow: ellipsis; } -.aura-table.contract-table th.mat-header-cell:nth-child(3) { - max-width: 130px; -} .aura-table.contract-table th.mat-header-cell:nth-child(1) { min-width: 220px; } - .aura-table.contract-table th.mat-header-cell:nth-child(5) { max-width: 150px; } +.aura-table.contract-table th.mat-header-cell:nth-child(7) { + max-width: 130px; +} .filter-group { overflow: auto; -ms-overflow-style: none; /* for Internet Explorer, Edge */ diff --git a/src/app/pages/contracts/contracts-list/contracts-list.component.ts b/src/app/pages/contracts/contracts-list/contracts-list.component.ts index d5bf4b8b3..8f485e0e3 100644 --- a/src/app/pages/contracts/contracts-list/contracts-list.component.ts +++ b/src/app/pages/contracts/contracts-list/contracts-list.component.ts @@ -20,15 +20,19 @@ import { CommonService } from 'src/app/core/services/common.service'; styleUrls: ['./contracts-list.component.scss'], }) export class ContractsListComponent implements OnInit, OnDestroy { + typeCW4973 = TYPE_CW4973; templates: Array = [ { matColumnDef: 'address', headerCellDef: 'Address', isUrl: '/contracts', isShort: true, isNameTag: true }, { matColumnDef: 'name', headerCellDef: 'Contract Name' }, - { matColumnDef: 'code_id', headerCellDef: 'Code ID' }, - { matColumnDef: 'type', headerCellDef: 'Type Contract' }, + { matColumnDef: 'label', headerCellDef: 'Label' }, { matColumnDef: 'compiler_version', headerCellDef: 'Version' }, - { matColumnDef: 'contract_verification', headerCellDef: 'Verified' }, + { matColumnDef: 'type', headerCellDef: 'Type' }, + { matColumnDef: 'token_tracker', headerCellDef: 'Token Tracker' }, + { matColumnDef: 'code_id', headerCellDef: 'Code ID' }, + // { matColumnDef: 'contract_verification', headerCellDef: 'Verified' }, { matColumnDef: 'creator', headerCellDef: 'Creator', isUrl: '/account', isShort: true, isNameTag: true }, ]; + contractRegisterType = ContractRegisterType; displayedColumns: string[] = this.templates.map((dta) => dta.matColumnDef); pageData: PageEvent = { length: PAGE_EVENT.LENGTH, diff --git a/src/app/shared/components/contract-table/contract-table.component.ts b/src/app/shared/components/contract-table/contract-table.component.ts index 6e196e239..89fecc294 100644 --- a/src/app/shared/components/contract-table/contract-table.component.ts +++ b/src/app/shared/components/contract-table/contract-table.component.ts @@ -24,7 +24,7 @@ export interface TableData { time: Date; from: string; to: string; - label: string; + // label: string; value: number; fee: number; gas_used: number; @@ -186,10 +186,10 @@ export class ContractTableComponent implements OnInit, OnChanges { break; } - const label = - contract.messages[0].sender === this.contractInfo?.contractsAddress - ? ContractTransactionType.OUT - : ContractTransactionType.IN; + // const label = + // contract.messages[0].sender === this.contractInfo?.contractsAddress + // ? ContractTransactionType.OUT + // : ContractTransactionType.IN; const tableDta: TableData = { txHash: contract.tx_hash, @@ -199,7 +199,7 @@ export class ContractTableComponent implements OnInit, OnChanges { blockId: contract.blockId, time: new Date(contract.timestamp), from, - label, + // label, to, value: balanceOf(value) || 0, fee: +contract.fee, From 58502affbfd77aaea76cd9ebf415432aa6b25e7f Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 12 Sep 2023 17:14:41 +0700 Subject: [PATCH 020/184] add token transfer --- src/app/core/services/transaction.service.ts | 44 +++ .../token-transfer.component.html | 301 +++++++++--------- .../token-transfer.component.scss | 15 + .../token-transfer.component.ts | 43 ++- .../transaction-detail.component.html | 9 +- .../transaction-detail.component.ts | 2 +- 6 files changed, 241 insertions(+), 173 deletions(-) diff --git a/src/app/core/services/transaction.service.ts b/src/app/core/services/transaction.service.ts index 503705ed0..634207c8a 100644 --- a/src/app/core/services/transaction.service.ts +++ b/src/app/core/services/transaction.service.ts @@ -189,4 +189,48 @@ export class TransactionService extends CommonService { }) .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null))); } + + getListTransferFromTx(height): Observable { + const operationsDoc = ` + query TxTransferDetail($height: Int) { + ${this.envDB} { + cw20_activity(where: {height: {_eq: $height}}) { + amount + from + to + cw20_contract { + smart_contract { + address + } + symbol + decimal + marketing_info + name + } + } + cw721_activity(where: {height: {_eq: $height}, cw721_contract: {smart_contract: {name: {_neq: "crates.io:cw4973"}}}}) { + from + to + cw721_token { + token_id + } + cw721_contract { + smart_contract { + address + } + } + } + } + } + `; + return this.http + .post(this.graphUrl, { + query: operationsDoc, + variables: { + height: height, + }, + operationName: 'TxTransferDetail', + }) + .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null))); + } } diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index 2b18f15a8..d0e17d997 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -1,172 +1,165 @@ -
-
-
- -
-
Fungible Token (FT) Transfer
-
Non-Fungible Token (FT) Transfer
-
- -
- - - - + + + + +
-
- +
+
+
+
+
+
+ Fungible Token (FT) Transfer +
+
+
+
+ + + + + + + - - - - + + + - + +
-
- Contract - - - -
+
+ {{ 'NO DATA' | translate }}
+
+
+ +
+ +
+ +
+
+
+
+
+
+ +
+
+ Non-Fungible Token (NFT) Transfer +
+
+
+
+ + + + + - - - - - - - -
-
- <0,001 -
- -
-
- - + - - - - - - - - - - - -
+
+ +
+
+
+ Token ID + {{ data?.cw721_token?.token_id }} +
+
+ +
+
+
- - -
-
- Price -
- ${{ +element.price | mask : 'separator.6' }} - | -
- {{ element.isValueUp ? '↑' : '↓' }}{{ element.change | number : global.formatNumber2Decimal }}% - +
+
+ From + +
+
+ To + +
+
+
+ +
+
-
-
- 		- Amount - -
+ 		-
- Value - - - ${{ element.price * element.balance | number : global.formatNumber2Decimal }} - -
- -
-
+
+ {{ 'NO DATA' | translate }} +
+
- - - -
- - -
- + +
+ +
+ +
-
- + +
diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss index e69de29bb..debcaa8bf 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss @@ -0,0 +1,15 @@ +.transfer-card { + height: 372px; + .table-token { + ::ng-deep table thead { + display: none; + } + } + .transfer-token-info { + flex-direction: column; + } + + .transfer-address-label { + width: 30px; + } +} \ No newline at end of file diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts index 67904337a..335dd4613 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts @@ -1,35 +1,56 @@ -import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { PageEvent } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { PAGE_EVENT } from 'src/app/core/constants/common.constant'; +import { EnvironmentService } from 'src/app/core/data-services/environment.service'; import { TableTemplate } from 'src/app/core/models/common.model'; -import { Globals } from 'src/app/global/global'; +import { TransactionService } from 'src/app/core/services/transaction.service'; @Component({ selector: 'app-token-transfer', templateUrl: './token-transfer.component.html', styleUrls: ['./token-transfer.component.scss'], - encapsulation: ViewEncapsulation.None, }) export class TokenTransferComponent implements OnInit { - @Input() isNFT: boolean; - dataSource = new MatTableDataSource([]); + @Input() height: Number; + image_s3 = this.environmentService.configValue.image_s3; + defaultLogoToken = this.image_s3 + 'images/icons/token-logo.png'; + dataSourceFTs = new MatTableDataSource([]); + dataSourceNFTs = new MatTableDataSource([]); pageData: PageEvent = { length: PAGE_EVENT.LENGTH, pageSize: 10, pageIndex: 1, }; templatesFTs: Array = [ - { matColumnDef: 'asset', headerCellDef: 'asset' }, - { matColumnDef: 'contractAddress', headerCellDef: 'contractAddress' }, - { matColumnDef: 'price', headerCellDef: 'price' }, + { matColumnDef: 'assets', headerCellDef: 'assets' }, { matColumnDef: 'amount', headerCellDef: 'amount' }, - { matColumnDef: 'value', headerCellDef: 'value' }, + { matColumnDef: 'transfer', headerCellDef: 'transfer' }, + ]; + + templatesNFTs: Array = [ + { matColumnDef: 'nft', headerCellDef: 'nft' }, + { matColumnDef: 'transfer', headerCellDef: 'transfer' }, + { matColumnDef: 'action', headerCellDef: 'action' }, ]; displayedColumnsFTs: string[] = this.templatesFTs.map((dta) => dta.matColumnDef); + displayedColumnsNFTs: string[] = this.templatesNFTs.map((dta) => dta.matColumnDef); - constructor(public global: Globals, public router: Router) {} + constructor( + private environmentService: EnvironmentService, + public router: Router, + private transactionService: TransactionService, + ) {} - ngOnInit(): void {} + ngOnInit(): void { + this.transactionService.getListTransferFromTx(this.height).subscribe((res) => { + if (res?.cw721_activity.length > 0) { + this.dataSourceNFTs.data = res.cw721_activity; + } + if (res.cw20_activity.length > 0) { + this.dataSourceFTs.data = res.cw20_activity; + } + }); + } } diff --git a/src/app/pages/transaction/transaction-detail/transaction-detail.component.html b/src/app/pages/transaction/transaction-detail/transaction-detail.component.html index 7a87840cb..435a10c03 100644 --- a/src/app/pages/transaction/transaction-detail/transaction-detail.component.html +++ b/src/app/pages/transaction/transaction-detail/transaction-detail.component.html @@ -112,13 +112,8 @@

Token Transfer

-
-
- -
-
- -
+
+
diff --git a/src/app/pages/transaction/transaction-detail/transaction-detail.component.ts b/src/app/pages/transaction/transaction-detail/transaction-detail.component.ts index 04451e21c..bd428b08b 100644 --- a/src/app/pages/transaction/transaction-detail/transaction-detail.component.ts +++ b/src/app/pages/transaction/transaction-detail/transaction-detail.component.ts @@ -97,7 +97,7 @@ export class TransactionDetailComponent implements OnInit { setTimeout(() => { const lengthChar = document.getElementById('contentError')?.innerText?.length; const widthContent = document.getElementById('contentError')?.offsetWidth; - + // cal width text/content if (lengthChar * 7.1 > widthContent * 3) { this.isDisplayMore = true; From 719b056b48228f415507ae56163a2c5a350e555a Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Wed, 13 Sep 2023 11:10:34 +0700 Subject: [PATCH 021/184] update UI --- .../contracts-detail.component.html | 8 ++++---- .../contracts-detail.component.scss | 2 +- .../contracts-overview-card.component.html | 4 ++-- .../summary-info/summary-info.component.scss | 8 -------- src/assets/icons/icons-svg/white/Copy.svg | 4 ++++ src/assets/icons/icons-svg/white/QrCode.svg | 9 +++++++++ src/assets/scss/custom.scss | 18 ++++++++++++++++++ 7 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 src/assets/icons/icons-svg/white/Copy.svg create mode 100644 src/assets/icons/icons-svg/white/QrCode.svg diff --git a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html index 685a9c2ff..5733a8b8f 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html +++ b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html @@ -7,17 +7,17 @@

Contract

-

contractDetail?.cw721_contract?.name && contractDetail?.cw721_contract?.symbol " - class="text--primary break-word" + class="text--primary break-word v-ellipsis--des" [routerLink]="['/tokens/' + linkNft, contractDetail?.address]"> {{ contractDetail?.cw721_contract?.name }} ({{ contractDetail?.cw721_contract?.symbol }}) diff --git a/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss b/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss index 38bae38c7..29927804a 100644 --- a/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss +++ b/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss @@ -227,14 +227,6 @@ text-overflow: ellipsis; } } - -.v-ellipsis { - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; -} .nav-tabs-proposal.aura-nav-tabs.nav-tabs { .nav-item { flex-grow: 0; diff --git a/src/assets/icons/icons-svg/white/Copy.svg b/src/assets/icons/icons-svg/white/Copy.svg new file mode 100644 index 000000000..3c128ea94 --- /dev/null +++ b/src/assets/icons/icons-svg/white/Copy.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/icons-svg/white/QrCode.svg b/src/assets/icons/icons-svg/white/QrCode.svg new file mode 100644 index 000000000..0ed026e83 --- /dev/null +++ b/src/assets/icons/icons-svg/white/QrCode.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss index acb708d00..79ddf9af1 100644 --- a/src/assets/scss/custom.scss +++ b/src/assets/scss/custom.scss @@ -761,3 +761,21 @@ body { background: url('../../assets/icons/icons-svg/white/error-notice.svg') center; background-size: cover; } + +.v-ellipsis { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +} + +.v-ellipsis--des { + @media (min-width: 991.98px) { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + } +} From e6a1fa9559dc327967a7b0f87f9dd73e00fe3cfd Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 13 Sep 2023 11:57:31 +0700 Subject: [PATCH 022/184] add token transfer --- .../token-transfer.component.html | 155 +++++++++++------- .../token-transfer.component.scss | 36 ++-- .../token-transfer.component.ts | 10 +- 3 files changed, 131 insertions(+), 70 deletions(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index d0e17d997..42a00fc03 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -1,20 +1,25 @@ -
+
-
+
Fungible Token (FT) Transfer
-
-
- - - - - + + + + +
-
+
+
+ + + + + + + - - - - - - -
@@ -27,52 +32,65 @@
{{ data.cw20_contract.symbol }} - {{ data.cw20_contract.name | stringEllipsis : 16 }} - {{ data.cw20_contract.name }} + {{ data.cw20_contract.name | stringEllipsis : 16 }} + {{ data.cw20_contract.name }} +
+ +
+ Amount + +
+ -
- Amount - -
- -
-
+
+
From - +
-
+
To - +
-
-
- {{ 'NO DATA' | translate }} -
-
+
+ {{ 'NO DATA' | translate }} +
+
-
+
@@ -84,27 +102,44 @@
- -
-
+
+
Non-Fungible Token (NFT) Transfer
-
+
- +
- @@ -153,7 +190,7 @@
+
diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss index debcaa8bf..1749a0252 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss @@ -1,15 +1,31 @@ .transfer-card { - height: 372px; - .table-token { - ::ng-deep table thead { - display: none; - } - } - .transfer-token-info { - flex-direction: column; + + .card-nodata, + .table-token { + height: 321px; + margin-bottom: 0; + overflow-y: auto; + + ::ng-deep table thead { + display: none; + } + + .hide-td { + display: none; } - .transfer-address-label { - width: 30px; + @media (max-width: 992px) { + .nft-list .mat-cell { + padding-right: 0 !important; + } } + } + + .transfer-token-info { + flex-direction: column; + } + + .transfer-address-label { + width: 30px; + } } \ No newline at end of file diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts index 335dd4613..116c9263d 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts @@ -1,8 +1,9 @@ +import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { Component, Input, OnInit } from '@angular/core'; import { PageEvent } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; -import { PAGE_EVENT } from 'src/app/core/constants/common.constant'; +import { NULL_ADDRESS, PAGE_EVENT } from 'src/app/core/constants/common.constant'; import { EnvironmentService } from 'src/app/core/data-services/environment.service'; import { TableTemplate } from 'src/app/core/models/common.model'; import { TransactionService } from 'src/app/core/services/transaction.service'; @@ -16,6 +17,7 @@ export class TokenTransferComponent implements OnInit { @Input() height: Number; image_s3 = this.environmentService.configValue.image_s3; defaultLogoToken = this.image_s3 + 'images/icons/token-logo.png'; + nullAddress = NULL_ADDRESS; dataSourceFTs = new MatTableDataSource([]); dataSourceNFTs = new MatTableDataSource([]); pageData: PageEvent = { @@ -36,11 +38,13 @@ export class TokenTransferComponent implements OnInit { ]; displayedColumnsFTs: string[] = this.templatesFTs.map((dta) => dta.matColumnDef); displayedColumnsNFTs: string[] = this.templatesNFTs.map((dta) => dta.matColumnDef); + breakpoint$ = this.layout.observe([Breakpoints.Small, Breakpoints.XSmall]); constructor( private environmentService: EnvironmentService, public router: Router, private transactionService: TransactionService, + private layout: BreakpointObserver, ) {} ngOnInit(): void { @@ -53,4 +57,8 @@ export class TokenTransferComponent implements OnInit { } }); } + + navigateToNFTDetail(address: string, tokenId: number): void { + this.router.navigate([`/tokens/token-nft/${address}/${tokenId}`]); + } } From f7866a514dac0f42f0e84f508579a3cfe75cf958 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 13 Sep 2023 14:42:20 +0700 Subject: [PATCH 023/184] label contract --- src/app/core/utils/common/validation.ts | 4 ++- .../account-detail.component.html | 11 +++--- .../account-detail.component.scss | 36 +++++++++++++++++++ .../account-detail.component.ts | 3 ++ 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/app/core/utils/common/validation.ts b/src/app/core/utils/common/validation.ts index b989b0c52..6be16e59d 100644 --- a/src/app/core/utils/common/validation.ts +++ b/src/app/core/utils/common/validation.ts @@ -1,3 +1,5 @@ +import { LENGTH_CHARACTER } from "../../constants/common.constant"; + const REGEX = { CONTRACT_ADDRESS: /aura([\w\d]+)/, }; @@ -6,7 +8,7 @@ export function isContract(adr: string): boolean { if (adr) { const regex = new RegExp(REGEX.CONTRACT_ADDRESS); - return regex.test(adr); + return (regex.test(adr) && adr.length === LENGTH_CHARACTER.CONTRACT); } return false; } diff --git a/src/app/pages/account/account-detail/account-detail.component.html b/src/app/pages/account/account-detail/account-detail.component.html index b07a6938f..10809307b 100644 --- a/src/app/pages/account/account-detail/account-detail.component.html +++ b/src/app/pages/account/account-detail/account-detail.component.html @@ -21,8 +21,8 @@
+
Contract
-
@@ -50,14 +50,13 @@

Account Info

target="_blank" [href]="extendLink(commonService.findUrlNameTag(currentAddress))" *ngIf="commonService.findUrlNameTag(currentAddress)"> - +
- +
diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index 6f18c7385..6e5cd37e3 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -137,11 +137,15 @@ section.account-detail { } } } + .contract-label { - height: 32px; + height: 20px; + @media (min-width: 991.98px) { + height: 32px; + } border-top-right-radius: 4px; border-bottom-right-radius: 4px; - display: flex; + display: inline-flex; align-items: center; justify-content: center; position: relative; @@ -154,12 +158,18 @@ section.account-detail { position: absolute; top: 0; bottom: 0; - left: -20px; + left: -10px; width: 0; height: 0; - border-top: 16px solid transparent; - border-bottom: 16px solid transparent; - border-right: 20px solid var(--aura-gray-9); + border-top: 10px solid transparent; + border-bottom: 10px solid transparent; + border-right: 10px solid var(--aura-gray-9); + @media (min-width: 991.98px) { + border-top: 16px solid transparent; + border-bottom: 16px solid transparent; + border-right: 20px solid var(--aura-gray-9); + left: -20px; + } } &::after { content: ''; @@ -168,8 +178,11 @@ section.account-detail { transform: translateY(-50%); width: 4px; height: 4px; - background-color: white; + background-color: var(--aura-gray-3); border-radius: 50%; - left: -6px; + left: 0px; + @media (min-width: 991.98px) { + left: -6px; + } } } \ No newline at end of file From df24ab9e8329234061e907f025cd49418b06abcf Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Wed, 13 Sep 2023 17:06:30 +0700 Subject: [PATCH 025/184] update UI (Mobile) --- .../contract-info-card.component.html | 40 +++++++++++++++---- .../contract-info-card.component.scss | 38 ++++++++++++++++-- .../contracts-detail.component.html | 6 +-- .../contracts-detail.component.scss | 3 ++ .../contracts-overview-card.component.html | 20 ++++++++-- .../contracts-overview-card.component.scss | 35 ++++++++++++++-- 6 files changed, 121 insertions(+), 21 deletions(-) diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html index f889a6a08..0ecad4445 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html @@ -1,10 +1,22 @@
-
-
+
+ -
-
+
+
Contract Name
{{ contractDetail.name }}
@@ -41,12 +53,24 @@
Information
-
-
+
+ -
-
+
+
Contract Type
{{ contractDetail.code?.type ?? '-' }}
diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss index a0f374378..f737c4a6c 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss @@ -1,11 +1,43 @@ .box-contract-overview { + border-radius: 0; + @media (min-width: 991.98px) { + border-radius: 12px; + } + &.moreInfo { + border-bottom-left-radius: var(--spacer-2); + border-bottom-right-radius: var(--spacer-2); + overflow: hidden; + } + .card__header { padding: var(--spacer-4); - padding-bottom: 0; + background-color: var(--aura-gray-9); + @media (min-width: 991.98px) { + padding-bottom: 0; + background-color: transparent; + } + &[aria-expanded='true'] { + img { + transform: rotate(180deg); + } + } } .card__body { - padding: var(--spacer-4); - padding-top: 0; + padding: 0 var(--spacer-4); + position: static !important; + background-color: var(--aura-gray-10) !important; + display: block !important; + border: none !important; + transition: all .35s ease-in-out; + overflow: hidden; + height: unset !important; + @media (max-width: 992px) { + max-height: 0; + &.show { + padding: var(--spacer-4); + max-height: 9999px; + } + } } } diff --git a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html index 5733a8b8f..8834cb85a 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html +++ b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html @@ -25,8 +25,8 @@

Contract

-
-
+
+
Contract
-
+
-
+
+ -
-
+
+
AURA Balance
diff --git a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.scss b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.scss index 428c6bd39..a7309b717 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.scss +++ b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.scss @@ -1,10 +1,39 @@ .box-contract-overview { + border-radius: 0; + border-top-left-radius: var(--spacer-2); + border-top-right-radius: var(--spacer-2); + overflow: hidden; + @media (min-width: 991.98px) { + border-radius: 12px; + } .card__header { padding: var(--spacer-4); - padding-bottom: 0; + background-color: var(--aura-gray-9); + @media (min-width: 991.98px) { + padding-bottom: 0; + background-color: transparent; + } + &[aria-expanded='true'] { + img { + transform: rotate(180deg); + } + } } .card__body { - padding: var(--spacer-4); - padding-top: 0; + padding: 0 var(--spacer-4); + position: static !important; + background-color: var(--aura-gray-10) !important; + display: block !important; + border: none !important; + transition: all .35s ease-in-out; + overflow: hidden; + height: unset !important; + @media (max-width: 992px) { + max-height: 0; + &.show { + padding: var(--spacer-4); + max-height: 9999px; + } + } } } From 1bacb8c2c380bc4e6f2901e828be8fa64865bcd3 Mon Sep 17 00:00:00 2001 From: mtam Date: Thu, 14 Sep 2023 14:36:13 +0700 Subject: [PATCH 026/184] [TamTM6] update private name tag --- src/app/app.component.ts | 12 +++--- src/app/core/services/name-tag.service.ts | 7 ++++ .../account-detail.component.html | 8 ++-- .../account-detail.component.scss | 19 +-------- .../account-detail.component.ts | 4 +- .../popup-name-tag.component.html | 8 ++-- .../popup-name-tag.component.scss | 3 ++ .../popup-name-tag.component.ts | 22 ++++++---- .../private-name-tag.component.html | 16 +++++-- .../private-name-tag.component.scss | 23 ++++++++++ .../private-name-tag.component.ts | 42 ++++++++++++++----- src/app/pages/profile/profile.component.html | 2 +- 12 files changed, 111 insertions(+), 55 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 7ec9b02e1..0eb7ae9bc 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -102,7 +102,7 @@ export class AppComponent implements OnInit { const enterpriseUrl = _.get(element, 'enterpriseUrl'); let privateData = privateName?.data?.find((k) => k.address === address); if (privateData) { - name_tag_private = privateData.name_tag; + name_tag_private = privateData.nameTag; isPrivate = true; } return { address, name_tag, isPrivate, enterpriseUrl, name_tag_private }; @@ -112,13 +112,13 @@ export class AppComponent implements OnInit { const isSameUser = (listTemp, privateName) => listTemp?.address === privateName.address; const onlyInLeft = (left, right, compareFunction) => left.filter((leftValue) => !right.some((rightValue) => compareFunction(leftValue, rightValue))); - const onlyInB = onlyInLeft(privateName?.data, listTemp, isSameUser); - onlyInB.forEach((element) => { - element['name_tag_private'] = element.name_tag; - element['name_tag'] = null; + const lstPrivate = onlyInLeft(privateName?.data, listTemp, isSameUser); + lstPrivate.forEach((element) => { + element['name_tag_private'] = element.nameTag; + element['nameTag'] = null; element['isPrivate'] = true; }); - const result = [...listTemp, ...onlyInB]; + const result = [...listTemp, ...lstPrivate]; this.globals.listNameTag = this.commonService.listNameTag = result; }); } diff --git a/src/app/core/services/name-tag.service.ts b/src/app/core/services/name-tag.service.ts index 5693937d1..2eb98c1d1 100644 --- a/src/app/core/services/name-tag.service.ts +++ b/src/app/core/services/name-tag.service.ts @@ -32,4 +32,11 @@ export class NameTagService extends CommonService { const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); return this.http.patch(`${this.apiUrl}/user/private-name-tag/${payload.id}`, params); } + + getListPrivateNameTagNextKey(payload) { + const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); + return this.http.get(`${this.apiUrl}/private-name-tag`, { + params, + }); + } } diff --git a/src/app/pages/account/account-detail/account-detail.component.html b/src/app/pages/account/account-detail/account-detail.component.html index 8a9667e24..185a7c8ac 100644 --- a/src/app/pages/account/account-detail/account-detail.component.html +++ b/src/app/pages/account/account-detail/account-detail.component.html @@ -34,7 +34,7 @@

Account Info

{{ commonService.setNameTag(currentAddress, null, false) || '-' }} @@ -56,7 +56,7 @@

Account Info

+ [content]="'Public name: ' + commonService.setNameTag(currentAddress, null, false)">
@@ -80,7 +80,9 @@

Account Info

- +
diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index 5a6bf9644..ee9d7f439 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -4,24 +4,7 @@ section.account-detail { border-top-left-radius: 12px; border-top-right-radius: 12px; } - form.search-form { - .input-group { - background-color: var(--aura-bg-form); - } - input { - width: 100%; - @media (min-width: 992px) { - width: 150px; - } - @media (min-width: 1200px) { - width: 250px; - } - @media (min-width: 1440px) { - width: 405px; - } - } - } - .box-account-info{ + .box-account-info { flex-grow: 1; min-height: 228px; padding: 24px; 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 55189cf56..3a1e0ca11 100644 --- a/src/app/pages/account/account-detail/account-detail.component.ts +++ b/src/app/pages/account/account-detail/account-detail.component.ts @@ -228,9 +228,11 @@ export class AccountDetailComponent implements OnInit { return url; } - editPrivateName() { + editPrivateName(nameTag = null) { const userEmail = localStorage.getItem('userEmail'); + const dataNameTag = this.global.listNameTag?.find((k) => k.address === this.currentAddress); if (userEmail) { + localStorage.setItem('setAddressNameTag', JSON.stringify(dataNameTag)); this.router.navigate(['/profile'], { queryParams: { tab: 'private' } }); } else { this.router.navigate(['/login']); diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index dba88c472..89e4ff2bf 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -1,7 +1,7 @@
-
{{ data ? 'Edit' : 'Create' }} Private Name Tag
+
{{ isEditMode ? 'Edit' : 'Create' }} Private Name Tag
@@ -103,7 +103,7 @@
- Character limit: {{ privateNameForm.value.name?.length }}/{{ maxLengthNameTag }}
+ Character limit: {{ privateNameForm.value?.name?.length || 0 }}/{{ maxLengthNameTag }}
Set private name tag to easily identify this address in Aurascan only from your view
@@ -121,7 +121,7 @@ (blur)="isError = false" [maxLength]="maxLengthNote" placeholder="Enter note" - class="form-check-input col-12 text-area" + class="form-check-input col-12 text-area txt-note" style="height: auto">
@@ -146,7 +146,7 @@ (click)="onSubmit()" [disabled]="privateNameForm.status === 'INVALID' || !isValidAddress || isError"> - {{ data ? 'Edit' : 'Create' }} + {{ isEditMode ? 'Edit' : 'Create' }}
diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss index 7c00e7124..b93ca588c 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss @@ -46,6 +46,9 @@ background: var(--aura-gray-8); } } + .txt-note { + width: -webkit-fill-available; + } } ::ng-deep { .mat-slide-toggle-thumb { diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 98921717e..5799ab0c1 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -25,6 +25,8 @@ export class PopupNameTagComponent implements OnInit { publicNameTag = '-'; isValidAddress = false; isError = false; + isEditMode = false; + idEdit = null; nameTagType = { Account: 'account', @@ -68,12 +70,18 @@ export class PopupNameTagComponent implements OnInit { } setDataFrom(data) { + if (data.nameTag || data.name_tag_private) { + this.isEditMode = true; + this.idEdit = this.data.id || data.id; + } + this.isValidAddress = true; - this.privateNameForm.controls['isFavorite'].setValue(data.isFavorite); - this.privateNameForm.controls['isAccount'].setValue(data.type === 'account' ? true : false); - this.isAccount = data.type === 'account' ? true : false; + const isAccount = data.address?.length === LENGTH_CHARACTER.ADDRESS ? true : false; + this.privateNameForm.controls['isAccount'].setValue(isAccount); + this.isAccount = isAccount; + this.privateNameForm.controls['isFavorite'].setValue(data.isFavorite || false); this.privateNameForm.controls['address'].setValue(data.address); - this.privateNameForm.controls['name'].setValue(data.nameTag); + this.privateNameForm.controls['name'].setValue(data.nameTag || data.name_tag_private); this.privateNameForm.controls['note'].setValue(data.note); this.checkPublicNameTag(); } @@ -100,16 +108,16 @@ export class PopupNameTagComponent implements OnInit { this.isSubmit = true; const { isFavorite, isAccount, address, name, note } = this.privateNameForm.value; - const payload = { + let payload = { isFavorite: isFavorite, type: isAccount ? this.nameTagType.Account : this.nameTagType.Contract, address: address, nameTag: name, note: note, - id: this.data.id, + id: this.idEdit, }; - if (this.data) { + if (this.isEditMode) { this.editPrivateName(payload); } else { this.createPrivateName(payload); diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 64e1c2ef4..88ff13de6 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -55,13 +55,17 @@
+
-
+
Token ID {{ data?.cw721_token?.token_id }}
+
+ {{ data?.cw721_token?.token_id }} +
+ +
+
@@ -116,26 +151,28 @@
From - +
To - +
-
- -
+ +
+ +
+
-
- +
+
@@ -76,7 +80,11 @@ style="max-width: 200px; width: fit-content" >{{ data.note || '-' }} - + +
@@ -98,7 +106,7 @@ (click)="openPopup(data)">
-
+
diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss index 7b3211f28..9247448d8 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss @@ -47,3 +47,26 @@ display: flex; align-items: center; } + + +::ng-deep { + .txt-note { + pre { + max-width: 400px; + word-break: break-all; + white-space: pre-line; + color: white; + margin-bottom: 0; + } + &:before { + top: 100% !important; + transform: translate(-50%, 0) !important; + width: 0 !important; + height: 0 !important; + border-left: 8px solid transparent !important; + border-right: 8px solid transparent !important; + border-top: 10px solid var(--aura-gray-8) !important; + border-bottom: unset !important; + } + } +} \ No newline at end of file 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 2191186d3..c0c2550d7 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 @@ -13,6 +13,7 @@ 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 { isContract } from 'src/app/core/utils/common/validation'; @Component({ selector: 'app-private-name-tag', @@ -46,6 +47,8 @@ export class PrivateNameTagComponent implements OnInit { destroy$ = new Subject(); dataSource: MatTableDataSource = new MatTableDataSource([]); dataTable = []; + nextKey = null; + currentKey = null; constructor( public commonService: CommonService, @@ -63,6 +66,13 @@ export class PrivateNameTagComponent implements OnInit { } ngOnInit(): void { + const dataNameTag = localStorage.getItem('setAddressNameTag'); + if (dataNameTag) { + const data = JSON.parse(dataNameTag); + this.openPopup(data); + localStorage.removeItem('setAddressNameTag'); + } + this.commonService.listNameTag = this.global.listNameTag; this.getListPrivateName(); } @@ -76,11 +86,6 @@ export class PrivateNameTagComponent implements OnInit { this.onKeyUp(); } - pageEvent(e: PageEvent): void { - this.pageData.pageIndex = e.pageIndex; - this.getListPrivateName(); - } - getListPrivateName(nextKey = null) { this.textSearch = this.textSearch?.trim(); const payload = { @@ -88,10 +93,16 @@ export class PrivateNameTagComponent implements OnInit { keyword: this.textSearch, }; - this.nameTagService.getListPrivateNameTag(payload).subscribe((res) => { - this.countFav = res.data?.filter((k) => k.isFavorite === 1)?.length || 0; - this.dataSource.data = res.data; - this.pageData.length = res?.meta?.count || 0; + this.nameTagService.getListPrivateNameTagNextKey(payload).subscribe((res) => { + if (res.data?.nameTags?.length >= 100) { + this.nextKey = res.data[res.data?.nameTags?.length - 1].id; + } + this.countFav = res.data?.nameTags?.filter((k) => k.isFavorite === 1)?.length || 0; + res.data?.nameTags.forEach((element) => { + element['type'] = isContract(element.address) ? 'contract' : 'account'; + }); + this.dataSource.data = res.data?.nameTags; + this.pageData.length = res?.data?.count || 0; }); } @@ -144,8 +155,6 @@ export class PrivateNameTagComponent implements OnInit { }); } - editPrivateNameTag() {} - updateFavorite(data) { const payload = { id: data.id, @@ -162,4 +171,15 @@ export class PrivateNameTagComponent implements OnInit { paginatorEmit(event): void { this.dataSource.paginator = event; } + + pageEvent(e: PageEvent): void { + const { length, pageIndex, pageSize } = e; + const next = length <= (pageIndex + 2) * pageSize; + this.pageData = e; + + if (next && this.nextKey && this.currentKey !== this.nextKey) { + this.getListPrivateName(this.nextKey); + this.currentKey = this.nextKey; + } + } } diff --git a/src/app/pages/profile/profile.component.html b/src/app/pages/profile/profile.component.html index bff7f1891..b0d58b163 100644 --- a/src/app/pages/profile/profile.component.html +++ b/src/app/pages/profile/profile.component.html @@ -4,7 +4,7 @@
-
Profile
+
Profile
Date: Thu, 14 Sep 2023 15:09:38 +0700 Subject: [PATCH 027/184] display set private name --- .../contract-info-card.component.html | 92 +++++++++---------- 1 file changed, 43 insertions(+), 49 deletions(-) diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html index 0ecad4445..0e524393c 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html @@ -1,93 +1,87 @@
-
-
-
+
diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 1a90ba722..e8d02f1fe 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -30,6 +30,7 @@ id="account" class="radio-box radio-box--dark" [checked]="isAccount" + [disabled]="isEditMode" (change)="changeType(true)" /> @@ -40,6 +41,7 @@ id="contract" class="radio-box radio-box--dark" [checked]="!isAccount" + [disabled]="isEditMode" (change)="changeType(false)" /> @@ -65,9 +67,9 @@
-
+
+ {{ getAddress.value }}
diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 0fdca33b0..2ee852325 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -115,7 +115,7 @@ export class PopupNameTagComponent implements OnInit { const { isFavorite, isAccount, address, name, note } = this.privateNameForm.value; let payload = { - isFavorite: isFavorite, + isFavorite: isFavorite == 1 ? true : false, type: isAccount ? this.nameTagType.Account : this.nameTagType.Contract, address: address, nameTag: name, diff --git a/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.html b/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.html index 8a9f0538a..bba0485b8 100644 --- a/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.html +++ b/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.html @@ -83,7 +83,7 @@ [content]="'Private name: ' + commonService.setNameTag(userAddress)"> + (click)="editPrivateName()">
diff --git a/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.ts b/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.ts index 5bf715ec1..310c70dcb 100644 --- a/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.ts +++ b/src/app/pages/soulbound-token/soulbound-account-token-list/soulbound-account-token-list.component.ts @@ -113,7 +113,7 @@ export class SoulboundAccountTokenListComponent implements OnInit { return url; } - editPrivateName(nameTag = null) { + editPrivateName() { const userEmail = localStorage.getItem('userEmail'); const dataNameTag = this.global.listNameTag?.find((k) => k.address === this.userAddress); if (userEmail) { From 720c9666bd01213b7a30f2b4cc5269738e564ba9 Mon Sep 17 00:00:00 2001 From: mtam Date: Mon, 18 Sep 2023 13:29:59 +0700 Subject: [PATCH 032/184] [TamTM6] fix bug check is address (cherry picked from commit 5185f95d1fe97219af4b3a256aef46c654558dfb) --- src/app/core/utils/common/validation.ts | 7 +++++++ .../soulbound-token-create-popup.component.ts | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/core/utils/common/validation.ts b/src/app/core/utils/common/validation.ts index d4ddb23c5..4c356cbc3 100644 --- a/src/app/core/utils/common/validation.ts +++ b/src/app/core/utils/common/validation.ts @@ -10,3 +10,10 @@ export function isContract(adr: string): boolean { } return false; } + +export function isAddress(adr: string): boolean { + if (adr?.startsWith('aura') && adr?.length === LENGTH_CHARACTER.ADDRESS) { + return true; + } + return false; +} diff --git a/src/app/pages/soulbound-token/soulbound-token-create-popup/soulbound-token-create-popup.component.ts b/src/app/pages/soulbound-token/soulbound-token-create-popup/soulbound-token-create-popup.component.ts index 1c459d537..e6647217e 100644 --- a/src/app/pages/soulbound-token/soulbound-token-create-popup/soulbound-token-create-popup.component.ts +++ b/src/app/pages/soulbound-token/soulbound-token-create-popup/soulbound-token-create-popup.component.ts @@ -5,7 +5,7 @@ import { EnvironmentService } from 'src/app/core/data-services/environment.servi import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; import { SoulboundService } from 'src/app/core/services/soulbound.service'; import { WalletService } from 'src/app/core/services/wallet.service'; -import { isContract } from 'src/app/core/utils/common/validation'; +import { isAddress, isContract } from 'src/app/core/utils/common/validation'; @Component({ selector: 'app-soulbound-token-create-popup', @@ -55,7 +55,7 @@ export class SoulboundTokenCreatePopupComponent implements OnInit { soulboundTokenURI = soulboundTokenURI.trim(); receiverAddress = receiverAddress.trim(); - if (!isContract(receiverAddress)) { + if (!isAddress(receiverAddress)) { this.isAddressInvalid = true; return; } From 8b7a2f17097a5faa2191c4227cceb8c0158f6f4b Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Mon, 18 Sep 2023 15:32:11 +0700 Subject: [PATCH 033/184] update quota --- .../pages/profile/popup-name-tag/popup-name-tag.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 2ee852325..3e8287da0 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -46,8 +46,6 @@ export class PopupNameTagComponent implements OnInit { ) {} ngOnInit(): void { - //set temp quota = 100 - this.quota = 100; this.formInit(); if (this.data?.address) { this.setDataFrom(this.data); From e9151117cbbddef6466331461e52e4960d06c06b Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Mon, 18 Sep 2023 15:52:50 +0700 Subject: [PATCH 034/184] update code --- .../contracts-detail.component.html | 22 +++++++++---------- .../popup-common/popup-common.component.html | 7 ------ src/assets/icons/icons-svg/white/Copy.svg | 4 ---- src/assets/icons/icons-svg/white/QrCode.svg | 9 -------- 4 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 src/assets/icons/icons-svg/white/Copy.svg delete mode 100644 src/assets/icons/icons-svg/white/QrCode.svg diff --git a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html index 8834cb85a..fbadc8f80 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html +++ b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html @@ -11,16 +11,12 @@

Contract

#tooltip (click)="commonService.showToolTip(tooltip)" [cdkCopyToClipboard]="contractAddress"> - +
@@ -29,24 +25,26 @@

Contract

+ [contractDetail]="contractDetail" + *ngIf="contractDetail">
+ [type]="'information'" + [contractDetail]="contractDetail" + *ngIf="contractDetail">
+ [type]="'moreInfo'" + [contractDetail]="contractDetail" + *ngIf="contractDetail">
diff --git a/src/app/shared/components/popup-common/popup-common.component.html b/src/app/shared/components/popup-common/popup-common.component.html index 3038ebd0e..b18f549cb 100644 --- a/src/app/shared/components/popup-common/popup-common.component.html +++ b/src/app/shared/components/popup-common/popup-common.component.html @@ -1,7 +1,6 @@
- {{ data.title }}
{{ data.content }} -
diff --git a/src/assets/icons/icons-svg/white/Copy.svg b/src/assets/icons/icons-svg/white/Copy.svg deleted file mode 100644 index 3c128ea94..000000000 --- a/src/assets/icons/icons-svg/white/Copy.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/icons/icons-svg/white/QrCode.svg b/src/assets/icons/icons-svg/white/QrCode.svg deleted file mode 100644 index 0ed026e83..000000000 --- a/src/assets/icons/icons-svg/white/QrCode.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - From af4c8f39b46469ca1bcb458fe8c674926405876d Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Mon, 18 Sep 2023 16:24:25 +0700 Subject: [PATCH 035/184] fix margin button --- .../contract-info-card/contract-info-card.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html index 9efa13200..f1f8f5827 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html @@ -50,7 +50,7 @@
Information
Private Name Tag
- Character limit: {{ privateNameForm.value.note?.length }}/{{ maxLengthNote }}
+ Character limit: {{ privateNameForm.value.note?.length || 0 }}/{{ maxLengthNote }}
A personal note of this address. Kindly note that DO NOT input any passwords or private key here
From 120fdeeb473c85e84a694b028d45774f63420905 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Mon, 18 Sep 2023 16:38:34 +0700 Subject: [PATCH 037/184] update UI --- .../private-name-tag/private-name-tag.component.html | 2 +- .../profile/private-name-tag/private-name-tag.component.ts | 6 ++++-- .../components/popup-common/popup-common.component.html | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index a7d5310b9..9599b7dbe 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -108,7 +108,7 @@
- +
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 b54244451..bd50f7978 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 @@ -9,11 +9,11 @@ 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'; import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; +import { isContract } from 'src/app/core/utils/common/validation'; 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 { isContract } from 'src/app/core/utils/common/validation'; @Component({ selector: 'app-private-name-tag', @@ -130,7 +130,9 @@ export class PrivateNameTagComponent implements OnInit { panelClass: 'sizeNormal', data: { title: 'Remove Private Name Tag', - content: 'Are you sure to remove private name tag for the address ' + data.address + ' ' + data.nameTag + ' ?', + content: + 'Are you sure to remove private name tag for the address ' + data.address + ' (' + data.nameTag + ') ?', + class: 'text--gray-1', }, }); diff --git a/src/app/shared/components/popup-common/popup-common.component.html b/src/app/shared/components/popup-common/popup-common.component.html index b18f549cb..8dd09946e 100644 --- a/src/app/shared/components/popup-common/popup-common.component.html +++ b/src/app/shared/components/popup-common/popup-common.component.html @@ -11,7 +11,7 @@ class="cursor-pointer ml-10" (click)="closeDialog()" /> -
+
{{ data.content }}
From fa8be2d3766587004edce10bd1781e403dc7fc5c Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 19 Sep 2023 09:34:31 +0700 Subject: [PATCH 038/184] update UI --- .../popup-name-tag.component.html | 2 +- .../private-name-tag.component.html | 10 ++-- .../private-name-tag.component.scss | 2 +- .../private-name-tag.component.ts | 57 ++++++++++++------- 4 files changed, 44 insertions(+), 27 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index e82dd7443..067f022d5 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -74,7 +74,7 @@ placeholder="aura..." class="input-address" (change)="checkPublicNameTag()" - (blur)="checkFormValid(); isError = false" + (input)="checkFormValid(); isError = false" autocomplete="off" />
{{ getAddress.value }} diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 9599b7dbe..7044355b4 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -19,7 +19,7 @@ class="form-control pl-0" placeholder="Search for Address or Name tag" [(ngModel)]="textSearch" - [maxLength]="35" + [maxLength]="maxLengthSearch" (keyup)="onKeyUp()" name="search" autocomplete="off" /> @@ -70,16 +70,16 @@ *ngIf="data.isFavorite" />
- + {{ data[template.matColumnDef] | cutStringPipe : 8 : 8 }}
{{ data.note || '-' }}
+ style="max-width: 200px; width: fit-content"> + {{ data.note || '-' }} +
= [ { matColumnDef: 'favorite', headerCellDef: 'Fav', headerWidth: 8 }, { matColumnDef: 'address', headerCellDef: 'Address', headerWidth: 12 }, @@ -41,7 +35,13 @@ export class PrivateNameTagComponent implements OnInit { { matColumnDef: 'action', headerCellDef: '', headerWidth: 8 }, ]; displayedColumns: string[] = this.templates.map((dta) => dta.matColumnDef); - + countFav = 0; + modalReference: any; + pageData: PageEvent = { + length: PAGE_EVENT.LENGTH, + pageSize: 5, + pageIndex: PAGE_EVENT.PAGE_INDEX, + }; textSearch = ''; searchSubject = new Subject(); destroy$ = new Subject(); @@ -49,6 +49,7 @@ export class PrivateNameTagComponent implements OnInit { dataTable = []; nextKey = null; currentKey = null; + maxLengthSearch = MAX_LENGTH_SEARCH_TOKEN; constructor( public commonService: CommonService, @@ -56,14 +57,8 @@ export class PrivateNameTagComponent implements OnInit { private dialog: MatDialog, private toastr: NgxToastrService, private global: Globals, - ) { - this.searchSubject - .asObservable() - .pipe(debounceTime(500), takeUntil(this.destroy$)) - .subscribe(() => { - this.pageChange.selectPage(0); - }); - } + private router: Router, + ) {} ngOnInit(): void { const dataNameTag = localStorage.getItem('setAddressNameTag'); @@ -75,6 +70,18 @@ export class PrivateNameTagComponent implements OnInit { this.commonService.listNameTag = this.global.listNameTag; this.getListPrivateName(); + this.searchSubject + .asObservable() + .pipe(debounceTime(500), takeUntil(this.destroy$)) + .subscribe(() => { + this.pageChange.selectPage(0); + }); + } + + ngOnDestroy(): void { + // throw new Error('Method not implemented.'); + this.destroy$.next(); + this.destroy$.complete(); } onKeyUp() { @@ -120,7 +127,7 @@ export class PrivateNameTagComponent implements OnInit { if (result) { setTimeout(() => { this.getListPrivateName(); - }, 1000); + }, 4000); } }); } @@ -182,6 +189,16 @@ export class PrivateNameTagComponent implements OnInit { if (next && this.nextKey && this.currentKey !== this.nextKey) { this.getListPrivateName(this.nextKey); this.currentKey = this.nextKey; + } else { + this.getListPrivateName(); + } + } + + navigateAddress(address): void { + if (isContract(address)) { + this.router.navigate(['/contracts', address]); + } else { + this.router.navigate(['/account', address]); } } } From 5187db2bed1d6617ec2e17c773b93fefe97127cc Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 19 Sep 2023 10:14:59 +0700 Subject: [PATCH 039/184] fix UI --- .../contract-info-card.component.html | 12 +++--------- .../popup-name-tag/popup-name-tag.component.html | 2 +- .../private-name-tag/private-name-tag.component.html | 6 +++--- .../shared/components/name-tag/name-tag.component.ts | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html index f1f8f5827..c9a97e79c 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html @@ -57,8 +57,8 @@
Information
-
+ class="mt-2 d-inline-flex box-private align-items-center text--white"> +
{{ commonService.setNameTag(contractDetail?.address) || '-' }} @@ -69,13 +69,7 @@
Information
- - - +
diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 067f022d5..547b12d9f 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -79,7 +79,7 @@ {{ getAddress.value }}
Invalid aura address format
diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 7044355b4..7c4ceb83c 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -2,7 +2,7 @@
Private name tag
@@ -47,7 +47,7 @@
+ [content]="'Click the star icon to mark your favorite address
on the top of the list'" [class]="'fw-normal'">
@@ -78,7 +78,7 @@ class="text--gray-5 ellipsis-text" [class.aura-tooltip-object]="data.note" style="max-width: 200px; width: fit-content"> - {{ data.note || '-' }} + {{ data.note || 'Note:-' }} Date: Tue, 19 Sep 2023 10:29:41 +0700 Subject: [PATCH 040/184] fix ui --- .../account-detail/account-detail.component.html | 14 ++++++-------- .../account-detail/account-detail.component.scss | 3 +++ .../popup-name-tag/popup-name-tag.component.scss | 3 +++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/pages/account/account-detail/account-detail.component.html b/src/app/pages/account/account-detail/account-detail.component.html index 02736d57a..1c743b3ed 100644 --- a/src/app/pages/account/account-detail/account-detail.component.html +++ b/src/app/pages/account/account-detail/account-detail.component.html @@ -29,13 +29,15 @@
- Contract +
+ Contract +
- {{ currentAddress }} + {{ currentAddress }}
@@ -99,12 +101,8 @@

Account Info

- + [content]="'Private name: ' + commonService.setNameTag(currentAddress)"> +
diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index 525fcb585..0a9d26431 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -182,4 +182,7 @@ section.account-detail { left: -6px; } } + a:hover { + color: var(--aura-primary) !important; + } } \ No newline at end of file diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss index b93ca588c..1ccfd07d9 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss @@ -35,6 +35,9 @@ background-color: var(--aura-gray-10) !important; padding: var(--spacer-4); border-radius: var(--spacer-2); + &::placeholder{ + color: var(--aura-gray-4); + } } .btn { height: 40px; From 8d9f7b510c39d76a43be96b80cb134888cbdafad Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 19 Sep 2023 10:40:16 +0700 Subject: [PATCH 041/184] fix ui --- .../token-transfer/token-transfer.component.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss index 1749a0252..5fd2829bd 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss @@ -2,10 +2,16 @@ .card-nodata, .table-token { - height: 321px; + height: 192px; margin-bottom: 0; overflow-y: auto; + .aura-table { + tr.mat-row { + height: 64px; + } + } + ::ng-deep table thead { display: none; } From 50bed894c9e23651103b93dd2ed194a0268cc9b3 Mon Sep 17 00:00:00 2001 From: mtam Date: Tue, 19 Sep 2023 10:42:38 +0700 Subject: [PATCH 042/184] [TamTM6] update layout name tag --- .../account-detail.component.scss | 21 +++++++++++-------- .../private-name-tag.component.ts | 8 +++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index 525fcb585..c24909586 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -7,9 +7,12 @@ section.account-detail { .box-account-info { flex-grow: 1; min-height: 228px; - padding: 24px; + padding: 20px; @media (max-width: 1366px) { padding: 12px; + .private-name-tag { + font-size: 1.2rem; + } } @media (max-width: 992px) { padding: 16px; @@ -138,7 +141,7 @@ section.account-detail { .contract-label { height: 20px; @media (min-width: 991.98px) { - height: 32px; + height: 32px; } border-top-right-radius: 4px; border-bottom-right-radius: 4px; @@ -156,15 +159,15 @@ section.account-detail { top: 0; bottom: 0; left: -10px; - width: 0; - height: 0; + width: 0; + height: 0; border-top: 10px solid transparent; - border-bottom: 10px solid transparent; - border-right: 10px solid var(--aura-gray-9); + border-bottom: 10px solid transparent; + border-right: 10px solid var(--aura-gray-9); @media (min-width: 991.98px) { border-top: 16px solid transparent; - border-bottom: 16px solid transparent; - border-right: 20px solid var(--aura-gray-9); + border-bottom: 16px solid transparent; + border-right: 20px solid var(--aura-gray-9); left: -20px; } } @@ -182,4 +185,4 @@ section.account-detail { left: -6px; } } -} \ No newline at end of file +} 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 b0a6bc81f..8ef9170a7 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 @@ -97,7 +97,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.textSearch = this.textSearch?.trim(); const payload = { limit: 100, - keyword: this.textSearch, + keyword: this.textSearch || '', }; this.nameTagService.getListPrivateNameTagNextKey(payload).subscribe((res) => { @@ -144,7 +144,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { }); dialogRef.afterClosed().subscribe((result) => { - if (result !== 'canceled') { + if (result && result !== 'canceled') { this.deleteNameTag(data.id); } }); @@ -160,7 +160,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.toastr.successWithTitle('Private name tag removed!', 'Success'); setTimeout(() => { this.getListPrivateName(); - }, 500); + }, 1000); }); } @@ -173,7 +173,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.nameTagService.updatePrivateNameTag(payload).subscribe((res) => { setTimeout(() => { this.getListPrivateName(); - }, 500); + }, 1000); }); } From 73fb1f696895d604981ba351466beef2a06e2d3a Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 19 Sep 2023 11:03:42 +0700 Subject: [PATCH 043/184] update UI --- .../token-transfer/token-transfer.component.html | 3 ++- .../components/table-no-data/table-no-data.component.scss | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index 42a00fc03..1db6a1fd4 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -93,7 +93,8 @@
+ [img]="'assets/images/notFoundNFT.png'" + [class]="'img-height'">
diff --git a/src/app/shared/components/table-no-data/table-no-data.component.scss b/src/app/shared/components/table-no-data/table-no-data.component.scss index e69de29bb..57a7307f1 100644 --- a/src/app/shared/components/table-no-data/table-no-data.component.scss +++ b/src/app/shared/components/table-no-data/table-no-data.component.scss @@ -0,0 +1,3 @@ +.img-height { + height: 110px; +} \ No newline at end of file From 4e4e83922191bb304740079ba1fe4470c7b69e4b Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 19 Sep 2023 11:19:38 +0700 Subject: [PATCH 044/184] update UI --- .../token-transfer/token-transfer.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index 1db6a1fd4..7ce61bdd5 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -194,7 +194,8 @@
+ [img]="'assets/images/notFoundNFT.png'" + [class]="'img-height'"> From cd813a5494f1fdab442a9523eae3e96025396b74 Mon Sep 17 00:00:00 2001 From: mtam Date: Tue, 19 Sep 2023 11:36:42 +0700 Subject: [PATCH 045/184] [TamTM6] update data close popup --- .../profile/popup-name-tag/popup-name-tag.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 3e8287da0..effd2a66c 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -87,8 +87,8 @@ export class PopupNameTagComponent implements OnInit { this.checkPublicNameTag(); } - closeDialog(hash = null) { - this.dialogRef.close(hash); + closeDialog(status = null) { + this.dialogRef.close(status); } checkFormValid() { @@ -143,7 +143,7 @@ export class PopupNameTagComponent implements OnInit { return; } - this.closeDialog(); + this.closeDialog(true); this.toastr.successWithTitle('Private name tag created!', 'Success'); }, error: (error) => { From f6059ab2684eb40c464ab68f9ffce9f864c49b6e Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 19 Sep 2023 14:28:40 +0700 Subject: [PATCH 046/184] update UI --- .../account-detail.component.html | 2 +- .../account-detail.component.scss | 3 - .../contracts-overview-card.component.html | 77 +++++++++---------- .../contracts-overview-card.component.scss | 7 ++ .../contracts-overview-card.component.ts | 8 +- .../popup-name-tag.component.ts | 4 +- .../private-name-tag.component.ts | 2 +- .../token-transfer.component.html | 6 +- .../popup-common/popup-common.component.html | 6 +- .../table-no-data.component.html | 2 +- .../table-no-data/table-no-data.component.ts | 1 + src/assets/config/config.json | 3 +- 12 files changed, 64 insertions(+), 57 deletions(-) diff --git a/src/app/pages/account/account-detail/account-detail.component.html b/src/app/pages/account/account-detail/account-detail.component.html index 1c743b3ed..716ca8d4d 100644 --- a/src/app/pages/account/account-detail/account-detail.component.html +++ b/src/app/pages/account/account-detail/account-detail.component.html @@ -30,7 +30,7 @@
- Contract + Contract
diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index 8a7f6ec54..c24909586 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -186,6 +186,3 @@ section.account-detail { } } } -a:hover { - color: var(--aura-primary) !important; -} diff --git a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html index 7e069b10d..ebc52993f 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html @@ -1,17 +1,13 @@
- diff --git a/src/app/shared/components/popup-common/popup-common.component.html b/src/app/shared/components/popup-common/popup-common.component.html index 8dd09946e..c96e1aac4 100644 --- a/src/app/shared/components/popup-common/popup-common.component.html +++ b/src/app/shared/components/popup-common/popup-common.component.html @@ -11,21 +11,21 @@ class="cursor-pointer ml-10" (click)="closeDialog()" />
-
+
{{ data.content }}
diff --git a/src/app/shared/components/table-no-data/table-no-data.component.html b/src/app/shared/components/table-no-data/table-no-data.component.html index 598752469..bf2112fcb 100644 --- a/src/app/shared/components/table-no-data/table-no-data.component.html +++ b/src/app/shared/components/table-no-data/table-no-data.component.html @@ -1,4 +1,4 @@ -
+
{{ textNull }}
diff --git a/src/app/shared/components/table-no-data/table-no-data.component.ts b/src/app/shared/components/table-no-data/table-no-data.component.ts index 8a9ad94c2..7034408a9 100644 --- a/src/app/shared/components/table-no-data/table-no-data.component.ts +++ b/src/app/shared/components/table-no-data/table-no-data.component.ts @@ -9,6 +9,7 @@ export class TableNoDataComponent implements OnInit { @Input() textNull: string = 'NO DATA'; @Input() img: string = 'assets/images/icons/noValues.svg'; @Input() class: string; + @Input() classText: string = 'body-01'; constructor() {} ngOnInit(): void {} diff --git a/src/assets/config/config.json b/src/assets/config/config.json index 63dc7e84a..4548ede29 100644 --- a/src/assets/config/config.json +++ b/src/assets/config/config.json @@ -60,5 +60,6 @@ "content": "Aurascan will be temporarily unavailable due to Xstaxy network upgrades on Jun 12th, 14:00 UTC", "url": "https://aurascan.io/votings/4" }, - "googleClientId": "3465782004-hp7u6vlitgs109rl0emrsf1oc7bjvu08.apps.googleusercontent.com" + "googleClientId": "3465782004-hp7u6vlitgs109rl0emrsf1oc7bjvu08.apps.googleusercontent.com", + "quotaSetPrivateName": 10 } From 9e4842b9d8300f3633e4729ee242873519b44dee Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 19 Sep 2023 14:35:25 +0700 Subject: [PATCH 047/184] update UI --- .../pages/account/account-detail/account-detail.component.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index c24909586..04ff9121c 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -17,6 +17,9 @@ section.account-detail { @media (max-width: 992px) { padding: 16px; } + .btn-private { + width: fit-content; + } } } From c71c4c12c00845e0c70f5692032708a43681a1d4 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Tue, 19 Sep 2023 16:40:01 +0700 Subject: [PATCH 048/184] update UI --- .../popup-name-tag.component.html | 2 +- .../popup-name-tag.component.ts | 24 ++++++++----------- src/app/pages/profile/profile.component.html | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 547b12d9f..ee0f3b2d2 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -40,7 +40,7 @@ value="contract" id="contract" class="radio-box radio-box--dark" - [checked]="!isAccount" + [checked]="isContract" [disabled]="isEditMode" (change)="changeType(false)" /> diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 77b175a51..a9b361284 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -18,7 +18,8 @@ export class PopupNameTagComponent implements OnInit { isSubmit = false; errorSpendLimit = ''; formValid = true; - isAccount = true; + isAccount = false; + isContract = false; maxLengthNameTag = 35; maxLengthNote = 200; currentCodeID; @@ -63,7 +64,7 @@ export class PopupNameTagComponent implements OnInit { formInit() { this.privateNameForm = this.fb.group({ isFavorite: [0], - isAccount: [true, [Validators.required]], + isAccount: [false, [Validators.required]], address: ['', [Validators.required]], name: ['', [Validators.required, Validators.maxLength(this.maxLengthNameTag)]], note: ['', [Validators.maxLength(200)]], @@ -77,9 +78,11 @@ export class PopupNameTagComponent implements OnInit { this.idEdit = this.data.id || data.id; } - const isAccount = data.address?.length === LENGTH_CHARACTER.ADDRESS ? true : false; + const isAccount = data.address?.length === LENGTH_CHARACTER.ADDRESS; + this.privateNameForm.controls['isAccount'].setValue(isAccount); this.isAccount = isAccount; + this.isContract = !this.isAccount; this.privateNameForm.controls['isFavorite'].setValue(data.isFavorite || false); this.privateNameForm.controls['address'].setValue(data.address); this.privateNameForm.controls['name'].setValue(data.nameTag || data.name_tag_private); @@ -95,14 +98,8 @@ export class PopupNameTagComponent implements OnInit { this.getAddress['value'] = this.getAddress?.value.trim(); if (this.getAddress.value?.length > 0 && this.getAddress?.value?.startsWith('aura')) { - if ( - (this.getAddress.value.trim()?.length === LENGTH_CHARACTER.ADDRESS && this.isAccount) || - (this.getAddress.value.trim()?.length === LENGTH_CHARACTER.CONTRACT && !this.isAccount) - ) { - this.isValidAddress = true; - } else { - this.isValidAddress = false; - } + this.isValidAddress = (this.getAddress.value.trim()?.length === LENGTH_CHARACTER.ADDRESS && this.isAccount) || + (this.getAddress.value.trim()?.length === LENGTH_CHARACTER.CONTRACT && !this.isAccount); } else { this.isValidAddress = false; } @@ -111,16 +108,14 @@ export class PopupNameTagComponent implements OnInit { onSubmit() { this.isSubmit = true; const { isFavorite, isAccount, address, name, note } = this.privateNameForm.value; - let payload = { - isFavorite: isFavorite == 1 ? true : false, + isFavorite: isFavorite == 1, type: isAccount ? this.nameTagType.Account : this.nameTagType.Contract, address: address, nameTag: name, note: note, id: this.idEdit, }; - if (this.isEditMode) { this.editPrivateName(payload); } else { @@ -178,6 +173,7 @@ export class PopupNameTagComponent implements OnInit { changeType(type) { this.isAccount = type; + this.isContract = !this.isAccount; this.isValidAddress = false; this.isError = false; this.privateNameForm.value.isAccount = type; diff --git a/src/app/pages/profile/profile.component.html b/src/app/pages/profile/profile.component.html index b0d58b163..855a32446 100644 --- a/src/app/pages/profile/profile.component.html +++ b/src/app/pages/profile/profile.component.html @@ -38,7 +38,7 @@
  • From e0bb16b09dd55dcc43617cc1e24fdf3b2de9bb03 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Tue, 19 Sep 2023 17:01:08 +0700 Subject: [PATCH 049/184] update UI --- .../account-transaction-table.component.html | 6 +++--- .../account-transaction-table.component.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index a52885257..c62ce377f 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -3,7 +3,7 @@ !displayFilter ? 'justify-content-between' : 'justify-content-end' }}">
    - {{ nextKey ? 'More than >' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} + {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} found
    @@ -236,13 +236,13 @@
- {{ nextKey ? 'More than >' : 'A total of' }} {{ pageData?.length }} transaction{{ + {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} found
- {{ nextKey ? 'More than >' : 'A total of' }} {{ pageData?.length }} transaction{{ + {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} found diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index 43248e29b..1ea1e2ca0 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -149,7 +149,7 @@ export class AccountTransactionTableComponent { if (type === 'all') { if (event.target.checked) { this.checkAll = true; - this.listTypeSelectedTemp = this.tnxType; + this.listTypeSelectedTemp = this.tnxTypeOrigin; } else { this.listTypeSelectedTemp = []; this.checkAll = false; From 5e84744bf28269a1c40514dab4d6b76c77ba3218 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Tue, 19 Sep 2023 17:04:49 +0700 Subject: [PATCH 050/184] . --- .../account-transaction-table.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index c62ce377f..f20434c51 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -152,7 +152,7 @@
*ngIf="commonService.checkPrivate(currentAddress)" class="mt-2 aura-tooltip-contain d-inline-flex box-private align-items-center">
- {{ commonService.setNameTag(currentAddress) || '-' }} - - - {{ (commonService.setNameTag(currentAddress) | cutStringPipe : 16) || '-' }} - - - {{ (commonService.setNameTag(currentAddress) | cutStringPipe : 8 : 8) || '-' }} - - + {{ commonService.setNameTag(currentAddress) || '-' }}
- {{ - commonService.setNameTag(contractDetail?.address, null, false) || '-' - }} - - - {{ (commonService.setNameTag(contractDetail?.address, null, false) | cutStringPipe : 16) || '-' }} - - - {{ (commonService.setNameTag(contractDetail?.address, null, false) | cutStringPipe : 8 : 8) || '-' }} - - + {{ commonService.setNameTag(contractDetail?.address, null, false) || '-' }} - +
@@ -59,15 +49,7 @@
Information
*ngIf="commonService.checkPrivate(contractDetail?.address)" class="mt-2 d-inline-flex box-private align-items-center text--white">
- {{ commonService.setNameTag(contractDetail?.address) || '-' }} - - - {{ (commonService.setNameTag(contractDetail?.address) | cutStringPipe : 16) || '-' }} - - - {{ (commonService.setNameTag(contractDetail?.address) | cutStringPipe : 8 : 8) || '-' }} - - + {{ commonService.setNameTag(contractDetail?.address) || '-' }}
diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss index 5470fd2ab..dca1f3a62 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.scss @@ -43,6 +43,7 @@ .box-name-tag { height: 26px; + max-width: 100%; display: inline-flex; align-items: center; font-size: 1.2rem; @@ -69,12 +70,30 @@ border-bottom: 13px solid transparent; } } + .line-claim { + display: inline-block; + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis; + } } -.private-name-tag { - height: 24px; - padding: 0 var(--spacer-2); - background-color: var(--aura-gray-10); - border-radius: 16px; - border: 1px solid var(--aura-gray-8); +.box-private{ + max-width: 100%; + .private-name-tag { + min-width: 0; + height: 24px; + padding: 0 var(--spacer-2); + background-color: var(--aura-gray-10); + border-radius: 16px; + border: 1px solid var(--aura-gray-8); + font-size: 1.2rem; + font-weight: 400; + .line-claim { + display: inline-block; + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis; + } + } } From 97bfa20a9a2934892cfea2a387b2faecdc14b502 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 20 Sep 2023 13:53:34 +0700 Subject: [PATCH 054/184] fix UI --- .../pages/contracts/contracts-list/contracts-list.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/contracts/contracts-list/contracts-list.component.ts b/src/app/pages/contracts/contracts-list/contracts-list.component.ts index e9ea647a0..465bc5505 100644 --- a/src/app/pages/contracts/contracts-list/contracts-list.component.ts +++ b/src/app/pages/contracts/contracts-list/contracts-list.component.ts @@ -25,7 +25,7 @@ export class ContractsListComponent implements OnInit, OnDestroy { { matColumnDef: 'address', headerCellDef: 'Address', isUrl: '/contracts', isShort: true, isNameTag: true }, { matColumnDef: 'name', headerCellDef: 'Contract Name' }, { matColumnDef: 'label', headerCellDef: 'Label' }, - { matColumnDef: 'compiler_version', headerCellDef: 'Version' }, + { matColumnDef: 'compiler_version', headerCellDef: 'Contract Ver' }, { matColumnDef: 'type', headerCellDef: 'Type' }, { matColumnDef: 'token_tracker', headerCellDef: 'Token Tracker' }, { matColumnDef: 'code_id', headerCellDef: 'Code ID' }, From 63e5fed1b20bc96a7ce4b4d89ea882012d42cfba Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Wed, 20 Sep 2023 15:02:18 +0700 Subject: [PATCH 055/184] update UI private name tag --- .../account-transaction-table.component.ts | 2 +- .../popup-name-tag.component.html | 2 +- .../private-name-tag.component.html | 83 +++++++++++++++++-- .../private-name-tag.component.scss | 32 +++++-- .../private-name-tag.component.ts | 18 +++- src/app/pages/profile/profile.component.scss | 4 +- .../popup-common/popup-common.component.scss | 5 +- .../white/DotsThreeOutlineVertical.svg | 3 + src/assets/scss/aura-theme/button.scss | 8 ++ src/assets/scss/aura-theme/form.scss | 6 +- src/assets/scss/aura-theme/popup.scss | 2 +- 11 files changed, 140 insertions(+), 25 deletions(-) create mode 100644 src/assets/icons/icons-svg/white/DotsThreeOutlineVertical.svg diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index ab927cf00..f4bb31bc4 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -57,7 +57,7 @@ export class AccountTransactionTableComponent { pageData: PageEvent = { length: PAGE_EVENT.LENGTH, - pageSize: 5, + pageSize: 10, pageIndex: PAGE_EVENT.PAGE_INDEX, }; nextKey = null; diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index ee0f3b2d2..dec73bf66 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -1,7 +1,7 @@
-
{{ isEditMode ? 'Edit' : 'Create' }} Private Name Tag
+
{{ isEditMode ? 'Edit' : 'Create' }} Private Name Tag
diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 7c4ceb83c..4d4633801 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -1,8 +1,8 @@ -
+
Private name tag
@@ -11,8 +11,8 @@
Total {{ countFav }}/{{ pageData?.length }} addresses tagged
-
- +
+
- +
@@ -99,7 +99,7 @@
{{ commonService.getDateValue(data[template.matColumnDef])[0] }}
-
+
+
+
+
+
+ + {{ data.address | cutStringPipe : 8 : 8 }} + +
+ {{ data.note || 'Note:-' }} +
+
+
+
+ + +
+
+ +
    +
  • + + Edit +
    • +
  • + + Remove +
    • +
+
+
+
+
+
+
+
Type
+
Contract
+
+
+
Private name tag
+
{{ data.nameTag }}
+
+
+
Added time
+
{{ data.createdAt | customDate : 'yyyy-MM-dd' }}
+
+
+
Updated time
+
{{commonService.getDateValue(data.updatedAt)[0]}}
+
+
+
+
diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss index 6c2ce87de..d67b3eadf 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss @@ -19,16 +19,21 @@ .private-name-table { th.mat-header-cell:nth-child(1) { - min-width: 60px; + min-width: 80px; } th.mat-header-cell:nth-child(7) { - min-width: 80px; + min-width: 100px; + } + th.mat-header-cell:nth-child(4) { + min-width: 260px; } - th.mat-header-cell:nth-child(2), - th.mat-header-cell:nth-child(4), + th.mat-header-cell:nth-child(2) { + min-width: 190px; + } + th.mat-header-cell:nth-child(3), th.mat-header-cell:nth-child(5), th.mat-header-cell:nth-child(6) { - min-width: 150px; + min-width: 140px; } } @@ -67,4 +72,19 @@ border-bottom: unset !important; } } -} \ No newline at end of file +} +// Mobile card +.card-name-tag { + border: 1px solid var(--aura-gray-9); + border-radius: 8px; + padding: 12px; + &:not(:last-child) { + margin-bottom: var(--spacer-4); + } +} +.card__title { + max-width: calc(100% - 80px); +} +.label__content { + min-width: 120px; +} 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 409d8bd31..6a4615cf4 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 @@ -39,13 +39,14 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { modalReference: any; pageData: PageEvent = { length: PAGE_EVENT.LENGTH, - pageSize: 5, + pageSize: 10, pageIndex: PAGE_EVENT.PAGE_INDEX, }; textSearch = ''; searchSubject = new Subject(); destroy$ = new Subject(); dataSource: MatTableDataSource = new MatTableDataSource([]); + dataSourceMobile = []; dataTable = []; nextKey = null; currentKey = null; @@ -110,6 +111,14 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { }); this.dataSource.data = res.data?.nameTags; this.pageData.length = res?.data?.count || 0; + + if (this.dataSource?.data) { + this.dataSourceMobile = this.dataSource.data?.slice( + this.pageData.pageIndex * this.pageData.pageSize, + this.pageData.pageIndex * this.pageData.pageSize + this.pageData.pageSize, + ); + } + }); } @@ -159,7 +168,9 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.toastr.successWithTitle('Private name tag removed!', 'Success'); setTimeout(() => { - this.getListPrivateName(); + this.pageData.length--; + this.pageData.pageIndex = 0; + this.pageEvent(this.pageData) }, 1000); }); } @@ -184,13 +195,12 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { pageEvent(e: PageEvent): void { const { length, pageIndex, pageSize } = e; const next = length <= (pageIndex + 2) * pageSize; + this.dataSourceMobile = this.dataSource.data.slice(pageIndex * pageSize, pageIndex * pageSize + pageSize); this.pageData = e; if (next && this.nextKey && this.currentKey !== this.nextKey) { this.getListPrivateName(this.nextKey); this.currentKey = this.nextKey; - } else { - this.getListPrivateName(); } } diff --git a/src/app/pages/profile/profile.component.scss b/src/app/pages/profile/profile.component.scss index 76fa96be3..03d07ab36 100644 --- a/src/app/pages/profile/profile.component.scss +++ b/src/app/pages/profile/profile.component.scss @@ -17,9 +17,9 @@ border-radius: 8px; } .profile-contain { - padding: var(--spacer-4); + padding: var(--spacer-4) var(--spacer-1); @media (min-width: 992px) { - padding: var(--spacer-6); + padding: var(--spacer-6) var(--spacer-4); } } .tab-profile { diff --git a/src/app/shared/components/popup-common/popup-common.component.scss b/src/app/shared/components/popup-common/popup-common.component.scss index 1778d6e2c..ae98ef4d2 100644 --- a/src/app/shared/components/popup-common/popup-common.component.scss +++ b/src/app/shared/components/popup-common/popup-common.component.scss @@ -1,6 +1,9 @@ ::ng-deep { .sizeNormal { - max-width: 500px !important; + max-width: 90vw !important; + @media (min-width: 991.98px) { + max-width: 500px !important; + } } .mat-dialog-container { diff --git a/src/assets/icons/icons-svg/white/DotsThreeOutlineVertical.svg b/src/assets/icons/icons-svg/white/DotsThreeOutlineVertical.svg new file mode 100644 index 000000000..d5f008354 --- /dev/null +++ b/src/assets/icons/icons-svg/white/DotsThreeOutlineVertical.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/scss/aura-theme/button.scss b/src/assets/scss/aura-theme/button.scss index 0c6f067e0..4654cdc9c 100644 --- a/src/assets/scss/aura-theme/button.scss +++ b/src/assets/scss/aura-theme/button.scss @@ -25,6 +25,10 @@ height: 34px; padding: 0 20px; } + &--ssm { + height: 32px; + padding: 0 16px; + } &--xs { height: 28px; padding: 0 16px; @@ -58,6 +62,10 @@ height: 32px; padding: 0 20px; } + &--ssm-mob { + height: 32px; + padding: 0 16px; + } &--xs-mob { height: 28px; padding: 0 16px; diff --git a/src/assets/scss/aura-theme/form.scss b/src/assets/scss/aura-theme/form.scss index c2d62fbbe..498735215 100644 --- a/src/assets/scss/aura-theme/form.scss +++ b/src/assets/scss/aura-theme/form.scss @@ -8,7 +8,7 @@ border-radius: 8px; justify-content: space-between; align-items: center; - height: 48px; + height: 40px; padding: 0 var(--spacer-4); &:focus { border-color: 1px solid var(--aura-white) !important; @@ -87,7 +87,7 @@ .input-group { display: flex; width: 100%; - height: 48px; + height: 40px; border: 1px solid #494C58; border-radius: 8px; padding: 0 var(--spacer-4); @@ -167,7 +167,7 @@ color: #E6E7E8; font-size: 1.4rem; font-weight: 400; - height: 48px; + height: 40px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/src/assets/scss/aura-theme/popup.scss b/src/assets/scss/aura-theme/popup.scss index 3a2154780..5f3d928b2 100644 --- a/src/assets/scss/aura-theme/popup.scss +++ b/src/assets/scss/aura-theme/popup.scss @@ -34,7 +34,7 @@ } .grant-overlay-panel { @media (max-width: 567px) { - max-width: 100vw !important; + max-width: 95vw !important; } .mat-dialog-container { background: none; From 997aea67acf8b9e1fe80930d8b412648222cb1e7 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Wed, 20 Sep 2023 15:07:02 +0700 Subject: [PATCH 056/184] update UI private name tag --- .../profile/private-name-tag/private-name-tag.component.ts | 2 ++ 1 file changed, 2 insertions(+) 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 6a4615cf4..f735e458a 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 @@ -201,6 +201,8 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { if (next && this.nextKey && this.currentKey !== this.nextKey) { this.getListPrivateName(this.nextKey); this.currentKey = this.nextKey; + } else { + this.getListPrivateName(); } } From 1d72d07284c2a1de9bc8709697f9f6008a0f14e1 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 20 Sep 2023 15:43:43 +0700 Subject: [PATCH 057/184] fix ui --- .../contract-info-card.component.html | 4 +- .../contracts-detail.component.html | 12 +++-- .../contracts-detail.component.scss | 9 ++++ .../contracts-overview-card.component.html | 2 +- .../contracts-list.component.html | 47 +++++++++++++------ .../token-transfer.component.html | 41 ++++++++++++---- .../table-no-data.component.scss | 3 ++ 7 files changed, 87 insertions(+), 31 deletions(-) diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html index bdb8abcce..8091366db 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html @@ -6,7 +6,7 @@ data-bs-target="#title2" aria-controls="title2" aria-expanded="false"> -
Information
+
Information
@@ -63,7 +63,7 @@
Information
data-bs-target="#title3" aria-controls="title3" aria-expanded="false"> -
More Info
+
More Info
diff --git a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html index fbadc8f80..9ceecea21 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-detail.component.html +++ b/src/app/pages/contracts/contracts-detail/contracts-detail.component.html @@ -5,9 +5,9 @@

Contract

{{ contractAddress }}
-
+
- +
+ +
diff --git a/src/app/pages/contracts/contracts-detail/contracts-detail.component.scss b/src/app/pages/contracts/contracts-detail/contracts-detail.component.scss index 21f793ac0..3817a70c1 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-detail.component.scss +++ b/src/app/pages/contracts/contracts-detail/contracts-detail.component.scss @@ -11,11 +11,20 @@ width: 15px; height: 15px; } + ::ng-deep .contract__card-info .card { @media (min-width: 991.98px) { min-height: 247px; } } + .mb-haft { margin-bottom: 1.5px; } + +@media (max-width: 414px) { + .btn-mobile { + border: 1px solid #717582; + border-radius: 8px; + } +} \ No newline at end of file diff --git a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html index ebc52993f..23dd2d299 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contracts-overview-card/contracts-overview-card.component.html @@ -5,7 +5,7 @@ data-bs-target="#title1" aria-controls="title1" aria-expanded="false"> -
Contract Overview
+
Contract Overview
diff --git a/src/app/pages/contracts/contracts-list/contracts-list.component.html b/src/app/pages/contracts/contracts-list/contracts-list.component.html index 5617ebd76..e21f5c790 100644 --- a/src/app/pages/contracts/contracts-list/contracts-list.component.html +++ b/src/app/pages/contracts/contracts-list/contracts-list.component.html @@ -115,6 +115,7 @@

Contracts

@@ -151,24 +152,40 @@

Contracts

- - {{ data['cw20_contract']?.name | stringEllipsis: 16}} + + {{ data['cw20_contract']?.name | stringEllipsis : 16 }} - - {{ data['cw721_contract']?.name | stringEllipsis: 16 }} + + {{ data['cw721_contract']?.name | stringEllipsis : 16 }} - - {{ data['cw721_contract']?.name | stringEllipsis: 16 }} + + {{ data['cw721_contract']?.name | stringEllipsis : 16 }} - - + + - +
- {{ + {{ data.cw20_contract.symbol }}
- Amount + Amount
-
- +
+ +
+
+
-
+
From - + +
-
+
To - + +
diff --git a/src/app/shared/components/table-no-data/table-no-data.component.scss b/src/app/shared/components/table-no-data/table-no-data.component.scss index 57a7307f1..b499edf57 100644 --- a/src/app/shared/components/table-no-data/table-no-data.component.scss +++ b/src/app/shared/components/table-no-data/table-no-data.component.scss @@ -1,3 +1,6 @@ .img-height { height: 110px; + @media (max-width: 414px) { + height: 95px; + } } \ No newline at end of file From 6b8df134b82132ab1cb362ba10cc1d8ad1280bdc Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 21 Sep 2023 09:26:06 +0700 Subject: [PATCH 058/184] fix bug search box --- .../token-transfers-tab/token-transfers-tab.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts index 56858d83f..18ab428f7 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts @@ -202,10 +202,10 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { if (this.keyWord?.length === LENGTH_CHARACTER.TRANSACTION && this.keyWord == this?.keyWord.toUpperCase()) { payload['txHash'] = this.keyWord; } else { - if (this.keyWord?.length >= LENGTH_CHARACTER.ADDRESS && this.keyWord?.startsWith(this.prefixAdd)) { - payload['sender'] = this.keyWord; - payload['receiver'] = this.keyWord; - } + // if (this.keyWord?.length >= LENGTH_CHARACTER.ADDRESS && this.keyWord?.startsWith(this.prefixAdd)) { + payload['sender'] = this.keyWord; + payload['receiver'] = this.keyWord; + // } } } From bef3e8c9eeddd51144775739b85e552bdc568f87 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 21 Sep 2023 11:41:49 +0700 Subject: [PATCH 059/184] fix UI transaction detail (cherry picked from commit da356b4549194ac2e7de97272236e2f24e9f75ba) # Conflicts: # src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html # src/app/shared/components/table-no-data/table-no-data.component.scss --- .../token-transfer.component.html | 39 ++++++++++++------- .../token-transfer.component.scss | 5 ++- .../token-transfer.component.ts | 9 ++++- .../table-no-data.component.html | 2 +- .../table-no-data.component.scss | 6 +++ 5 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index 5afdad2e1..1ba6c5ed6 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -3,11 +3,11 @@
-
+
Fungible Token (FT) Transfer
-
+
@@ -61,17 +61,23 @@
-
+
From - +
-
+
To - +
@@ -105,11 +111,11 @@
-
+
Non-Fungible Token (NFT) Transfer
-
+
@@ -143,14 +149,15 @@
- +
+ [url]="isContractAddress(data.to) ? 'contracts' : 'account'">
@@ -162,14 +169,16 @@
+ [url]="isContractAddress(data.from) ? 'contracts' : 'account'"> + [url]="isContractAddress(data.from) ? 'contracts' : 'account'">
+ [url]="isContractAddress(data.to) ? 'contracts' : 'account'"> + [url]="isContractAddress(data.to) ? 'contracts' : 'account'">
diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss index 5fd2829bd..46675b7a5 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss @@ -2,7 +2,7 @@ .card-nodata, .table-token { - height: 192px; + height: 193px; margin-bottom: 0; overflow-y: auto; @@ -10,6 +10,9 @@ tr.mat-row { height: 64px; } + td.mat-cell:first-of-type { + padding-left: 14px; + } } ::ng-deep table thead { diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts index 116c9263d..e5498718f 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts @@ -3,7 +3,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { PageEvent } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; -import { NULL_ADDRESS, PAGE_EVENT } from 'src/app/core/constants/common.constant'; +import { LENGTH_CHARACTER, NULL_ADDRESS, PAGE_EVENT } from 'src/app/core/constants/common.constant'; import { EnvironmentService } from 'src/app/core/data-services/environment.service'; import { TableTemplate } from 'src/app/core/models/common.model'; import { TransactionService } from 'src/app/core/services/transaction.service'; @@ -61,4 +61,11 @@ export class TokenTransferComponent implements OnInit { navigateToNFTDetail(address: string, tokenId: number): void { this.router.navigate([`/tokens/token-nft/${address}/${tokenId}`]); } + + isContractAddress(address) { + if (address?.startsWith('aura') && address?.length === LENGTH_CHARACTER.CONTRACT) { + return true; + } + return false; + } } diff --git a/src/app/shared/components/table-no-data/table-no-data.component.html b/src/app/shared/components/table-no-data/table-no-data.component.html index bf2112fcb..51b2f4e1a 100644 --- a/src/app/shared/components/table-no-data/table-no-data.component.html +++ b/src/app/shared/components/table-no-data/table-no-data.component.html @@ -1,4 +1,4 @@ -
+
{{ textNull }}
diff --git a/src/app/shared/components/table-no-data/table-no-data.component.scss b/src/app/shared/components/table-no-data/table-no-data.component.scss index b499edf57..65f500d6b 100644 --- a/src/app/shared/components/table-no-data/table-no-data.component.scss +++ b/src/app/shared/components/table-no-data/table-no-data.component.scss @@ -3,4 +3,10 @@ @media (max-width: 414px) { height: 95px; } +} + +@media (max-width: 992px) { + .clear-margin { + margin: 12px !important; + } } \ No newline at end of file From d9497a218d4e5ef7d18f6eed60bf1e8c72457ed6 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 21 Sep 2023 13:49:59 +0700 Subject: [PATCH 060/184] fix UI transaction detail (cherry picked from commit da356b4549194ac2e7de97272236e2f24e9f75ba) # Conflicts: # src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html # src/app/shared/components/table-no-data/table-no-data.component.scss --- .../token-transfer.component.html | 41 +++++++++++++------ .../token-transfer.component.scss | 9 +++- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index 1ba6c5ed6..572870be9 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -3,9 +3,7 @@
-
- Fungible Token (FT) Transfer -
+
Fungible Token (FT) Transfer
@@ -16,7 +14,7 @@
@@ -60,24 +58,38 @@
-
-
+
+
From +
-
+
To +
@@ -124,7 +136,7 @@
@@ -149,15 +161,20 @@
- +
+ [url]="'contracts'">
diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss index 46675b7a5..927326397 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss @@ -2,7 +2,7 @@ .card-nodata, .table-token { - height: 193px; + height: 194px; margin-bottom: 0; overflow-y: auto; @@ -37,4 +37,11 @@ .transfer-address-label { width: 30px; } + + .transfer-address { + min-width: 180px; + @media (max-width: 992px) { + min-width: 150px; + } + } } \ No newline at end of file From d17c7df3d889e8ceef6c723aeeaf02acdfd1d0a7 Mon Sep 17 00:00:00 2001 From: nttnguyen136 Date: Thu, 21 Sep 2023 09:59:58 +0700 Subject: [PATCH 061/184] Merge pull request #2357 from aura-nw/baseline/serenity_20230921 Baseline/serenity 20230921 (cherry picked from commit 1fc73c08a4a17ff010593f6147e7a25a37b52710) --- .../account-transaction-table.component.html | 46 +++++++++----- .../account-transaction-table.component.scss | 63 ++++++++++++++----- .../account-transaction-table.component.ts | 10 +++ .../account-transaction.component.scss | 2 + 4 files changed, 90 insertions(+), 31 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index a59979b81..0b4ee0ddd 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -90,9 +90,9 @@ -
- {{ transactionFilter.typeTransfer }} - -
+
+ {{ transactionFilter.typeTransfer }} + +
@@ -126,8 +127,8 @@ #tnxTypeMenuBtn [matMenuTriggerFor]="tnxTypeMenu" class="input-group align-items-center d-flex justify-content-between text--white cursor-pointer btn-mess" - type="button" - *ngIf="!transactionFilter.type"> + [class.menu-hidden]="transactionFilter.type" + type="button"> Message type
@@ -135,8 +136,9 @@
{{ checkAll ? 'All' : transactionFilter.type?.length + (isSearchOther ? 1 : 0) || 1 }} Msg Types selected @@ -145,7 +147,9 @@ #tnxTypeMenu="matMenu" class="aura-menu-panel tnx-type-panel text--white mt-2 p-2" [yPosition]="'above'"> -
+
+
+ Selected Items ... +
+ {{ type.value }} + +
+
+ class="form-group d-flex align-items-center tnx-filter-item mx-2">
-
+
@@ -217,7 +233,7 @@ class="button button--xlg button-outline button-outline__in-card button-pill ml-4" type="button" [disabled]="listTypeSelectedTemp?.length === 0" - (click)="$event.stopPropagation(); executeFilterType()"> + (click)="executeFilterType(); tnxTypeMenuBtn.click()"> Select
diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss index 638c30323..fe86430cc 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss @@ -25,24 +25,13 @@ .input-group { height: 33px; background-color: transparent; - border: 1px solid var(--aura-gray-8) !important; + border: 1px solid var(--aura-gray-8); padding: 0 16px; border-radius: 8px; } @media (max-width: 376px) { width: calc(100vw - 68px); } - .filter-result { - white-space: nowrap; - padding: 0 var(--spacer-4); - color: var(--aura-blue-3link); - border: 1px solid var(--aura-blue-4); - background: #222f3d; - border-radius: 8px; - height: 33px; - display: flex; - align-items: center; - } .mat-date-range-input { width: 100%; } @@ -52,13 +41,13 @@ } .tnx-filter-box { - max-height: 356px; + max-height: 220px; overflow-y: auto; @media (max-width: 1366px) { - max-height: 280px; + max-height: 150px; } @media (max-width: 414px) { - max-height: 210px; + max-height: 130px; } ::ng-deep { .form-group label { @@ -220,7 +209,7 @@ align-items: center; justify-content: end; background-color: var(--aura-gray-9); - margin: 0 -4px -12px -4px; + margin: 0 -8px -16px -8px; } mat-date-range-input { @@ -295,3 +284,45 @@ mat-date-range-input { margin-top: 0; } } +.filter-result { + white-space: nowrap; + padding: 0 var(--spacer-4); + color: var(--aura-blue-3link); + border: 1px solid var(--aura-blue-4); + background: #222f3d; + border-radius: 8px; + height: 33px; + display: flex; + align-items: center; +} +.menu-hidden { + height: 0 !important; + width: 0 !important; + min-width: 0 !important; + overflow: hidden !important; + border: none !important; +} +.tag-filter-box { + min-height: 40px; + border: 1px solid var(--aura-gray-9); + border-radius: 8px; + color: var(--aura-gray-5); + display: flex; + align-items: center; + padding: 0 14px; + max-height: 100px; + overflow-y: auto; + &.has-result { + padding: 4px; + padding-right: 14px; + flex-wrap: wrap; + } + .filter-result { + height: 24px; + padding: 0 var(--spacer-2); + margin-bottom: var(--spacer-1); + &:not(:last-child) { + margin-right: var(--spacer-1); + } + } +} diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index f4bb31bc4..248a6a043 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -167,6 +167,12 @@ export class AccountTransactionTableComponent { } } + removeFilterType(type: any) { + this.listTypeSelectedTemp?.forEach((element, index) => { + if (element.label === type.label) this.listTypeSelectedTemp?.splice(index, 1); + }); + } + searchTransactionType() { if (this.transactionTypeKeyWord?.toLowerCase().length === 0 || this.transactionTypeKeyWord?.toLowerCase() === '') { this.tnxType = this.tnxTypeOrigin; @@ -531,4 +537,8 @@ export class AccountTransactionTableComponent { resetMsgTypeCheckbox() { this.listTypeSelectedTemp = []; } + + initTnxFilterPanel() { + this.listTypeSelectedTemp = this.tnxTypeOrigin.filter(type => this.transactionFilter.type.includes(type.label)); + } } diff --git a/src/app/pages/account/account-detail/account-transaction/account-transaction.component.scss b/src/app/pages/account/account-detail/account-transaction/account-transaction.component.scss index 196629326..9c5389a30 100644 --- a/src/app/pages/account/account-detail/account-transaction/account-transaction.component.scss +++ b/src/app/pages/account/account-detail/account-transaction/account-transaction.component.scss @@ -2,6 +2,8 @@ width: 420px; } ::ng-deep .mat-menu-panel.tnx-type-panel { + padding: 0 !important; + overflow: hidden; width: 355px; max-width: unset; @media (max-width: 414px) { From b6c9d77fecaeb5cdb6498cd26ac3a7f56fc83a4f Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Thu, 21 Sep 2023 14:22:33 +0700 Subject: [PATCH 062/184] fixbug UI private-name-tag --- .../private-name-tag.component.html | 26 +++++++++---------- .../private-name-tag.component.scss | 13 +++++++--- .../token-cw20/token-cw20.component.ts | 2 +- .../popup-common/popup-common.component.html | 2 +- src/assets/scss/aura-theme/form.scss | 13 +++++++++- 5 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 4d4633801..2ebd6f992 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -124,7 +124,7 @@
- {{ data.address | cutStringPipe : 8 : 8 }} + {{ data.address | cutStringPipe : 8 : 8 }}
@@ -132,9 +132,9 @@
-
+
    -
  • - - Edit + + Edit
    • -
  • - - Remove + + Remove
@@ -172,19 +172,19 @@
-
Type
+
Type
Contract
-
Private name tag
+
Private name tag
{{ data.nameTag }}
-
Added time
+
Added time
{{ data.createdAt | customDate : 'yyyy-MM-dd' }}
-
Updated time
+
Updated time
{{commonService.getDateValue(data.updatedAt)[0]}}
diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss index d67b3eadf..b49b2b75e 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss @@ -30,10 +30,14 @@ th.mat-header-cell:nth-child(2) { min-width: 190px; } - th.mat-header-cell:nth-child(3), - th.mat-header-cell:nth-child(5), + th.mat-header-cell:nth-child(3) { + min-width: 120px; + } + th.mat-header-cell:nth-child(5) { + min-width: 140px; + } th.mat-header-cell:nth-child(6) { - min-width: 140px; + min-width: 160px; } } @@ -88,3 +92,6 @@ .label__content { min-width: 120px; } +.action-mob { + height: 44px; +} diff --git a/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts b/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts index 8f47a00e9..2418dff42 100644 --- a/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts +++ b/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts @@ -216,7 +216,7 @@ export class TokenCw20Component implements OnInit, OnDestroy { sortData(sort: Sort) { this.dataSource.data.forEach((data) => { data.circulating_market_cap = +data.circulating_market_cap; - data.volume = +data.volume_24h; + data.volume = +data.volume; data.price = +data.price; data.holders = +data.holders; }); diff --git a/src/app/shared/components/popup-common/popup-common.component.html b/src/app/shared/components/popup-common/popup-common.component.html index c96e1aac4..3fbaf8e39 100644 --- a/src/app/shared/components/popup-common/popup-common.component.html +++ b/src/app/shared/components/popup-common/popup-common.component.html @@ -1,6 +1,6 @@
-
+
{{ data.title }}
Date: Thu, 21 Sep 2023 14:26:31 +0700 Subject: [PATCH 063/184] Merge pull request #2361 from aura-nw/baseline/serenity_20230921 update UI filter (cherry picked from commit b54ed652e882e064cb4848c4763f7e774610eef7) --- .../account-transaction-table.component.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 0b4ee0ddd..5c2383665 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -54,8 +54,8 @@
+ class="dropdown aura-dropdown btn-item body" + [class.menu-hidden]="transactionFilter.endDate">
@@ -79,14 +79,15 @@
{{ transactionFilter.startDate | date : 'MM/dd/yyyy' }} - {{ transactionFilter.endDate | date : 'MM/dd/yyyy' }}
-
+
From 8a432dd573de6260568bc38cbb1f188d575a605c Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 21 Sep 2023 14:39:34 +0700 Subject: [PATCH 064/184] fix UI transaction detail (cherry picked from commit da356b4549194ac2e7de97272236e2f24e9f75ba) # Conflicts: # src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html # src/app/shared/components/table-no-data/table-no-data.component.scss --- .../token-transfer/token-transfer.component.html | 8 ++++---- .../token-transfer/token-transfer.component.scss | 2 +- src/assets/config/config.json | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index 572870be9..a3974afe4 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -28,7 +28,7 @@
Fung height="20" />
{{ - data.cw20_contract.symbol + data.cw20_contract.symbol | stringEllipsis : 12 }} Fung >To - Date: Thu, 21 Sep 2023 15:26:42 +0700 Subject: [PATCH 065/184] update UI filter (cherry picked from commit e752aacf10dfc1c6085d2b0428cea755ecf8c107) (cherry picked from commit 8d9011b1be4e4fb08e19ec7510c129575b708c37) --- .../account-transaction-table.component.html | 73 +++++++++++-------- .../account-transaction-table.component.ts | 12 ++- 2 files changed, 52 insertions(+), 33 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 5c2383665..6774bbfcc 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -53,13 +53,17 @@
-
-
+
+
- + {{ transactionFilter.endDate | date : 'MM/dd/yyyy' }}
-
+
-
+
{{ transactionFilter.typeTransfer }}
-
+
-
+
Selected Items ...
{{ type.value }} @@ -222,12 +236,17 @@
-
-
- {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ - pageData?.length > 1 ? 's' : '' - }} + {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} found
- {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ - pageData?.length > 1 ? 's' : '' - }} + {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} found
diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index 248a6a043..e20d30f9e 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -316,7 +316,7 @@ export class AccountTransactionTableComponent { setTimeout(() => { this.transactionLoading = false; - }, 5000); + }, 2000); } getListTypeFilter() { @@ -528,9 +528,9 @@ export class AccountTransactionTableComponent { datePickerClickTrigger() { const toggle = document.getElementById('datepicker-toggle'); - if(toggle) { + if (toggle) { const btn = toggle.children[0]; - if(btn instanceof HTMLElement) btn.click(); + if (btn instanceof HTMLElement) btn.click(); } } @@ -539,6 +539,10 @@ export class AccountTransactionTableComponent { } initTnxFilterPanel() { - this.listTypeSelectedTemp = this.tnxTypeOrigin.filter(type => this.transactionFilter.type.includes(type.label)); + if (this.transactionFilter.type) { + this.listTypeSelectedTemp = this.tnxTypeOrigin.filter((type) => this.transactionFilter.type.includes(type.label)); + } else { + this.listTypeSelectedTemp = []; + } } } From 340c45d22d54cbb2c4e5e8a010ed5680274136ba Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 21 Sep 2023 15:36:44 +0700 Subject: [PATCH 066/184] update UI pricate name tag --- .../private-name-tag/private-name-tag.component.scss | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss index d67b3eadf..8b2f27bae 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss @@ -30,10 +30,14 @@ th.mat-header-cell:nth-child(2) { min-width: 190px; } - th.mat-header-cell:nth-child(3), - th.mat-header-cell:nth-child(5), + th.mat-header-cell:nth-child(3) { + min-width: 90px; + } + th.mat-header-cell:nth-child(5) { + min-width: 140px; + } th.mat-header-cell:nth-child(6) { - min-width: 140px; + min-width: 160px; } } From 9231b2da9512e41b15bc3129377b54830de29e08 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Thu, 21 Sep 2023 15:51:18 +0700 Subject: [PATCH 067/184] fixbug UI --- .../components/popup-common/popup-common.component.html | 2 +- src/assets/images/icons/radio-box--dark-checked-disable.svg | 4 ++++ src/assets/scss/aura-theme/form.scss | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/icons/radio-box--dark-checked-disable.svg diff --git a/src/app/shared/components/popup-common/popup-common.component.html b/src/app/shared/components/popup-common/popup-common.component.html index 3fbaf8e39..db34c6c45 100644 --- a/src/app/shared/components/popup-common/popup-common.component.html +++ b/src/app/shared/components/popup-common/popup-common.component.html @@ -8,7 +8,7 @@ alt="" width="24px" height="24px" - class="cursor-pointer ml-10" + class="cursor-pointer ml-5" (click)="closeDialog()" />
diff --git a/src/assets/images/icons/radio-box--dark-checked-disable.svg b/src/assets/images/icons/radio-box--dark-checked-disable.svg new file mode 100644 index 000000000..5b3ddc69a --- /dev/null +++ b/src/assets/images/icons/radio-box--dark-checked-disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/scss/aura-theme/form.scss b/src/assets/scss/aura-theme/form.scss index b6d90a993..2753cc756 100644 --- a/src/assets/scss/aura-theme/form.scss +++ b/src/assets/scss/aura-theme/form.scss @@ -292,7 +292,7 @@ color: var(--aura-gray-8); &::before { opacity: 1; - background: var(--aura-gray-8); + background: url(../../images/icons/radio-box--dark-checked-disable.svg) center no-repeat; } &::after { opacity: 0; From 2eaa6256b3cc9fa4da4fa074b03164777b86d6bb Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 21 Sep 2023 16:10:38 +0700 Subject: [PATCH 068/184] update UI filter (cherry picked from commit e752aacf10dfc1c6085d2b0428cea755ecf8c107) (cherry picked from commit dfbb1727335c7b1c61be02ab0fda1f7b38ae600f) --- .../account-transaction-table.component.html | 2 +- .../account-transaction-table.component.scss | 2 +- .../account-transaction/account-transaction.component.scss | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 6774bbfcc..4306d6990 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -83,7 +83,7 @@
{{ transactionFilter.startDate | date : 'MM/dd/yyyy' }} diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss index fe86430cc..21a20647d 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss @@ -219,7 +219,7 @@ mat-date-range-input { padding-left: 16px; } .calendar-contain { - width: 208px; + width: 225px; border: 1px solid var(--aura-gray-8) !important; border-radius: 8px; } diff --git a/src/app/pages/account/account-detail/account-transaction/account-transaction.component.scss b/src/app/pages/account/account-detail/account-transaction/account-transaction.component.scss index 9c5389a30..55cb67faf 100644 --- a/src/app/pages/account/account-detail/account-transaction/account-transaction.component.scss +++ b/src/app/pages/account/account-detail/account-transaction/account-transaction.component.scss @@ -12,6 +12,9 @@ @media (max-width: 376px) { width: 275px; } + .mat-menu-content { + padding: 0; + } } ::ng-deep .mat-menu-panel.tsx-filter-panel { padding: 0; From 93b04e723f3e58803560cc6da64cdab29b8eb8ed Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Thu, 21 Sep 2023 16:53:14 +0700 Subject: [PATCH 069/184] fixbug UI --- .../account-transaction-table.component.ts | 1 + .../profile/popup-name-tag/popup-name-tag.component.html | 2 +- .../profile/popup-name-tag/popup-name-tag.component.scss | 2 +- src/assets/images/icons/radio-box--dark--disable.svg | 3 +++ src/assets/scss/aura-theme/form.scss | 8 ++++++++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/icons/radio-box--dark--disable.svg diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index 248a6a043..79a697dd5 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -168,6 +168,7 @@ export class AccountTransactionTableComponent { } removeFilterType(type: any) { + this.checkAll = false; this.listTypeSelectedTemp?.forEach((element, index) => { if (element.label === type.label) this.listTypeSelectedTemp?.splice(index, 1); }); diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 505d5b67e..4bc6fae20 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -38,7 +38,7 @@ + + diff --git a/src/assets/scss/aura-theme/form.scss b/src/assets/scss/aura-theme/form.scss index 2753cc756..0d72f0c61 100644 --- a/src/assets/scss/aura-theme/form.scss +++ b/src/assets/scss/aura-theme/form.scss @@ -288,6 +288,14 @@ } } &:disabled ~ label { + cursor: not-allowed !important; + color: var(--aura-gray-8); + &::after { + opacity: 1; + background: url(../../images/icons/radio-box--dark--disable.svg) center no-repeat; + } + } + &:checked:disabled ~ label { cursor: not-allowed !important; color: var(--aura-gray-8); &::before { From 7827894db622aa12566ca468ead0789480e8f154 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Thu, 21 Sep 2023 16:59:28 +0700 Subject: [PATCH 070/184] fixbug UI --- .../pages/profile/popup-name-tag/popup-name-tag.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 4bc6fae20..505d5b67e 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -38,7 +38,7 @@ Date: Thu, 21 Sep 2023 17:13:56 +0700 Subject: [PATCH 071/184] update UI filter (cherry picked from commit 900091eade3c507700d93b879cd81985af52e12e) (cherry picked from commit b75a8bda206bca30720bf8304f415e96f43f4152) --- .../account-transaction-table.component.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index c0bf01356..2ff91262d 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -236,6 +236,13 @@ export class AccountTransactionTableComponent { getTxsAddress(nextKey = null): void { const address = this.currentAddress; + let startDate = null; + let endDate = null; + + if (this.transactionFilter.startDate && this.transactionFilter.endDate) { + startDate = this.getConvertDate(this.transactionFilter.startDate); + endDate = this.getConvertDate(this.transactionFilter.endDate, true); + } let payload = { limit: 100, @@ -243,8 +250,8 @@ export class AccountTransactionTableComponent { heightLT: nextKey, compositeKey: null, listTxMsgType: null, - startTime: this.getConvertDate(this.transactionFilter.startDate) || null, - endTime: this.getConvertDate(this.transactionFilter.endDate, true) || null, + startTime: startDate || null, + endTime: endDate || null, }; if (this.isSearchOther) { From 607fc98cca1568e3576ce9b1edce19864ce29067 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Fri, 22 Sep 2023 09:53:13 +0700 Subject: [PATCH 072/184] fixbug private name tag pagination --- .../account-transaction-table.component.ts | 2 +- .../private-name-tag/private-name-tag.component.ts | 1 - .../shared/components/paginator/paginator.component.ts | 8 ++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index c0bf01356..d6d7c864a 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -34,7 +34,7 @@ export class AccountTransactionTableComponent { templates: Array; tabsData = TabsAccountLink; lengthAddress = LENGTH_CHARACTER.ADDRESS; - displayFilter = true; + displayFilter = false; templatesExecute: Array = [ { matColumnDef: 'tx_hash', headerCellDef: 'Tx Hash', headerWidth: 18 }, 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 f735e458a..e2641ad19 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 @@ -169,7 +169,6 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.toastr.successWithTitle('Private name tag removed!', 'Success'); setTimeout(() => { this.pageData.length--; - this.pageData.pageIndex = 0; this.pageEvent(this.pageData) }, 1000); }); diff --git a/src/app/shared/components/paginator/paginator.component.ts b/src/app/shared/components/paginator/paginator.component.ts index 5098221d7..241814555 100644 --- a/src/app/shared/components/paginator/paginator.component.ts +++ b/src/app/shared/components/paginator/paginator.component.ts @@ -121,8 +121,8 @@ export class PaginatorComponent implements OnInit, AfterViewInit, OnChanges { if (this.current) { const pageIndex = this.current.pageIndex; - this.current.isFirst = pageIndex > 0 ? false : true; - this.current.isLast = pageIndex < this.pageLength - 1 ? false : true; + this.current.isFirst = pageIndex <= 0; + this.current.isLast = pageIndex >= this.pageLength - 1; if (pageIndex <= this.PAGE.avgIdx || this.pageLength <= this.PAGE.max) { this.current.list = list.slice(0, this.PAGE.max); @@ -136,6 +136,10 @@ export class PaginatorComponent implements OnInit, AfterViewInit, OnChanges { this.current.list.forEach((e) => { e.isActive = e.index === pageIndex; }); + + if(this.current.pageIndex >= this.pageList.length) { + this.pageList[this.pageList.length - 1].isActive = true; + } } else { this.current = { pageIndex: 0, From 8f3fb070574e2d4974c40696fce9fc592da79a5c Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Fri, 22 Sep 2023 12:09:13 +0700 Subject: [PATCH 073/184] fix bug paginator mobile --- .../private-name-tag/private-name-tag.component.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 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 e2641ad19..1609e66b2 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 @@ -39,7 +39,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { modalReference: any; pageData: PageEvent = { length: PAGE_EVENT.LENGTH, - pageSize: 10, + pageSize: 2, pageIndex: PAGE_EVENT.PAGE_INDEX, }; textSearch = ''; @@ -113,12 +113,19 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.pageData.length = res?.data?.count || 0; if (this.dataSource?.data) { - this.dataSourceMobile = this.dataSource.data?.slice( + let dataMobTemp = this.dataSource.data?.slice( this.pageData.pageIndex * this.pageData.pageSize, this.pageData.pageIndex * this.pageData.pageSize + this.pageData.pageSize, ); + if(dataMobTemp.length !== 0) { + this.dataSourceMobile = dataMobTemp + } else { + this.dataSourceMobile = this.dataSource.data?.slice( + (this.pageData.pageIndex - 1) * this.pageData.pageSize, + (this.pageData.pageIndex - 1) * this.pageData.pageSize + this.pageData.pageSize, + ); + } } - }); } @@ -196,6 +203,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { const next = length <= (pageIndex + 2) * pageSize; this.dataSourceMobile = this.dataSource.data.slice(pageIndex * pageSize, pageIndex * pageSize + pageSize); this.pageData = e; + this.pageData.previousPageIndex = e.pageIndex; if (next && this.nextKey && this.currentKey !== this.nextKey) { this.getListPrivateName(this.nextKey); From 924b1d10273b6855422889c1e1048d661f6a8a54 Mon Sep 17 00:00:00 2001 From: nhphuc <101378686+nhphuc2411@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:02:42 +0700 Subject: [PATCH 074/184] Merge pull request #2372 from aura-nw/fixing/fix_bug_account_detail_transaction fix filter account detail (cherry picked from commit 08b69492b8aff079b988c228a71df50234be1390) --- src/app/core/services/user.service.ts | 2 +- .../account-transaction-table.component.ts | 2 +- .../token-transfers-tab/token-transfers-tab.component.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts index 089e94a1a..0ae63ead7 100644 --- a/src/app/core/services/user.service.ts +++ b/src/app/core/services/user.service.ts @@ -114,7 +114,7 @@ export class UserService extends CommonService { type content } - events(where: {type: {_eq: "transfer"}, tx_msg_index: {_is_null: false}}) { + events(where: {type: {_eq: "transfer"}, tx_msg_index: {_is_null: false}, event_attribute_index: {composite_key: {_in: $compositeKeyIn}, value: {_eq: $address}}}) { event_attributes { composite_key value diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index 883b310ce..430cb6751 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -324,7 +324,7 @@ export class AccountTransactionTableComponent { setTimeout(() => { this.transactionLoading = false; - }, 2000); + }, 5000); } getListTypeFilter() { diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts index 18ab428f7..c3e9da108 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts @@ -98,7 +98,7 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { if (this.typeContract !== this.contractType.CW20) { this.linkToken = this.typeContract === this.contractType.CW721 ? 'token-nft' : 'token-abt'; } - + this.getListData(); this.timerGetUpTime = setInterval(() => { if (this.pageData.pageIndex === 0) { this.currentKey = null; From 92f2eaf7929a6fe5b31052696a85507ff6d77a53 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: Fri, 22 Sep 2023 11:15:04 +0700 Subject: [PATCH 075/184] Merge pull request #2373 from aura-nw/fix-bug/serenity-update-UI update account-transaction filter (Date filter) (cherry picked from commit ff1f9b07f932296d6d44b1fe699de68e2b12596f) --- .../account-transaction-table.component.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 4306d6990..b34fadccd 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -73,9 +73,14 @@ (ngModelChange)="searchType()" /> - - - + + + + From e36648f7cb05b9c4d719fef42c1b896ed119eaab 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: Fri, 22 Sep 2023 11:32:21 +0700 Subject: [PATCH 076/184] Merge pull request #2374 from aura-nw/fixing/fix_bug_account_detail_transaction fix code filter message (cherry picked from commit 18a7245644907cef7263413b565407742b8f1f64) --- .../account-transaction-table.component.html | 2 +- .../account-transaction-table.component.ts | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index b34fadccd..51941ff50 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -176,7 +176,7 @@ { if (element.label === 'Others') { this.isSearchOther = true; - } else { - lstTemp.push(element.label); } + lstTemp.push(element.label); }); } this.transactionFilter.type = lstTemp || null; From d4dfb54d362e32147687384739f99e57167114a1 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: Fri, 22 Sep 2023 12:10:29 +0700 Subject: [PATCH 077/184] Merge pull request #2375 from aura-nw/fixing/fix_bug_account_detail_transaction fix code filter message (cherry picked from commit 07ff9d1c970affbb4a1e1c067c411f8f7a2c6ce5) --- .../account-transaction-table.component.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index e65888fdb..a1231981d 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -159,16 +159,17 @@ export class AccountTransactionTableComponent { if (event.target.checked) { this.arrTypeFilter.push(type.label); this.listTypeSelectedTemp?.push(type); + if (this.listTypeSelectedTemp.length === this.tnxTypeOrigin.length) { + this.checkAll = true; + } } else { this.listTypeSelectedTemp?.forEach((element, index) => { - if (element.label === type.label) this.listTypeSelectedTemp?.splice(index, 1); + if (element.label === type.label) { + this.listTypeSelectedTemp?.splice(index, 1); + } }); } } - - if (this.listTypeSelectedTemp.length === this.tnxTypeOrigin.length) { - this.checkAll = true; - } } removeFilterType(type: any) { From bfc704e98837ec0ca06e6aba91ceb9fa8f54845b Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Fri, 22 Sep 2023 14:47:22 +0700 Subject: [PATCH 078/184] . --- .../profile/private-name-tag/private-name-tag.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1609e66b2..684db5dce 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 @@ -39,7 +39,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { modalReference: any; pageData: PageEvent = { length: PAGE_EVENT.LENGTH, - pageSize: 2, + pageSize: 10, pageIndex: PAGE_EVENT.PAGE_INDEX, }; textSearch = ''; From 4d4775ac580745f70ce4ec6978e75bc4c9643c90 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Fri, 22 Sep 2023 15:00:59 +0700 Subject: [PATCH 079/184] fix bug private name-tag --- .../profile/popup-name-tag/popup-name-tag.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 505d5b67e..f02d7606b 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -57,7 +57,9 @@
+ {{ publicNameTag }} +
@@ -79,7 +81,7 @@
{{ getAddress.value }}
Invalid aura address format
From 379e681a24b1cae75e907fe4362fac71e0c2ce7e Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Fri, 22 Sep 2023 16:51:21 +0700 Subject: [PATCH 080/184] fix bug private name-tag --- .../private-name-tag.component.scss | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss index 5421fd6cd..0f3c8c1b3 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.scss +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.scss @@ -19,25 +19,25 @@ .private-name-table { th.mat-header-cell:nth-child(1) { - min-width: 80px; - } - th.mat-header-cell:nth-child(7) { - min-width: 100px; - } - th.mat-header-cell:nth-child(4) { - min-width: 260px; + width: 80px; } th.mat-header-cell:nth-child(2) { - min-width: 190px; + width: 210px; } th.mat-header-cell:nth-child(3) { - min-width: 90px; + width: 90px; + } + th.mat-header-cell:nth-child(4) { + width: 270px; } th.mat-header-cell:nth-child(5) { - min-width: 140px; + width: 140px; } th.mat-header-cell:nth-child(6) { - min-width: 160px; + width: 160px; + } + th.mat-header-cell:nth-child(7) { + width: 100px; } } From e82147609e8bc34843424b1fa3bd0eed89f1285d Mon Sep 17 00:00:00 2001 From: mtam Date: Mon, 25 Sep 2023 09:40:27 +0700 Subject: [PATCH 081/184] [TamTM6] update interceptor author --- src/app/app.module.ts | 2 + src/app/core/helpers/error.interceptor.ts | 37 +++++++++++-------- src/app/core/services/user.service.ts | 1 + .../profile-settings.component.ts | 13 +------ 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b784da5a8..577e2f511 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -59,6 +59,7 @@ import { LayoutsModule } from './layouts/layouts.module'; import { SchemaViewerModule } from './pages/schema-viewer/schema-viewer.module'; import { MediaExpandModule } from './shared/components/media-expand/media-expand.module'; import { NameTagService } from './core/services/name-tag.service'; +import { UserService } from './core/services/user.service'; export function createTranslateLoader(http: HttpClient): any { return new TranslateHttpLoader(http, 'assets/i18n/', '.json'); @@ -176,6 +177,7 @@ export class MaterialModule {} SoulboundService, MappingErrorService, NameTagService, + UserService, { provide: DateAdapter, useClass: MomentDateAdapter, diff --git a/src/app/core/helpers/error.interceptor.ts b/src/app/core/helpers/error.interceptor.ts index fb747d406..b7e6a45e3 100644 --- a/src/app/core/helpers/error.interceptor.ts +++ b/src/app/core/helpers/error.interceptor.ts @@ -1,22 +1,29 @@ +import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http'; import { Observable, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; -import { AuthenticationService } from '../services/auth.service'; +import { UserService } from '../services/user.service'; @Injectable() export class ErrorInterceptor implements HttpInterceptor { + constructor(private userService: UserService) {} - constructor(private authenticationService: AuthenticationService) { } - - intercept(request: HttpRequest, next: HttpHandler): Observable> { - return next.handle(request).pipe(catchError(err => { - if (err.status === 401) { - // auto logout if 401 response returned from api - // location.reload(); - } - const error = err.error || err.statusText; - return throwError(error); - })) - } -} \ No newline at end of file + intercept(request: HttpRequest, next: HttpHandler): Observable> { + return next.handle(request).pipe( + catchError((err) => { + // check status unauthorized, refresh token + if (err?.error?.statusCode === 401 && err?.error?.message != 'Incorrect old password.') { + const payload = { + refreshToken: localStorage.getItem('refreshToken').replace(/"/g, ''), + }; + this.userService.refreshToken(payload).subscribe((res) => { + localStorage.setItem('accessToken', JSON.stringify(res.accessToken)); + localStorage.setItem('refreshToken', JSON.stringify(res.refreshToken)); + }); + } + const error = err.error || err.statusText; + return throwError(error); + }), + ); + } +} diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts index 0ae63ead7..b35ab97cf 100644 --- a/src/app/core/services/user.service.ts +++ b/src/app/core/services/user.service.ts @@ -42,6 +42,7 @@ export class UserService extends CommonService { } refreshToken(payload): Observable { + this.apiUrl = this.apiUrl || this.environmentService.configValue.beUri; return this.http.post(`${this.apiUrl}/auth/refresh-token`, payload); } diff --git a/src/app/pages/profile/profile-settings/profile-settings.component.ts b/src/app/pages/profile/profile-settings/profile-settings.component.ts index b52a313c7..a306c6046 100644 --- a/src/app/pages/profile/profile-settings/profile-settings.component.ts +++ b/src/app/pages/profile/profile-settings/profile-settings.component.ts @@ -88,18 +88,7 @@ export class ProfileSettingsComponent implements OnInit { }, error: (error) => { this.isError = true; - if (error?.details?.message === 'Unauthorized') { - const payload = { - refreshToken: localStorage.getItem('refreshToken').replace(/"/g, ''), - }; - this.userService.refreshToken(payload).subscribe((res) => { - localStorage.setItem('accessToken', JSON.stringify(res.accessToken)); - localStorage.setItem('refreshToken', JSON.stringify(res.refreshToken)); - this.onSubmit(); - }); - } else { - this.errorMessage = error?.details?.message; - } + this.errorMessage = error?.details?.message; }, }); } From 3d1132d67bb3a3b3438755b0bf37bb13f71ce861 Mon Sep 17 00:00:00 2001 From: mtam Date: Mon, 25 Sep 2023 09:58:07 +0700 Subject: [PATCH 082/184] [TamTM6] update nextkey (cherry picked from commit 6c09fd47d1ecd6fcc6a69affa5dcab47c815bd75) --- .../profile/private-name-tag/private-name-tag.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 684db5dce..ac77a7cf7 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 @@ -99,11 +99,13 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { const payload = { limit: 100, keyword: this.textSearch || '', + nextKey: nextKey }; this.nameTagService.getListPrivateNameTagNextKey(payload).subscribe((res) => { + this.nextKey = null; if (res.data?.nameTags?.length >= 100) { - this.nextKey = res.data[res.data?.nameTags?.length - 1].id; + this.nextKey = res.data[res.data?.nameTags?.length - 1]?.id; } this.countFav = res.data?.nameTags?.filter((k) => k.isFavorite === 1)?.length || 0; res.data?.nameTags.forEach((element) => { From bb2a834222901ba3a55051664bda44a591ca466a Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Mon, 25 Sep 2023 14:30:30 +0700 Subject: [PATCH 083/184] pick code from serenity --- .../contracts/contracts-detail/contracts-detail.component.ts | 2 +- .../token-transfers-tab/token-transfers-tab.component.html | 2 +- .../pages/token/token-list/token-cw20/token-cw20.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/contracts/contracts-detail/contracts-detail.component.ts b/src/app/pages/contracts/contracts-detail/contracts-detail.component.ts index ca970bdc3..4b701a38c 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-detail.component.ts +++ b/src/app/pages/contracts/contracts-detail/contracts-detail.component.ts @@ -40,7 +40,7 @@ export class ContractsDetailComponent implements OnInit, OnDestroy { }); } this.subscription = this.contractService.contractObservable.subscribe((res) => { - if (res) { + if (res?.instantiate_hash) { res.tx_hash = res.instantiate_hash; res.execute_msg_schema = _.get(res, 'code.code_id_verifications[0].execute_msg_schema'); res.instantiate_msg_schema = _.get(res, 'code.code_id_verifications[0].instantiate_msg_schema'); diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html index 858fb6dae..c840b8633 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html @@ -6,7 +6,7 @@ A total of {{ pageData?.length | number }} transaction{{ pageData?.length > 1 ? 's' : '' }} found
-
+
diff --git a/src/app/pages/token/token-list/token-cw20/token-cw20.component.html b/src/app/pages/token/token-list/token-cw20/token-cw20.component.html index eba98e7f3..598fa9c73 100644 --- a/src/app/pages/token/token-list/token-cw20/token-cw20.component.html +++ b/src/app/pages/token/token-list/token-cw20/token-cw20.component.html @@ -53,7 +53,7 @@

CW-20 Tokens

Token -
+
From ba82ddf3347f420577f620bbe3ec6a227a6f992b Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Mon, 25 Sep 2023 14:34:11 +0700 Subject: [PATCH 084/184] Update UI account detail (update filter dropdown behavior) --- .../nft-list/nft-list.component.html | 46 +++++++++--------- .../nft-list/nft-list.component.scss | 36 ++++++++++++++ .../nft-list/nft-list.component.ts | 5 ++ .../token-table/token-table.component.html | 47 +++++++++++-------- .../token-table/token-table.component.scss | 39 +++++++++++++-- .../token-table/token-table.component.ts | 8 +++- 6 files changed, 134 insertions(+), 47 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 58d9838ce..cffe13573 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -6,27 +6,31 @@

NFTs ({{ listCollection[
Collections
- - -
- -
-
- {{ (item.label | cutStringPipe : numLength) + ' (' + item.quantity + ')' }} -
-
- -
-
- - +
+ +
    +
  • + {{ (item.label | cutStringPipe : numLength) + ' (' + item.quantity + ')' }} +
    • +
+
diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss index 02fe75f52..b16d16dcb 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss @@ -13,6 +13,42 @@ min-width: 312px; } +#nftFilter { + min-width: 200px; + text-align: left; + &[aria-expanded='true'] { + i.ph-caret-down { + display: none; + } + i.ph-caret-up { + display: flex; + } + } + &[aria-expanded='false'] { + i.ph-caret-down { + display: flex; + } + i.ph-caret-up { + display: none; + } + } +} +.item-border { + position: relative; + margin-bottom: 7px; + &:before { + content: ''; + position: absolute; + left: 0; + right: 0; + width: 100%; + bottom: -5px; + height: 1px; + background-color: var(--aura-gray-8); + } +} + + ::ng-deep { .mat-form-field[nftFilter] { background-color: var(--aura-gray-10); diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts index 79de01d38..e3b60a75b 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts @@ -27,6 +27,7 @@ export class NftListComponent implements OnChanges { pageIndex: 1, }; nftFilter = ''; + nftFilterLabel = 'All (0)'; nftList = []; maxLengthSearch = MAX_LENGTH_SEARCH_TOKEN; totalValue = 0; @@ -138,12 +139,16 @@ export class NftListComponent implements OnChanges { }); }); this.listCollection[0].quantity = res?.cw721_token_aggregate?.aggregate?.count; + this.setNFTFilterLabel(this.listCollection[0]); } }, () => {}, () => {}, ); } + setNFTFilterLabel(nft) { + this.nftFilterLabel = nft.label + ' (' + nft.quantity + ')'; + } resetSearch(): void { this.searchValue = ''; diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.html b/src/app/pages/account/account-detail/token-table/token-table.component.html index 16cf5267e..8f2eb6d2d 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.html +++ b/src/app/pages/account/account-detail/token-table/token-table.component.html @@ -9,25 +9,32 @@

Coins & Tokens ({{ pageData?. class="d-flex align-items-center justify-content-center ml-2 ml-lg-0 w-100" *ngIf="!breakpoint.value.matches">
Type
- - -
- -
-
- {{ item.label + ' (' + item.quantity + ')' }} -
-
- -
-
- - +
+ +
    +
  • + {{ item.label + ' (' + item.quantity + ')' }} +
    • +
+

@@ -75,7 +82,7 @@

Coins & Tokens ({{ pageData?.
  • {{ item.label + ' (' + item.quantity + ')' }}
    • diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.scss b/src/app/pages/account/account-detail/token-table/token-table.component.scss index d21d44067..fa4ed429a 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.scss +++ b/src/app/pages/account/account-detail/token-table/token-table.component.scss @@ -126,11 +126,6 @@ } } - .token-filter-none::after, - .token-filter-none::before { - display: none; - } - .filter-dropdown { right: unset !important; transform: translateX(-50%) !important; @@ -159,3 +154,37 @@ padding: 0 8px !important; } } +#tokenFilter { + min-width: 200px; + text-align: left; + &[aria-expanded='true'] { + i.ph-caret-down { + display: none; + } + i.ph-caret-up { + display: flex; + } + } + &[aria-expanded='false'] { + i.ph-caret-down { + display: flex; + } + i.ph-caret-up { + display: none; + } + } +} +.item-border { + position: relative; + margin-bottom: 7px; + &:before { + content: ''; + position: absolute; + left: 0; + right: 0; + width: 100%; + bottom: -5px; + height: 1px; + background-color: var(--aura-gray-8); + } +} 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 6faac710c..38ac18dc7 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 @@ -1,5 +1,5 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; -import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; +import {ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output} from '@angular/core'; import { PageEvent } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; import BigNumber from 'bignumber.js'; @@ -23,6 +23,7 @@ export class TokenTableComponent implements OnChanges { @Output() totalValue = new EventEmitter(); @Output() totalAssets = new EventEmitter(); tokenFilter = ''; + tokenFilterLabel = 'All (0)'; textSearch = ''; searchValue = ''; templates: Array = [ @@ -157,6 +158,7 @@ export class TokenTableComponent implements OnChanges { this.dataSource.data = []; } this.totalAssets.emit(this.pageData?.length || 0); + this.setTokenFilterLabel(this.listTokenType[0]); }, () => {}, () => { @@ -166,6 +168,10 @@ export class TokenTableComponent implements OnChanges { } } + setTokenFilterLabel(token) { + this.tokenFilterLabel = token.label + ' (' + token.quantity + ')'; + } + convertValue(value: any, decimal: number) { return balanceOf(value, decimal); } From c6ab1d8b697cf221e42b7d21447f06e63ec62bb6 Mon Sep 17 00:00:00 2001 From: mtam Date: Mon, 25 Sep 2023 14:40:12 +0700 Subject: [PATCH 085/184] [TamTM6] fix width column contract list --- .../contracts/contracts-list/contracts-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/contracts/contracts-list/contracts-list.component.html b/src/app/pages/contracts/contracts-list/contracts-list.component.html index e21f5c790..ae9501211 100644 --- a/src/app/pages/contracts/contracts-list/contracts-list.component.html +++ b/src/app/pages/contracts/contracts-list/contracts-list.component.html @@ -97,7 +97,7 @@

    Contracts

    		 -
    +
    		From 72c101ba3558e1e0ed233c4f77295a9233ba21e1 Mon Sep 17 00:00:00 2001 From: mtam Date: Mon, 25 Sep 2023 14:24:50 +0700 Subject: [PATCH 086/184] [TamTM6] fix display type msg (cherry picked from commit 302d4cda1c88c0f10339fd4c489a1779103def0b) --- src/app/global/global.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/global/global.ts b/src/app/global/global.ts index 43d3be7c7..388ffb9a0 100644 --- a/src/app/global/global.ts +++ b/src/app/global/global.ts @@ -508,7 +508,7 @@ export function convertDataAccountTransaction( } export function getTypeTx(element, index = 0) { - let type = element?.transaction_messages[element?.transaction_messages?.length - 1]?.content['@type']; + let type = element?.transaction_messages[0]?.content['@type']; let action; if (type === TRANSACTION_TYPE_ENUM.ExecuteContract) { try { From 6875fc8aad14c101661635c3f759b9f14a902d14 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Mon, 25 Sep 2023 15:20:11 +0700 Subject: [PATCH 087/184] Update UI account detail (update filter dropdown behavior) --- .../account-transaction-table.component.html | 24 +++--- .../account-transaction-table.component.scss | 7 +- .../nft-list/nft-list.component.html | 2 +- .../nft-list/nft-list.component.scss | 77 +------------------ .../token-table/token-table.component.html | 4 +- .../token-table/token-table.component.scss | 70 ----------------- 6 files changed, 20 insertions(+), 164 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 51941ff50..f3a09febc 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -29,7 +29,11 @@ -
    +
    +
    + {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} + found +
    @@ -51,7 +55,7 @@
    -
    +
    -
    - {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} - found -
    -
    - {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} - found -
    -
    +
    +
    + {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} + found +
    +
    +
    {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} found
    diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss index 21a20647d..229d14e2f 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss @@ -236,7 +236,7 @@ mat-date-range-input { scrollbar-width: none; /* Firefox */ overflow: hidden; overflow-x: scroll; - padding-bottom: 200px; + padding-bottom: 184px; @media (min-width: 991.98px) { overflow: visible; padding-bottom: 0; @@ -275,10 +275,7 @@ mat-date-range-input { padding: 4px 8px; } } -.card-mob-account { - margin-top: -200px; -} -.noData { +.noData,.box-filter__desc { margin-top: -200px; @media (min-width: 991.98px) { margin-top: 0; diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index cffe13573..3e2e1d5bf 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -6,7 +6,7 @@

    NFTs ({{ listCollection[
    Collections
    -
    +
      + class="dropdown-menu aura-dropdown-menu filter-dropdown border-sm border-gray-9 border-radius--sm" + aria-labelledby="nftFilter">
    • + *ngFor="let item of listCollection; let i = index" + (click)="nftFilter = item.address; filterCollecttion(); setNFTFilterLabel(item)" + [class.item-border]="i === 0" + [class.mb-1]="i > 0" + class="dropdown-item cursor-pointer" + [class.active]="nftFilter === item.address"> {{ (item.label | cutStringPipe : numLength) + ' (' + item.quantity + ')' }}
    diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss index 935d63c6f..a18f2f8fd 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss @@ -48,90 +48,6 @@ } } - -::ng-deep { - .mat-form-field[nftFilter] { - background-color: var(--aura-gray-10); - border-radius: 8px; - display: flex; - align-items: center; - width: 150px; - height: 40px; - @media (min-width: 991.98px) { - width: 100%; - } - &.mat-focused { - border-color: var(--aura-white); - } - - .mat-form-field-wrapper { - width: 100%; - padding-bottom: 0; - } - - .mat-form-field-flex { - padding: 0 16px; - background: transparent; - height: 40px; - } - - .mat-form-field-infix { - padding: 4px 0 0.75em 0; - } - - .mat-select-placeholder, - mat-select-trigger { - position: relative; - color: var(--aura-gray-5); - font-size: 1.4rem; - line-height: 1.6rem; - } - - .mat-select-value { - color: var(--aura-gray-1); - } - - .mat-form-field-underline { - display: none; - } - - .mat-select-arrow-wrapper { - transform: translateY(-26%); - - .mat-select-arrow { - border: solid var(--aura-white); - border-width: 0 1px 1px 0; - display: inline-block; - padding: 4px; - transform: rotate(45deg); - -webkit-transform: rotate(45deg); - } - } - } - mat-select.nft-filter[aria-expanded='true'] { - .mat-select-arrow { - border-width: 1px 0 0 1px !important; - } - .mat-select-arrow-wrapper { - transform: translateY(2%); - } - } - - .nftFilterPanel { - border: 1px solid var(--aura-gray-8); - background: #25252c; - min-width: calc(100% + 20px) !important; - transform: translate3D(5px, 32px, 0) !important; - padding: var(--spacer-2) !important; - border-radius: 8px; - } - .mat-option { - border-radius: 4px; - color: var(--aura-white) !important; - padding: 0 8px !important; - } -} - .box-nft { .input-group { height: 40px; @@ -146,18 +62,5 @@ max-height: 285px; overflow-y: auto !important; } - - .mat-option { - border-radius: 4px; - color: var(--aura-white) !important; - padding: 0 8px !important; - } } -@media (max-width: 414px) { - ::ng-deep { - .mat-select-panel { - max-width: 100vw !important; - } - } -} diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts index e3b60a75b..abdfcb6b6 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts @@ -1,5 +1,5 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; -import {Component, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges, ViewChild} from '@angular/core'; +import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { PageEvent } from '@angular/material/paginator'; import * as _ from 'lodash'; import { LENGTH_CHARACTER, PAGE_EVENT } from 'src/app/core/constants/common.constant'; @@ -8,8 +8,6 @@ import { EnvironmentService } from 'src/app/core/data-services/environment.servi import { AccountService } from 'src/app/core/services/account.service'; import { checkTypeFile } from 'src/app/core/utils/common/info-common'; import { Globals } from 'src/app/global/global'; -import {MatMenuTrigger} from "@angular/material/menu"; -import {MatSelect} from "@angular/material/select"; @Component({ selector: 'app-nft-list', templateUrl: './nft-list.component.html', @@ -43,13 +41,6 @@ export class NftListComponent implements OnChanges { ]; breakpoint$ = this.layout.observe([Breakpoints.Small, Breakpoints.XSmall]); - @ViewChild('nftFilterPanel') nftFilterPanel : MatSelect; - - @HostListener('window:scroll', ['$event']) - closeFilterPanelSection(_) { - this.nftFilterPanel.close(); - } - constructor( private accountService: AccountService, public global: Globals, @@ -70,6 +61,11 @@ export class NftListComponent implements OnChanges { } } + filterCollecttion() { + this.pageData.pageIndex = 1; + this.getNftData(); + } + getNftData() { const payload = { owner: this.address, @@ -146,6 +142,7 @@ export class NftListComponent implements OnChanges { () => {}, ); } + setNFTFilterLabel(nft) { this.nftFilterLabel = nft.label + ' (' + nft.quantity + ')'; } From 320324f9d71bc60dd565f28c3b33375ea3d44fe6 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Mon, 25 Sep 2023 15:52:52 +0700 Subject: [PATCH 089/184] fix issue filter collection --- .../token-table/token-table.component.html | 28 +++++++++---------- .../token-table/token-table.component.scss | 7 +---- .../token-table/token-table.component.ts | 2 +- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.html b/src/app/pages/account/account-detail/token-table/token-table.component.html index 9d88903c1..8722b27fd 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.html +++ b/src/app/pages/account/account-detail/token-table/token-table.component.html @@ -11,26 +11,26 @@

    Coins & Tokens ({{ pageData?.
    Type
      + class="dropdown-menu aura-dropdown-menu filter-dropdown border-sm border-gray-9 border-radius--sm" + aria-labelledby="tokenFilter">
    • + *ngFor="let item of listTokenType; let i = index" + (click)="tokenFilter = item.value; getListToken(); setTokenFilterLabel(item)" + class="dropdown-item cursor-pointer" + [class.item-border]="i === 0" + [class.mb-1]="i > 0" + [class.active]="tokenFilter === item.value"> {{ item.label + ' (' + item.quantity + ')' }}
    diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.scss b/src/app/pages/account/account-detail/token-table/token-table.component.scss index 1fb4aad15..489d6c593 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.scss +++ b/src/app/pages/account/account-detail/token-table/token-table.component.scss @@ -77,13 +77,8 @@ width: 214px !important; } } - - .mat-option { - border-radius: 4px; - color: var(--aura-white) !important; - padding: 0 8px !important; - } } + #tokenFilter { min-width: 200px; text-align: left; 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 38ac18dc7..a5a7cdc45 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 @@ -1,5 +1,5 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; -import {ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output} from '@angular/core'; +import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { PageEvent } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; import BigNumber from 'bignumber.js'; From 20c33c7fb05b6aa215584977ebe633fe523800b9 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Mon, 25 Sep 2023 16:06:22 +0700 Subject: [PATCH 090/184] fix bug ABT -> pause media when play another --- .../soulbound-feature-tokens.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 0edf320c0..85c59502b 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 @@ -25,14 +25,16 @@

    ABTs ({{ totalABT || 0 }})

    -
    +
    From 3d62da3393f259f8e096eb9a63590cf1760372dc Mon Sep 17 00:00:00 2001 From: mtam Date: Mon, 25 Sep 2023 17:07:19 +0700 Subject: [PATCH 091/184] [TamTM6] update version cosmjs --- package.json | 4 ++-- src/app/core/utils/signing/transaction-manager.ts | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0ab371e1a..a0f080e91 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ "@angular/platform-browser-dynamic": "~12.0.2", "@angular/router": "~12.0.2", "@coin98-com/connect-sdk": "^1.0.9", - "@cosmjs/cosmwasm-stargate": "^0.28.13", + "@cosmjs/cosmwasm-stargate": "^0.31.1", "@cosmjs/encoding": "^0.28.13", "@cosmjs/proto-signing": "^0.29.5", - "@cosmjs/stargate": "^0.28.13", + "@cosmjs/stargate": "^0.31.1", "@google/model-viewer": "^1.12.0", "@ng-bootstrap/ng-bootstrap": "^10.0.0", "@ngx-translate/core": "^13.0.0", diff --git a/src/app/core/utils/signing/transaction-manager.ts b/src/app/core/utils/signing/transaction-manager.ts index 7614c4f1e..78951c726 100644 --- a/src/app/core/utils/signing/transaction-manager.ts +++ b/src/app/core/utils/signing/transaction-manager.ts @@ -58,10 +58,7 @@ export async function createSignBroadcast( export async function getNetworkFee(network, address, messageType, memo = ''): Promise { //set default for multi gas - let multiGas = 1.3; - if (messageType?.typeUrl === TRANSACTION_TYPE_ENUM.MsgRevokeAllowance) { - multiGas = 1.4; - } + let multiGas = 1.6; let gasEstimation = 0; try { From c5b7003780273ec76493d351c0dff45f4bb92967 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Tue, 26 Sep 2023 09:04:16 +0700 Subject: [PATCH 092/184] fix bug UI account detail --- .../account-transaction-table.component.html | 13 ++++++------ .../account-transaction-table.component.scss | 21 ++++++++++++++++++- .../nft-list/nft-list.component.html | 8 ++----- .../nft-list/nft-list.component.scss | 1 + .../nft-list/nft-list.component.ts | 8 +++---- .../token-table/token-table.component.html | 4 ++-- .../token-table/token-table.component.scss | 1 + .../token-table/token-table.component.ts | 8 +++---- 8 files changed, 41 insertions(+), 23 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index f3a09febc..cd9890d08 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -2,18 +2,18 @@ class="d-lg-none d-flex align-items-center mb-4 {{ !displayFilter ? 'justify-content-between' : 'justify-content-end' }}"> -
    +
    {{ nextKey ? 'More than' : 'A total of' }} {{ pageData?.length }} transaction{{ pageData?.length > 1 ? 's' : '' }} found
    @@ -104,6 +104,7 @@
    {{ getAddress.value }}
    Invalid aura address format
    diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index a9b361284..613a55a9c 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -7,6 +7,7 @@ import { EnvironmentService } from 'src/app/core/data-services/environment.servi import { CommonService } from 'src/app/core/services/common.service'; import { NameTagService } from 'src/app/core/services/name-tag.service'; import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; +import { isAddress, isContract } from 'src/app/core/utils/common/validation'; @Component({ selector: 'app-popup-name-tag', @@ -98,8 +99,8 @@ export class PopupNameTagComponent implements OnInit { this.getAddress['value'] = this.getAddress?.value.trim(); if (this.getAddress.value?.length > 0 && this.getAddress?.value?.startsWith('aura')) { - this.isValidAddress = (this.getAddress.value.trim()?.length === LENGTH_CHARACTER.ADDRESS && this.isAccount) || - (this.getAddress.value.trim()?.length === LENGTH_CHARACTER.CONTRACT && !this.isAccount); + this.isValidAddress = + (isAddress(this.getAddress.value) && this.isAccount) || (isContract(this.getAddress.value) && !this.isAccount); } else { this.isValidAddress = false; } From 82cc6a5237e4c0b15e9ca680b08f119fd8849987 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Tue, 26 Sep 2023 13:44:02 +0700 Subject: [PATCH 098/184] fix bug UI account-detail --- .../account-detail/nft-list/nft-list.component.html | 5 +++-- .../account-detail/nft-list/nft-list.component.scss | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 1da831e3d..5ac0c86d0 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -13,7 +13,8 @@

    NFTs ({{ listCollection[ id="nftFilter" data-bs-toggle="dropdown" aria-expanded="false"> - {{ nftFilterItem.label | stringEllipsis : 16 }} ({{ nftFilterItem.quantity }}) + {{ nftFilterItem.label | stringEllipsis : 16 }} ({{ nftFilterItem.quantity }}) + {{ nftFilterItem.label | stringEllipsis : 35 }} ({{ nftFilterItem.quantity }}) @@ -25,7 +26,7 @@

    NFTs ({{ listCollection[ (click)="nftFilter = item.address; filterCollecttion(); setNFTFilter(item)" [class.item-border]="i === 0" [class.mb-1]="i > 0" - class="dropdown-item cursor-pointer" + class="dropdown-item cursor-pointer px-4 px-lg-2" [class.active]="nftFilter === item.address"> {{ (item.label | cutStringPipe : numLength) + ' (' + item.quantity + ')' }} diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss index d4ff4d315..0b2338c7d 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss @@ -14,10 +14,12 @@ } #nftFilter { - min-width: 200px; + width: 100%; + @media (min-width: 991.98px) { + width: 220px; + } text-align: left; height: 40px; - width: 100%; &[aria-expanded='true'] { i.ph-caret-down { display: none; @@ -67,6 +69,6 @@ } .nftFilterPanel { - min-height: 285px; + min-height: 85px; width: 100%; -} \ No newline at end of file +} From 7bd75e4ba7b1b3dc76e60d11f87f1225dd2bf355 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 26 Sep 2023 14:04:46 +0700 Subject: [PATCH 099/184] fix bug UI account-detail --- .../nft-list/nft-list.component.html | 3 + .../token-table/token-table.component.html | 260 +++++++++--------- 2 files changed, 132 insertions(+), 131 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 5ac0c86d0..66d513d6d 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -114,6 +114,9 @@

    NFTs ({{ listCollection[

    +
    + +
    -
    +

    Coins & Tokens ({{ pageData?.length || 0 }})

    @@ -17,7 +17,7 @@

    Coins & Tokens ({{ pageData?. id="tokenFilter" data-bs-toggle="dropdown" aria-expanded="false"> - {{ tokenFilterItem.label | stringEllipsis : 16 }} ({{tokenFilterItem.quantity}}) + {{ tokenFilterItem.label | stringEllipsis : 16 }} ({{ tokenFilterItem.quantity }}) @@ -91,48 +91,27 @@

    Coins & Tokens ({{ pageData?.

    - - -
    - - - - - + +
    -
    -
    - - -
    -
    - -
    -
    - {{ element.name | stringEllipsis : 30 }} -
    -
    -
    - -
    - - -
    -
    -     -
    + +
    + + + + + - - - - - - - + +
    +
    + {{ element.name | stringEllipsis : 19 }} +
    - - -
    - - + + + - - - - + + + + + + + - + + + - - - - + - + + +
    + + + - - + + + + + - - -
    +
    +
    + + +
    + -
    		-
    - Contract - - - -
    -     		-
    - Price -
    - ${{ +element.price | mask : 'separator.6' }} - | -
    - {{ element.isValueUp ? '↑' : '↓' }}{{ element.change | number : global.formatNumber2Decimal }}% - +
    +
    + +
    + +
    + {{ element.symbol }}
    -
    		- Amount - -
    -     -
    -
    - <0,001 -
    - - + + +
    		+
    + Contract + + - +
    +     		+
    + Price +
    + ${{ +element.price | mask : 'separator.6' }} + |
    + class="d-flex {{ element.isValueUp ? 'text--green-3' : 'text--red-3' }}" + *ngIf="element.change !== '-'; else defaultValues"> + {{ element.isValueUp ? '↑' : '↓' }}{{ element.change | number : global.formatNumber2Decimal }}% + +
    -     		-
    - Value - - - ${{ element.price * element.balance | number : global.formatNumber2Decimal }} - -
    -     + + +
    		+ Amount + +
    +     +
    +
    + <0,001
    -
    		+
    + Value + + + ${{ element.price * element.balance | number : global.formatNumber2Decimal }} + +
    +     +
    +
    -
    -
    - -
    - - -
    - -
    -     + - + +
    +
    +
    + +
    + +
    +     +
    +
    From 08009df588f986b222b2ca0b33c99f342fab4923 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 26 Sep 2023 14:23:00 +0700 Subject: [PATCH 100/184] fix bug UI account-detail --- .../account/account-detail/nft-list/nft-list.component.html | 4 ++-- .../account/account-detail/nft-list/nft-list.component.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 66d513d6d..09efd7f69 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -13,8 +13,8 @@

    NFTs ({{ listCollection[ id="nftFilter" data-bs-toggle="dropdown" aria-expanded="false"> - {{ nftFilterItem.label | stringEllipsis : 16 }} ({{ nftFilterItem.quantity }}) - {{ nftFilterItem.label | stringEllipsis : 35 }} ({{ nftFilterItem.quantity }}) + {{ nftFilterItem?.label | stringEllipsis : 16 }} ({{ nftFilterItem?.quantity }}) + {{ nftFilterItem?.label | stringEllipsis : 35 }} ({{ nftFilterItem?.quantity }}) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts index 479f9c7a9..d5d64eef8 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts @@ -63,6 +63,7 @@ export class NftListComponent implements OnInit, OnChanges { ngOnInit(): void { this.getListCollection(); + this.setNFTFilter(this.listCollection[0]); } filterCollecttion() { From aa4f5fde61e3e57da42b0a4f93aa6f2cef4417c7 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 26 Sep 2023 14:25:35 +0700 Subject: [PATCH 101/184] fix bug UI account-detail --- .../account-detail/token-table/token-table.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.html b/src/app/pages/account/account-detail/token-table/token-table.component.html index 9aeebb7c7..5fa764904 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.html +++ b/src/app/pages/account/account-detail/token-table/token-table.component.html @@ -17,7 +17,7 @@

    Coins & Tokens ({{ pageData?. id="tokenFilter" data-bs-toggle="dropdown" aria-expanded="false"> - {{ tokenFilterItem.label | stringEllipsis : 16 }} ({{ tokenFilterItem.quantity }}) + {{ tokenFilterItem?.label | stringEllipsis : 16 }} ({{ tokenFilterItem?.quantity }}) From 88e7b2f04ad6c2ed54ebeed0e52b32f772b77739 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Tue, 26 Sep 2023 11:30:52 +0700 Subject: [PATCH 102/184] fix bug UI private-name-tag (cherry picked from commit 49a7b8f902aa5f8f385a10e125bfa215d871b6c1) # Conflicts: # src/app/pages/profile/popup-name-tag/popup-name-tag.component.html --- .../profile/popup-name-tag/popup-name-tag.component.html | 4 ++-- .../profile/private-name-tag/private-name-tag.component.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html index 41e8b7efb..06dc99380 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.html @@ -1,7 +1,7 @@
    -
    +
    {{ isEditMode ? 'Edit' : 'Create' }} Private Name Tag
    @@ -16,7 +16,7 @@ autocomplete="off">
    - Set favorite in tag list + Set favorite in tag list
    diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 2ebd6f992..1974f4029 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -4,7 +4,7 @@ (click)="openPopup()" class="button button--xlg button--ssm-mob button-pill button-primary button-flat" type="button"> - Create + Create
    From 529e43eac5c0d1a05f83ba54928b43a7206fce45 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Tue, 26 Sep 2023 11:46:16 +0700 Subject: [PATCH 103/184] fix bug UI private-name-tag (cherry picked from commit 11758fe49caf9f07be8b5abf72b1dbb6fde100d7) --- .../shared/components/popup-common/popup-common.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/popup-common/popup-common.component.html b/src/app/shared/components/popup-common/popup-common.component.html index db34c6c45..dc8455a80 100644 --- a/src/app/shared/components/popup-common/popup-common.component.html +++ b/src/app/shared/components/popup-common/popup-common.component.html @@ -1,6 +1,6 @@
    -
    +
    {{ data.title }}
    Date: Tue, 26 Sep 2023 14:53:04 +0700 Subject: [PATCH 104/184] fix reset page (cherry picked from commit 1e4f1607e1b9f7e5c40c4d9631d4b4056ab39ac9) --- .../profile/private-name-tag/private-name-tag.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ac77a7cf7..da0e3c1fe 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 @@ -144,7 +144,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { dialogRef.afterClosed().subscribe((result) => { if (result) { setTimeout(() => { - this.getListPrivateName(); + this.pageChange.selectPage(0); }, 4000); } }); From 8cc8276831f6f2181839f81d94ae6103c8c19fb1 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 26 Sep 2023 14:59:03 +0700 Subject: [PATCH 105/184] remove console log --- src/app/core/helpers/error.interceptor.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/core/helpers/error.interceptor.ts b/src/app/core/helpers/error.interceptor.ts index 2a11be1e6..e161be67b 100644 --- a/src/app/core/helpers/error.interceptor.ts +++ b/src/app/core/helpers/error.interceptor.ts @@ -13,8 +13,6 @@ export class ErrorInterceptor implements HttpInterceptor { return next.handle(request).pipe( catchError((err) => { // check status unauthorized, refresh token - console.log(err); - if (err?.error?.statusCode === 401 && err?.error?.message == 'Unauthorized') { const payload = { refreshToken: localStorage.getItem('refreshToken').replace(/"/g, ''), From 1b267db13bd862c39df554f0941b8301e03a1034 Mon Sep 17 00:00:00 2001 From: mtam Date: Tue, 26 Sep 2023 15:42:39 +0700 Subject: [PATCH 106/184] [TamTM6] fix amount less than account detail, tx detail --- src/app/core/helpers/error.interceptor.ts | 2 -- src/app/core/pipes/common-pipe.module.ts | 3 +++ src/app/core/pipes/common.pipe.ts | 27 +++++++++++++++++++ src/app/global/global.ts | 4 +-- .../account-transaction-table.component.html | 12 +++++++-- .../nft-list/nft-list.component.html | 5 ++-- .../token-table/token-table.component.html | 2 +- .../token-table/token-table.component.ts | 6 ----- .../contracts-transactions.component.html | 2 +- .../popup-name-tag.component.ts | 2 +- .../token-transfer.component.html | 11 +++++++- .../token-transfer.component.ts | 3 +++ 12 files changed, 61 insertions(+), 18 deletions(-) diff --git a/src/app/core/helpers/error.interceptor.ts b/src/app/core/helpers/error.interceptor.ts index 2a11be1e6..e161be67b 100644 --- a/src/app/core/helpers/error.interceptor.ts +++ b/src/app/core/helpers/error.interceptor.ts @@ -13,8 +13,6 @@ export class ErrorInterceptor implements HttpInterceptor { return next.handle(request).pipe( catchError((err) => { // check status unauthorized, refresh token - console.log(err); - if (err?.error?.statusCode === 401 && err?.error?.message == 'Unauthorized') { const payload = { refreshToken: localStorage.getItem('refreshToken').replace(/"/g, ''), diff --git a/src/app/core/pipes/common-pipe.module.ts b/src/app/core/pipes/common-pipe.module.ts index 53186ee90..de4d8eafe 100644 --- a/src/app/core/pipes/common-pipe.module.ts +++ b/src/app/core/pipes/common-pipe.module.ts @@ -12,6 +12,7 @@ import { convertLogAmount, decodeData, displayTypeToolTip, + convertSmallNumber, } from './common.pipe'; import { JsonPipe } from './json.pipe'; @@ -29,6 +30,7 @@ import { JsonPipe } from './json.pipe'; convertLogAmount, decodeData, displayTypeToolTip, + convertSmallNumber ], imports: [CommonModule], exports: [ @@ -44,6 +46,7 @@ import { JsonPipe } from './json.pipe'; convertLogAmount, decodeData, displayTypeToolTip, + convertSmallNumber ], }) export class CommonPipeModule {} diff --git a/src/app/core/pipes/common.pipe.ts b/src/app/core/pipes/common.pipe.ts index d92d8df88..7ebd8a135 100644 --- a/src/app/core/pipes/common.pipe.ts +++ b/src/app/core/pipes/common.pipe.ts @@ -161,3 +161,30 @@ export class displayTypeToolTip implements PipeTransform { return result; } } + +@Pipe({ name: 'convertSmallNumber' }) +export class convertSmallNumber implements PipeTransform { + constructor() {} + transform(amount: number, decimal: number = 6): any { + let valueString = (new BigNumber(amount).toNumber() / Math.pow(10, decimal)).toString(); + return displayFullNumber(valueString); + } +} + +function displayFullNumber(x) { + if (Math.abs(x) < 1.0) { + var e = parseInt(x.toString().split('e-')[1]); + if (e) { + x *= Math.pow(10, e - 1); + x = '0.' + new Array(e).join('0') + x.toString().substring(2); + } + } else { + var e = parseInt(x.toString().split('+')[1]); + if (e > 20) { + e -= 20; + x /= Math.pow(10, e); + x += new Array(e + 1).join('0'); + } + } + return x; +} diff --git a/src/app/global/global.ts b/src/app/global/global.ts index 388ffb9a0..5020b18b2 100644 --- a/src/app/global/global.ts +++ b/src/app/global/global.ts @@ -438,12 +438,12 @@ export function convertDataAccountTransaction( let decimal = _.get(item, 'smart_contract_events[0].smart_contract.cw20_contract.decimal'); let amount = balanceOf(amountTemp || 0, +decimal); let contractAddress = _.get(item, 'smart_contract_events[0].smart_contract.address'); - return { type, fromAddress, toAddress, amount, denom, contractAddress, action }; + return { type, fromAddress, toAddress, amount, denom, contractAddress, action, amountTemp, decimal }; }); break; case TabsAccountLink.NftTxs: arrEvent = _.get(element, 'events')?.map((item, index) => { - let {type, action} = getTypeTx(element, index); + let { type, action } = getTypeTx(element, index); let fromAddress = _.get(item, 'smart_contract_events[0].cw721_activity.from') || NULL_ADDRESS; let toAddress = _.get(item, 'smart_contract_events[0].cw721_activity.to') || diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 37e28083a..386cde1fc 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -398,8 +398,16 @@ [class.show-detail]="data.expand || index === 0" *ngIf="index < data.limit">
    -
    - +
    +
    + <0,001 +
    + + +
    diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 1da831e3d..22d06ccbf 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -13,13 +13,14 @@

    NFTs ({{ listCollection[ id="nftFilter" data-bs-toggle="dropdown" aria-expanded="false"> - {{ nftFilterItem.label | stringEllipsis : 16 }} ({{ nftFilterItem.quantity }}) + {{ nftFilterItem?.label | stringEllipsis : 16 }} ({{ nftFilterItem?.quantity }})
      + aria-labelledby="nftFilter" + *ngIf="listCollection?.length > 0">
    • Coins & Tokens ({{ pageData?.
      <0,001
      - +

      Transactions

      -
      +
      for this.quota) { + if (this.data.currentLength >= this.quota) { this.isError = true; this.toastr.error('You have reached out of ' + this.quota + ' max limitation of private name tag'); return; diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index a3974afe4..e36964b1d 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -49,9 +49,18 @@
      Fung
      -
      +
      Amount +
      + <0,001 +
      + + diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts index e5498718f..6ef832041 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.ts @@ -54,6 +54,9 @@ export class TokenTransferComponent implements OnInit { } if (res.cw20_activity.length > 0) { this.dataSourceFTs.data = res.cw20_activity; + res.cw20_activity.forEach((element) => { + element.decimal = element.decimal || element.cw20_contract?.decimal || 6; + }); } }); } From bc0d297adc58302f525f893419dc36f96bfa0d10 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 26 Sep 2023 15:58:36 +0700 Subject: [PATCH 107/184] fix bug UI account-detail --- .../nft-list/nft-list.component.html | 2 +- .../nft-list/nft-list.component.scss | 48 ++++++++++++++----- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 09efd7f69..c0b5752b9 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -19,7 +19,7 @@

      NFTs ({{ listCollection[
      • * { + color: var(--aura-white); + } + + &:hover { + background-color: var(--aura-gray-9); + } + } +} \ No newline at end of file From 07671a7a86dee004a889cd6eee719f8016c641de Mon Sep 17 00:00:00 2001 From: mtam Date: Tue, 26 Sep 2023 16:39:30 +0700 Subject: [PATCH 108/184] [TamTM6] fix amount less than account detail, tx detail --- src/app/global/global.ts | 3 ++- .../account-transaction-table.component.html | 2 +- .../account-detail/token-table/token-table.component.html | 2 +- .../token-transfer/token-transfer.component.html | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/global/global.ts b/src/app/global/global.ts index 5020b18b2..f5bdd879b 100644 --- a/src/app/global/global.ts +++ b/src/app/global/global.ts @@ -414,6 +414,7 @@ export function convertDataAccountTransaction( let amount; let denom = coinInfo.coinDenom; let denomOrigin; + let decimal = 6; if (rawAmount?.indexOf('ibc') > -1) { const dataIBC = getDataIBC(rawAmount, coinConfig); amount = balanceOf(Number(amountTemp) || 0, dataIBC['decimal'] || 6); @@ -422,7 +423,7 @@ export function convertDataAccountTransaction( } else { amount = balanceOf(Number(amountTemp) || 0, coinInfo.coinDecimals); } - const result = { type, toAddress, fromAddress, amount, denom, action, denomOrigin }; + const result = { type, toAddress, fromAddress, amount, denom, action, denomOrigin, amountTemp, decimal }; arrTemp.push(result); } }); diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 386cde1fc..83f30c8e1 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -405,7 +405,7 @@

      diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.html b/src/app/pages/account/account-detail/token-table/token-table.component.html index 62aaebab0..d2300e9b8 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.html +++ b/src/app/pages/account/account-detail/token-table/token-table.component.html @@ -204,7 +204,7 @@

      Coins & Tokens ({{ pageData?.

      diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index e36964b1d..cc8e1345f 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -60,7 +60,7 @@
      Fung [content]="data[template.matColumnDef] | convertSmallNumber: data.decimal"> From cf3fda2d038cd67b110ed45ed18d13bff444d542 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 26 Sep 2023 17:07:56 +0700 Subject: [PATCH 109/184] update UI account detail --- .../nft-list/nft-list.component.scss | 1 + .../token-table/token-table.component.html | 244 +++++++++--------- 2 files changed, 124 insertions(+), 121 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss index 107d82125..431e4f414 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss @@ -77,6 +77,7 @@ border: 1px solid var(--aura-gray-8); overflow: hidden; box-shadow: none; + margin: 3px 0px !important; li.dropdown-item { font-size: 1.6rem; diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.html b/src/app/pages/account/account-detail/token-table/token-table.component.html index d2300e9b8..1d99aead1 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.html +++ b/src/app/pages/account/account-detail/token-table/token-table.component.html @@ -1,8 +1,8 @@
      -
      +
      -
      +

      Coins & Tokens ({{ pageData?.length || 0 }})

      Coins & Tokens ({{ pageData?.
      - -
      - - - - - + +
      -
      -
      - - -
      -
      - -
      + + +
      + + + + + - + + - - - - - + + + + + - - - - + - + + - - - - + - + + - - - - - + + + + + - - + - - - -
      +
      +
      + + +
      +
      + +
      +
      + {{ element.name | stringEllipsis : 30 }} +
      +
      +
      + +
      + + +
      +
      +       +
      - {{ element.name | stringEllipsis : 30 }} + {{ element.name | stringEllipsis : 19 }}
      +
      Coins & Tokens ({{ pageData?.
      - -
      -
      - {{ element.name | stringEllipsis : 19 }} -
      - -
      -
      - -
      - - -
      + {{ element.symbol }}
      - {{ element.symbol }}
      -
      -
      		-
      - Contract - - - -
      -       		+
      + Contract + + - +
      +       		-
      - Price -
      - ${{ +element.price | mask : 'separator.6' }} - | -
      - {{ element.isValueUp ? '↑' : '↓' }}{{ element.change | number : global.formatNumber2Decimal }}% - + + +
      		+
      + Price +
      + ${{ +element.price | mask : 'separator.6' }} + | +
      + {{ element.isValueUp ? '↑' : '↓' }}{{ element.change | number : global.formatNumber2Decimal }}% + +
      - -       		- Amount - -
      -       -
      -
      - <0,001 + + +
      		+ Amount + +
      +       +
      +
      + <0,001 +
      + + +
      - - -
      - -       		-
      - Value - - - ${{ element.price * element.balance | number : global.formatNumber2Decimal }} - -
      -       -
      -       		+
      + Value + + + ${{ element.price * element.balance | number : global.formatNumber2Decimal }} + +
      +       +
      +
      -
      +
      +
      +
      From 59e5421a9ff74d6b21b0418086e300a5401dd6be Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 27 Sep 2023 08:48:51 +0700 Subject: [PATCH 110/184] [TamTM6] fix decimal, tooltip account coin & token, limit quota private name tag --- src/app/core/pipes/common.pipe.ts | 2 +- .../token-table/token-table.component.html | 2 +- .../private-name-tag.component.ts | 18 +++++++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/app/core/pipes/common.pipe.ts b/src/app/core/pipes/common.pipe.ts index 7ebd8a135..87160f7c0 100644 --- a/src/app/core/pipes/common.pipe.ts +++ b/src/app/core/pipes/common.pipe.ts @@ -167,7 +167,7 @@ export class convertSmallNumber implements PipeTransform { constructor() {} transform(amount: number, decimal: number = 6): any { let valueString = (new BigNumber(amount).toNumber() / Math.pow(10, decimal)).toString(); - return displayFullNumber(valueString); + return displayFullNumber(valueString) !== '0.001' ? displayFullNumber(valueString) : ''; } } diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.html b/src/app/pages/account/account-detail/token-table/token-table.component.html index d2300e9b8..f9d2a2802 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.html +++ b/src/app/pages/account/account-detail/token-table/token-table.component.html @@ -201,7 +201,7 @@

      Coins & Tokens ({{ pageData?.
      <0,001
      - +
      { + this.openPopup(data); + }, 500); } this.commonService.listNameTag = this.global.listNameTag; @@ -99,7 +102,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { const payload = { limit: 100, keyword: this.textSearch || '', - nextKey: nextKey + nextKey: nextKey, }; this.nameTagService.getListPrivateNameTagNextKey(payload).subscribe((res) => { @@ -119,8 +122,8 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.pageData.pageIndex * this.pageData.pageSize, this.pageData.pageIndex * this.pageData.pageSize + this.pageData.pageSize, ); - if(dataMobTemp.length !== 0) { - this.dataSourceMobile = dataMobTemp + if (dataMobTemp.length !== 0) { + this.dataSourceMobile = dataMobTemp; } else { this.dataSourceMobile = this.dataSource.data?.slice( (this.pageData.pageIndex - 1) * this.pageData.pageSize, @@ -139,6 +142,8 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { dialogConfig.data = data; } dialogConfig.data = { ...dialogConfig.data, ...{ currentLength: this.pageData?.length } }; + console.log(dialogConfig.data); + let dialogRef = this.dialog.open(PopupNameTagComponent, dialogConfig); dialogRef.afterClosed().subscribe((result) => { @@ -155,8 +160,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { panelClass: 'sizeNormal', data: { title: 'Remove Private Name Tag', - content: - 'Are you sure to remove private name tag for the address ' + data.address + ' (' + data.nameTag + ')?', + content: 'Are you sure to remove private name tag for the address ' + data.address + ' (' + data.nameTag + ')?', class: 'text--gray-1', }, }); @@ -178,7 +182,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.toastr.successWithTitle('Private name tag removed!', 'Success'); setTimeout(() => { this.pageData.length--; - this.pageEvent(this.pageData) + this.pageEvent(this.pageData); }, 1000); }); } From 2e0f0b977a37e2a808d903fbcce59a542538971f Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 27 Sep 2023 10:53:25 +0700 Subject: [PATCH 111/184] fix issue dropdown list --- .../account-transaction-table.component.ts | 1 + .../account/account-detail/nft-list/nft-list.component.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index a1231981d..32ed685b3 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -554,6 +554,7 @@ export class AccountTransactionTableComponent { if (this.transactionFilter.type) { this.listTypeSelectedTemp = this.tnxTypeOrigin.filter((type) => this.transactionFilter.type.includes(type.label)); } else { + this.checkAll = false; this.listTypeSelectedTemp = []; } } diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss index 431e4f414..4d302e394 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss @@ -69,7 +69,7 @@ .dropdown-menu.filter-dropdown-collecttion { width: 100%; - max-height: 225px; + max-height: 230px; overflow-y: auto !important; background-color: var(--aura-gray-10); border-radius: 8px; From f7b69c92a071ee0ff7ee9c5cb370e17f6f039047 Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 27 Sep 2023 10:56:41 +0700 Subject: [PATCH 112/184] [TamTM6] fix sql tx detail get cw20/cw721, icon header bar, css ellipsis text --- src/app/core/services/transaction.service.ts | 4 ++-- .../horizontaltopbar.component.scss | 5 +---- .../account-detail-table.component.html | 4 +++- .../account-detail-table.component.scss | 10 +++++----- .../transaction-messages.component.html | 2 +- .../transaction-messages.component.scss | 16 ++++++++-------- .../card-mob-account.component.scss | 4 +--- .../card-mob-simple.component.html | 5 ++++- .../card-mob-simple.component.scss | 3 --- 9 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/app/core/services/transaction.service.ts b/src/app/core/services/transaction.service.ts index 634207c8a..9a1cb58f3 100644 --- a/src/app/core/services/transaction.service.ts +++ b/src/app/core/services/transaction.service.ts @@ -194,7 +194,7 @@ export class TransactionService extends CommonService { const operationsDoc = ` query TxTransferDetail($height: Int) { ${this.envDB} { - cw20_activity(where: {height: {_eq: $height}}) { + cw20_activity(where: {height: {_eq: $height}, amount :{_is_null: false}}) { amount from to @@ -208,7 +208,7 @@ export class TransactionService extends CommonService { name } } - cw721_activity(where: {height: {_eq: $height}, cw721_contract: {smart_contract: {name: {_neq: "crates.io:cw4973"}}}}) { + cw721_activity(where: {height: {_eq: $height}, cw721_token: {token_id: {_is_null: false}}, cw721_contract: {smart_contract: {name: {_neq: "crates.io:cw4973"}}}}) { from to cw721_token { diff --git a/src/app/layouts/horizontaltopbar/horizontaltopbar.component.scss b/src/app/layouts/horizontaltopbar/horizontaltopbar.component.scss index d779e9b12..4c06c6f5a 100644 --- a/src/app/layouts/horizontaltopbar/horizontaltopbar.component.scss +++ b/src/app/layouts/horizontaltopbar/horizontaltopbar.component.scss @@ -89,10 +89,7 @@ form.aura-form.single-input-field { content: ''; position: absolute; right: -24px; - top: -3px; - @media (min-width: 1200px) { - top: 0; - } + top: 4px; width: 24px; height: 24px; background: url('../../../assets/icons/icons-svg/basic/chevron-down.svg') center no-repeat; diff --git a/src/app/pages/account/account-detail/account-detail-table/account-detail-table.component.html b/src/app/pages/account/account-detail/account-detail-table/account-detail-table.component.html index 957f1c53a..f0e58e005 100644 --- a/src/app/pages/account/account-detail/account-detail-table/account-detail-table.component.html +++ b/src/app/pages/account/account-detail/account-detail-table/account-detail-table.component.html @@ -151,7 +151,9 @@
      - + {{ item.validator_name }}

      diff --git a/src/app/pages/account/account-detail/account-detail-table/account-detail-table.component.scss b/src/app/pages/account/account-detail/account-detail-table/account-detail-table.component.scss index 742b84ddc..910528863 100644 --- a/src/app/pages/account/account-detail/account-detail-table/account-detail-table.component.scss +++ b/src/app/pages/account/account-detail/account-detail-table/account-detail-table.component.scss @@ -19,12 +19,12 @@ } } -.ellipsis-text { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; +.table-mobile { + .ellipsis-text { + display: inline-block; + } } .unbonding-val-name { width: 120px; -} \ No newline at end of file +} 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 88dc0c2cf..57385a886 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 @@ -1,4 +1,4 @@ -
      +
      {{ checkTypeMessage() }} 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 f550709a6..537cdb455 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 @@ -65,12 +65,12 @@ } } -.ellipsis-text { - display: -webkit-box; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; +.box-tx-detail { + .ellipsis-text { + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + } } .box-multisend { @@ -171,10 +171,10 @@ mat-expansion-panel:last-child .mat-expansion-panel-content .content-log { height: 14px !important; } .mat-slide-toggle.mat-checked .mat-slide-toggle-bar { - background-color: #2BBBA3; + background-color: #2bbba3; } -.mat-slide-toggle.mat-checked .mat-slide-toggle-thumb{ +.mat-slide-toggle.mat-checked .mat-slide-toggle-thumb { background-color: var(--aura-white); } diff --git a/src/app/shared/components/cards/card-mob-account/card-mob-account.component.scss b/src/app/shared/components/cards/card-mob-account/card-mob-account.component.scss index 53dadd1f1..66a0e8738 100644 --- a/src/app/shared/components/cards/card-mob-account/card-mob-account.component.scss +++ b/src/app/shared/components/cards/card-mob-account/card-mob-account.component.scss @@ -53,9 +53,7 @@ } .ellipsis-text { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + display: inline-block; max-width: 100px; @media (min-width: 376px) { max-width: 110px; diff --git a/src/app/shared/components/cards/card-mob-simple/card-mob-simple.component.html b/src/app/shared/components/cards/card-mob-simple/card-mob-simple.component.html index 1de0327ce..a6ef58fef 100644 --- a/src/app/shared/components/cards/card-mob-simple/card-mob-simple.component.html +++ b/src/app/shared/components/cards/card-mob-simple/card-mob-simple.component.html @@ -64,7 +64,10 @@
      -
      +
      {{ tokenData.info }}
      diff --git a/src/app/shared/components/cards/card-mob-simple/card-mob-simple.component.scss b/src/app/shared/components/cards/card-mob-simple/card-mob-simple.component.scss index 1db90a715..c4c5621bb 100644 --- a/src/app/shared/components/cards/card-mob-simple/card-mob-simple.component.scss +++ b/src/app/shared/components/cards/card-mob-simple/card-mob-simple.component.scss @@ -88,9 +88,6 @@ } .ellipsis-text { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; max-width: 130px; } From 50a95acc362b30dd2fdb53059f6ab7d78b292d5b Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 27 Sep 2023 11:46:20 +0700 Subject: [PATCH 113/184] [TamTM6] api private name tag --- src/app/core/services/name-tag.service.ts | 7 ---- .../private-name-tag.component.ts | 36 +++++-------------- .../token-cw20/token-cw20.component.ts | 10 ------ .../token-transfer.component.html | 21 +++++++---- .../card-mob-account.component.html | 8 ++++- src/assets/scss/custom.scss | 4 +++ 6 files changed, 34 insertions(+), 52 deletions(-) diff --git a/src/app/core/services/name-tag.service.ts b/src/app/core/services/name-tag.service.ts index 2eb98c1d1..5693937d1 100644 --- a/src/app/core/services/name-tag.service.ts +++ b/src/app/core/services/name-tag.service.ts @@ -32,11 +32,4 @@ export class NameTagService extends CommonService { const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); return this.http.patch(`${this.apiUrl}/user/private-name-tag/${payload.id}`, params); } - - getListPrivateNameTagNextKey(payload) { - const params = _(payload).omitBy(_.isNull).omitBy(_.isUndefined).value(); - return this.http.get(`${this.apiUrl}/private-name-tag`, { - params, - }); - } } 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 f27f32ac2..5eb609663 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 @@ -48,8 +48,6 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { dataSource: MatTableDataSource = new MatTableDataSource([]); dataSourceMobile = []; dataTable = []; - nextKey = null; - currentKey = null; maxLengthSearch = MAX_LENGTH_SEARCH_TOKEN; constructor( @@ -97,25 +95,21 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.onKeyUp(); } - getListPrivateName(nextKey = null) { + getListPrivateName() { this.textSearch = this.textSearch?.trim(); const payload = { limit: 100, keyword: this.textSearch || '', - nextKey: nextKey, + offset: this.pageData.pageIndex * this.pageData.pageSize, }; - this.nameTagService.getListPrivateNameTagNextKey(payload).subscribe((res) => { - this.nextKey = null; - if (res.data?.nameTags?.length >= 100) { - this.nextKey = res.data[res.data?.nameTags?.length - 1]?.id; - } - this.countFav = res.data?.nameTags?.filter((k) => k.isFavorite === 1)?.length || 0; - res.data?.nameTags.forEach((element) => { + this.nameTagService.getListPrivateNameTag(payload).subscribe((res) => { + this.countFav = res.data?.filter((k) => k.isFavorite === 1)?.length || 0; + res.data?.forEach((element) => { element['type'] = isContract(element.address) ? 'contract' : 'account'; }); - this.dataSource.data = res.data?.nameTags; - this.pageData.length = res?.data?.count || 0; + this.dataSource.data = res.data; + this.pageData.length = res?.meta?.count || 0; if (this.dataSource?.data) { let dataMobTemp = this.dataSource.data?.slice( @@ -142,8 +136,6 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { dialogConfig.data = data; } dialogConfig.data = { ...dialogConfig.data, ...{ currentLength: this.pageData?.length } }; - console.log(dialogConfig.data); - let dialogRef = this.dialog.open(PopupNameTagComponent, dialogConfig); dialogRef.afterClosed().subscribe((result) => { @@ -205,18 +197,8 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { } pageEvent(e: PageEvent): void { - const { length, pageIndex, pageSize } = e; - const next = length <= (pageIndex + 2) * pageSize; - this.dataSourceMobile = this.dataSource.data.slice(pageIndex * pageSize, pageIndex * pageSize + pageSize); - this.pageData = e; - this.pageData.previousPageIndex = e.pageIndex; - - if (next && this.nextKey && this.currentKey !== this.nextKey) { - this.getListPrivateName(this.nextKey); - this.currentKey = this.nextKey; - } else { - this.getListPrivateName(); - } + this.pageData.pageIndex = e.pageIndex; + this.getListPrivateName(); } navigateAddress(address): void { diff --git a/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts b/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts index 2418dff42..32eaabc70 100644 --- a/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts +++ b/src/app/pages/token/token-list/token-cw20/token-cw20.component.ts @@ -253,16 +253,6 @@ export class TokenCw20Component implements OnInit, OnDestroy { this.sortedData = isAsc ? lstDown.concat(lstUp) : lstUp.concat(lstDown); } - // if (sort.active === 'holders') { - // let lstUp = this.sortedData - // .filter((data) => data.isValueUp) - // ?.sort((a, b) => this.compare(a.holders, b.holders, isAsc)); - // let lstDown = this.sortedData - // .filter((data) => !data.isValueUp) - // .sort((a, b) => this.compare(a.holders, b.holders, !isAsc)); - // this.sortedData = isAsc ? lstDown.concat(lstUp) : lstUp.concat(lstDown); - // } - let dataFilter = this.sortedData; this.pageData = { length: this.pageData.length, diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index cc8e1345f..e02aa6f5f 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -40,16 +40,23 @@
      Fung class="body-02 d-none d-xl-inline" >{{ data.cw20_contract.name }} - + + + <0,001 + + +
      -
      +
      Amount
      Fung <0,001
      + [content]="data[template.matColumnDef] | convertSmallNumber : data.decimal"> {{ item['address'] === item['fromAddress'] ? '+' : '-' }} - + + <0,001 + +
      diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss index 632443093..97a562414 100644 --- a/src/assets/scss/custom.scss +++ b/src/assets/scss/custom.scss @@ -785,3 +785,7 @@ body { -webkit-box-orient: vertical; } } + +.w-fit-content{ + width: fit-content; +} From 9d539c791d54f300d44bb3c08fc3fe1b6efbc5c6 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 27 Sep 2023 12:09:56 +0700 Subject: [PATCH 114/184] fix issue count filter --- .../account-transaction-table.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index 32ed685b3..edcb6d00d 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -533,7 +533,6 @@ export class AccountTransactionTableComponent { setFilterNum() { this.countFilter = +(this.transactionFilter.type?.length || 0) + - +(this.isSearchOther ? 1 : 0) + +(this.transactionFilter.typeTransfer ? 1 : 0) + +(this.transactionFilter.endDate ? 1 : 0); } @@ -553,6 +552,9 @@ export class AccountTransactionTableComponent { initTnxFilterPanel() { if (this.transactionFilter.type) { this.listTypeSelectedTemp = this.tnxTypeOrigin.filter((type) => this.transactionFilter.type.includes(type.label)); + if (this.listTypeSelectedTemp.length === this.tnxTypeOrigin.length) { + this.checkAll = true; + } } else { this.checkAll = false; this.listTypeSelectedTemp = []; From 0816fb69a0b20a18c4b199d38ca778e0add63f73 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 27 Sep 2023 12:11:49 +0700 Subject: [PATCH 115/184] fix issue count filter --- .../account-transaction-table.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index edcb6d00d..04efc4f3b 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -159,7 +159,7 @@ export class AccountTransactionTableComponent { if (event.target.checked) { this.arrTypeFilter.push(type.label); this.listTypeSelectedTemp?.push(type); - if (this.listTypeSelectedTemp.length === this.tnxTypeOrigin.length) { + if (this.listTypeSelectedTemp?.length === this.tnxTypeOrigin?.length) { this.checkAll = true; } } else { @@ -552,7 +552,7 @@ export class AccountTransactionTableComponent { initTnxFilterPanel() { if (this.transactionFilter.type) { this.listTypeSelectedTemp = this.tnxTypeOrigin.filter((type) => this.transactionFilter.type.includes(type.label)); - if (this.listTypeSelectedTemp.length === this.tnxTypeOrigin.length) { + if (this.listTypeSelectedTemp?.length === this.tnxTypeOrigin?.length) { this.checkAll = true; } } else { From 036d67f74e10eda3bbdcf72a300e5802081ded2e Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 27 Sep 2023 13:38:26 +0700 Subject: [PATCH 116/184] fix issue count filter --- .../account-transaction-table.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 83f30c8e1..d0d313700 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -173,7 +173,7 @@ id="filter-result-mess" (click)="tnxTypeMenuBtn.click(); initTnxFilterPanel()" *ngIf="transactionFilter.type?.length > 0 || isSearchOther"> - {{ checkAll ? 'All' : transactionFilter.type?.length + (isSearchOther ? 1 : 0) || 1 }} Msg Types selected + {{ checkAll ? 'All' : transactionFilter.type?.length || 1 }} Msg Types selected
      Date: Wed, 27 Sep 2023 14:34:20 +0700 Subject: [PATCH 117/184] fix issue count filter --- .../account-transaction-table.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index 04efc4f3b..f95125877 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -149,7 +149,7 @@ export class AccountTransactionTableComponent { if (type === 'all') { if (event.target.checked) { this.checkAll = true; - this.listTypeSelectedTemp = this.tnxTypeOrigin; + this.listTypeSelectedTemp = [...this.tnxTypeOrigin]; } else { this.listTypeSelectedTemp = []; this.checkAll = false; From 69a7a399fe82bab7f081f7d2cc9402dc8740fcb4 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Wed, 27 Sep 2023 14:57:05 +0700 Subject: [PATCH 118/184] . --- .../contracts-transactions.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/contracts/contracts-transactions/contracts-transactions.component.html b/src/app/pages/contracts/contracts-transactions/contracts-transactions.component.html index ec4af0116..1e96e33eb 100644 --- a/src/app/pages/contracts/contracts-transactions/contracts-transactions.component.html +++ b/src/app/pages/contracts/contracts-transactions/contracts-transactions.component.html @@ -1,7 +1,7 @@

      Transactions

      -
      +
      for Date: Wed, 27 Sep 2023 15:44:37 +0700 Subject: [PATCH 119/184] optimize code --- .../account-detail.component.scss | 10 +-- .../account-detail/account-detail.module.ts | 2 - .../account-transaction-table.component.scss | 20 ++--- .../nft-list/nft-list.component.scss | 8 +- .../soulbound-token.component.html | 79 ----------------- .../soulbound-token.component.scss | 0 .../soulbound-token.component.ts | 84 ------------------- .../token-table/token-table.component.html | 2 +- .../token-table/token-table.component.scss | 4 - .../code-contract.component.html | 6 +- .../code-contract.component.scss | 3 - .../contract/contract.component.scss | 64 ++++++++++++++ .../read-contract.component.scss | 63 -------------- .../write-contract.component.scss | 69 +-------------- .../contracts-register.component.scss | 72 +--------------- .../private-name-tag.component.html | 2 +- .../summary-info/summary-info.component.scss | 2 +- .../token-transfer.component.html | 4 +- .../token-transfer.component.scss | 6 +- src/assets/scss/aura-theme/table.scss | 3 + 20 files changed, 93 insertions(+), 410 deletions(-) delete mode 100644 src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.html delete mode 100644 src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.scss delete mode 100644 src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.ts diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index d2d7f0f3e..265645bc9 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -87,14 +87,6 @@ section.account-detail { } } -::ng-deep.account-search-form { - width: 100%; - - @media (min-width: 992px) { - width: 370px; - } -} - .account__tab-item { min-width: 160px; } @@ -232,4 +224,4 @@ section.account-detail { left: -6px; } } -} \ No newline at end of file +} diff --git a/src/app/pages/account/account-detail/account-detail.module.ts b/src/app/pages/account/account-detail/account-detail.module.ts index 5a45b13fa..809fc667f 100644 --- a/src/app/pages/account/account-detail/account-detail.module.ts +++ b/src/app/pages/account/account-detail/account-detail.module.ts @@ -29,7 +29,6 @@ import { AccountStakeComponent } from './account-stake/account-stake.component'; import { AccountTransactionTableComponent } from './account-transaction-table/account-transaction-table.component'; import { AccountTransactionComponent } from './account-transaction/account-transaction.component'; import { NftListComponent } from './nft-list/nft-list.component'; -import { SoulboundTokenComponent } from './soulbound-token/soulbound-token.component'; import { TokenTableComponent } from './token-table/token-table.component'; @NgModule({ @@ -37,7 +36,6 @@ import { TokenTableComponent } from './token-table/token-table.component'; AccountDetailComponent, TokenTableComponent, NftListComponent, - SoulboundTokenComponent, AccountStakeComponent, AccountTransactionComponent, AccountTransactionTableComponent, diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss index 75c2b090a..5f21da036 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss @@ -88,22 +88,18 @@ } } - ::ng-deep { - .box-name-tag:not(.private-name-tag) { - &:after { - border-right: 15px solid #262838 !important; - } + ::ng-deep .box-name-tag:not(.private-name-tag) { + &:after { + border-right: 15px solid #262838; } } } -::ng-deep { - .table-transfer tr td { - &:nth-child(4), - &:nth-child(5), - &:nth-child(6) { - padding-top: var(--spacer-0) !important; - } +.table-transfer tr td { + &:nth-child(4), + &:nth-child(5), + &:nth-child(6) { + padding-top: var(--spacer-0) !important; } } diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss index 4d302e394..00a7f4277 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss @@ -1,4 +1,8 @@ -.aura-form.single-input-field { +.aura-form.single-input-field.account-search-form { + width: 100%; + @media (min-width: 992px) { + width: 370px; + } .input-group { padding: 0 var(--spacer-3); @@ -94,4 +98,4 @@ background-color: var(--aura-gray-9); } } -} \ No newline at end of file +} diff --git a/src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.html b/src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.html deleted file mode 100644 index 962b9f89b..000000000 --- a/src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.html +++ /dev/null @@ -1,79 +0,0 @@ -

      ABT Creators ({{ assetSoulBound?.length || 0 }})

      -
      -
      -
      - -
      - -
      -
      - -
      - - - -
      - -
      - - - - - - - -
      -
      diff --git a/src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.scss b/src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.ts b/src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.ts deleted file mode 100644 index a2ae13f73..000000000 --- a/src/app/pages/account/account-detail/soulbound-token/soulbound-token.component.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { MatPaginator, PageEvent } from '@angular/material/paginator'; -import { PAGE_EVENT } from 'src/app/core/constants/common.constant'; -import { MAX_LENGTH_SEARCH_TOKEN } from 'src/app/core/constants/token.constant'; -import { Globals } from 'src/app/global/global'; - -@Component({ - selector: 'app-soulbound-token', - templateUrl: './soulbound-token.component.html', - styleUrls: ['./soulbound-token.component.scss'], -}) -export class SoulboundTokenComponent implements OnInit { - @Input() address: string; - - assetSoulBound: any[]; - searchValue = ''; - loading = true; - pageData: PageEvent = { - length: PAGE_EVENT.LENGTH, - pageSize: 20, - pageIndex: PAGE_EVENT.PAGE_INDEX, - }; - showedData = []; - maxLengthSearch = MAX_LENGTH_SEARCH_TOKEN; - paginator: MatPaginator; - - constructor(public global: Globals) {} - - ngOnInit(): void { - this.getNftData(); - } - - getNftData() { - this.loading = true; - const payload = { - account_address: this.address, - limit: this.pageData.pageSize, - offset: this.pageData.pageSize * this.pageData.pageIndex, - keyword: this.searchValue, - }; - - if (this.pageData) { - this.pageData.length = this.assetSoulBound?.length || 0; - const { pageIndex, pageSize } = this.pageData; - const start = pageIndex * pageSize; - const end = start + pageSize; - this.showedData = this.assetSoulBound.slice(start, end); - } - this.loading = false; - } - - paginatorEmit(event): void { - this.paginator = event; - } - - resetSearch(): void { - this.searchValue = ''; - this.getNftData(); - } - - getKeySearch() { - this.searchValue = this.searchValue?.trim(); - this.getNftData(); - } - - searchTokenNft(): void { - if (this.paginator.pageIndex !== 0) { - this.paginator.firstPage(); - } else { - this.getKeySearch(); - } - } - - checkSearch(): void { - if (this.searchValue.length === 0) { - this.searchTokenNft(); - } - } - - handlePageEvent(e: any) { - this.pageData.pageIndex = e.pageIndex; - this.getKeySearch(); - } -} diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.html b/src/app/pages/account/account-detail/token-table/token-table.component.html index d7c1367a6..a6fa21981 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.html +++ b/src/app/pages/account/account-detail/token-table/token-table.component.html @@ -94,7 +94,7 @@

      Coins & Tokens ({{ pageData?.
      - +
      diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.scss b/src/app/pages/account/account-detail/token-table/token-table.component.scss index 5494b1190..c00b1e503 100644 --- a/src/app/pages/account/account-detail/token-table/token-table.component.scss +++ b/src/app/pages/account/account-detail/token-table/token-table.component.scss @@ -19,10 +19,6 @@ .table-token { overflow-y: auto; height: 380px; - - ::ng-deep table thead { - display: none; - } } .token-filter-form.aura-form.single-input-field .input-group { diff --git a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/contract-code/code-contract.component.html b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/contract-code/code-contract.component.html index c91ac7315..31bcf6915 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/contract-code/code-contract.component.html +++ b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/contract-code/code-contract.component.html @@ -99,7 +99,7 @@ Export Schema
      • Export Schema
        • Export Schema
      +
      @@ -145,7 +145,7 @@
      -
      +
      diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss index 4436c9a10..569478391 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.scss @@ -15,10 +15,6 @@ } } - ::ng-deep table thead { - display: none; - } - .hide-td { display: none; } @@ -44,4 +40,4 @@ min-width: 172px; } } -} \ No newline at end of file +} diff --git a/src/assets/scss/aura-theme/table.scss b/src/assets/scss/aura-theme/table.scss index f17773f31..f0c5b7ae6 100644 --- a/src/assets/scss/aura-theme/table.scss +++ b/src/assets/scss/aura-theme/table.scss @@ -46,6 +46,9 @@ mat-row, mat-header-row, mat-footer-row, th.mat-header-cell, td.mat-cell, td.mat-footer-cell { border-bottom-color: var(--aura-gray-9); } + &.none-header thead { + display: none; + } } .aura-basic-table { From 85e063c98fa530415df7eec67f2ac8adaf908f31 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 27 Sep 2023 15:51:23 +0700 Subject: [PATCH 120/184] fix issue count filter --- .../account/account-detail/nft-list/nft-list.component.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss index 4d302e394..b6f6e77dd 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss @@ -93,5 +93,8 @@ &:hover { background-color: var(--aura-gray-9); } + &.active { + background-color: var(--aura-gray-8) !important; + } } } \ No newline at end of file From bd1faba90cb6a418f0219e6b9a99eb736126f49b Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 27 Sep 2023 16:13:41 +0700 Subject: [PATCH 121/184] remove unused code --- .../contracts-register.component.html | 303 ------------------ .../contracts-register.component.scss | 61 ---- .../contracts-register.component.ts | 268 ---------------- src/app/pages/contracts/contracts.module.ts | 2 - 4 files changed, 634 deletions(-) delete mode 100644 src/app/pages/contracts/contracts-register/contracts-register.component.html delete mode 100644 src/app/pages/contracts/contracts-register/contracts-register.component.scss delete mode 100644 src/app/pages/contracts/contracts-register/contracts-register.component.ts diff --git a/src/app/pages/contracts/contracts-register/contracts-register.component.html b/src/app/pages/contracts/contracts-register/contracts-register.component.html deleted file mode 100644 index a1a16d09e..000000000 --- a/src/app/pages/contracts/contracts-register/contracts-register.component.html +++ /dev/null @@ -1,303 +0,0 @@ -
      -
      -

      Register Code ID Type

      - -
      -
      -
      -
      -
      Only Code ID's owner can be able to register type for a Code ID
      -
      - {{ pageData?.length }} Code ID{{ pageData?.length > 1 ? 's' : '' }} registered -
      -
      -
      -
      - - - -
      - -
      -
      - -
      - -
      - -
      -
      -
      -
      -
      - - - -
      -
      - -
      -
      -
      - -
      -
      -
      - - - - - - - - - - - - - -
      -
      -       		- - - - {{ data[template.matColumnDef] }} - - - {{ data[template.matColumnDef] }} Contract - -
      - {{ data[template.matColumnDef] | customDate : 'yyyy-MM-dd' }} -
      - {{ data[template.matColumnDef] | customDate : 'HH:mm:ss' }} -
      -       - -
      - {{ data[template.matColumnDef] }} -
      -       - -
      - -
      -       - - {{ data[template.matColumnDef] }} - -       -
      -
      - - You have not yet registered type for any Code ID -
      -
      -
      -

      - -
      -
      -
      - - You have not yet registered type for any Code ID -
      -
      - -
      -
      -
      - Code ID: - {{ data.code_id }} -
      - -
      -
      -
      - Type Contract - {{ data.type }} Contract -
      -
      - Result Registration - {{ data.result }} -
      -
      - Time Registered -
      - {{ data.updated_at | customDate : 'yyyy-MM-dd' }} -
      - {{ data.updated_at | customDate : 'HH:mm:ss' }} -
      -
      -
      -       -
      - - - - - -
      -
      -
      - -
      - -
      -
      - - Update Type for Code ID - Register Type for Code ID - - -
      -
      -
      -

      Code ID

      -
      - -
      -

      - Enter a Code ID that you own (ID must be greater than 0). -

      -

      Type

      -
      - - - -
      -
      - {{ item.value | translate }} -
      -
      -       -       -       -
      -
      -
      - - -
      -
      -       -
      diff --git a/src/app/pages/contracts/contracts-register/contracts-register.component.scss b/src/app/pages/contracts/contracts-register/contracts-register.component.scss deleted file mode 100644 index b3ac63536..000000000 --- a/src/app/pages/contracts/contracts-register/contracts-register.component.scss +++ /dev/null @@ -1,61 +0,0 @@ -.search-form { - min-width: 350px; - - &.single-input-field { - .input-group { - &.textbox_search { - width: 97%; - - input { - padding-left: 0; - width: 90%; - } - } - } - } -} - -.aura-form { - .box-input { - min-height: 50px; - } - - .box-body-register { - padding: var(--spacer-4) 0; - border-top: 1px solid var(--aura-dark-gray); - border-bottom: 1px solid var(--aura-dark-gray); - } -} - -@media (min-width: 992px) { - .box-title-register { - border-bottom: 1px solid var(--aura-dark-gray); - } - - .search-form { - min-width: 410px; - } -} - -@media (max-width: 414px) { - ::ng-deep { - .contract-modal.modal .modal-dialog .modal-content { - overflow-y: auto; - padding-bottom: 0; - } - - .box-search-contract { - width: 100%; - } - } -} - -.button-outline__in-card { - @media (max-width: 991.98px) { - box-shadow: 2px 1000px 1px var(--aura-gray-9) inset !important; - } -} - -.aura-table th.mat-header-cell:nth-child(3) { - min-width: 400px; -} diff --git a/src/app/pages/contracts/contracts-register/contracts-register.component.ts b/src/app/pages/contracts/contracts-register/contracts-register.component.ts deleted file mode 100644 index 40bd49245..000000000 --- a/src/app/pages/contracts/contracts-register/contracts-register.component.ts +++ /dev/null @@ -1,268 +0,0 @@ -import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; -import { DatePipe } from '@angular/common'; -import { Component, OnInit, ViewChild } from '@angular/core'; -import { PageEvent } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; -import { Router } from '@angular/router'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateService } from '@ngx-translate/core'; -import { from, Subject } from 'rxjs'; -import { debounceTime, delay, distinctUntilChanged, mergeMap, takeUntil } from 'rxjs/operators'; -import { REGISTER_CONTRACT } from 'src/app/core/constants/contract.constant'; -import { MESSAGES_CODE } from 'src/app/core/constants/messages.constant'; -import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; -import { WalletService } from 'src/app/core/services/wallet.service'; -import { PaginatorComponent } from 'src/app/shared/components/paginator/paginator.component'; -import { DATEFORMAT, PAGE_EVENT } from '../../../core/constants/common.constant'; -import { MAX_LENGTH_SEARCH_TOKEN } from '../../../core/constants/token.constant'; -import { TableTemplate } from '../../../core/models/common.model'; -import { ContractService } from '../../../core/services/contract.service'; -import { Globals } from '../../../global/global'; - -@Component({ - selector: 'app-contracts-register', - templateUrl: './contracts-register.component.html', - styleUrls: ['./contracts-register.component.scss'], -}) -export class ContractsRegisterComponent implements OnInit { - @ViewChild(PaginatorComponent) pageChange: PaginatorComponent; - textSearch = ''; - templates: Array = [ - { matColumnDef: 'code_id', headerCellDef: 'Code ID' }, - { matColumnDef: 'type', headerCellDef: 'Message' }, - { matColumnDef: 'result', headerCellDef: 'Result registration' }, - { matColumnDef: 'updated_at', headerCellDef: 'Time Registered' }, - { matColumnDef: 'action', headerCellDef: '' }, - ]; - displayedColumns: string[] = this.templates.map((dta) => dta.matColumnDef); - pageData: PageEvent = { - length: PAGE_EVENT.LENGTH, - pageSize: 20, - pageIndex: PAGE_EVENT.PAGE_INDEX, - }; - dataSource: MatTableDataSource = new MatTableDataSource([]); - dataBk: any[]; - dataContract: any[]; - filterSearchData: any; - maxLengthSearch = MAX_LENGTH_SEARCH_TOKEN; - breakpoint$ = this.layout.observe([Breakpoints.Small, Breakpoints.XSmall]); - modalReference: any; - currentCodeID: number; - isEditMode = false; - selectedTypeContract: string; - lstTypeContract = REGISTER_CONTRACT; - userAddress = ''; - walletAccount: any; - loading = true; - isHideSearch = false; - isDisable = true; - pageLength = 0; - isProcess = false; - currentType = ''; - - searchSubject = new Subject(); - destroy$ = new Subject(); - - constructor( - public translate: TranslateService, - public global: Globals, - private router: Router, - private contractService: ContractService, - private datePipe: DatePipe, - private layout: BreakpointObserver, - private modalService: NgbModal, - private toastr: NgxToastrService, - public walletService: WalletService, - ) {} - - ngOnDestroy(): void { - this.destroy$.next(); - this.destroy$.complete(); - } - - ngOnInit(): void { - from([1]) - .pipe( - delay(1000), - mergeMap((_) => this.walletService.wallet$), - ) - .subscribe((wallet) => { - if (wallet) { - this.userAddress = wallet.bech32Address; - this.getListContract(); - - this.searchSubject - .asObservable() - .pipe(debounceTime(500), distinctUntilChanged(), takeUntil(this.destroy$)) - .subscribe(() => { - this.pageChange.selectPage(0); - }); - } else { - this.userAddress = null; - this.router.navigate(['/']); - } - }); - } - - onKeyUp() { - this.searchSubject.next(this.textSearch); - } - - getListContract() { - this.textSearch = this.textSearch?.trim(); - let payload = { - account_address: this.userAddress, - limit: this.pageData.pageSize, - offset: this.pageData.pageIndex * this.pageData.pageSize, - keyword: this.textSearch, - }; - - this.contractService.getListTypeContract(payload).subscribe( - (res) => { - if (res) { - this.pageData = { - length: res?.meta?.count, - pageSize: this.pageData.pageSize, - pageIndex: PAGE_EVENT.PAGE_INDEX, - }; - this.pageLength = this.pageData?.length; - - res.data?.forEach((item) => { - item.updated_at = this.datePipe.transform(item.updated_at, DATEFORMAT.DATETIME_UTC); - }); - this.dataSource = new MatTableDataSource(res.data); - this.dataBk = res.data || []; - this.dataContract = res.data || []; - } - }, - () => {}, - () => { - this.loading = false; - }, - ); - } - - clearSearch(): void { - this.textSearch = ''; - this.onKeyUp(); - } - - paginatorEmit(event): void { - if (this.dataSource) { - this.dataSource.paginator = event; - } - } - - pageEvent(e: PageEvent): void { - this.pageData.pageIndex = e.pageIndex; - this.getListContract(); - } - - viewPopupDetail(staticDataModal: any, data: any) { - this.isDisable = true; - this.isEditMode = false; - this.currentCodeID = undefined; - this.selectedTypeContract = undefined; - if (data?.code_id) { - this.currentCodeID = data.code_id || undefined; - this.selectedTypeContract = data.type || undefined; - this.isEditMode = true; - } - this.isProcess = false; - if (this.isEditMode) { - this.currentType = this.selectedTypeContract; - } - - this.modalReference = this.modalService.open(staticDataModal, { - keyboard: false, - centered: true, - size: 'md', - windowClass: 'modal-holder contract-modal', - }); - } - - handleButtonContract(isEditMode: boolean) { - this.isProcess = true; - if (isEditMode) { - this.handleUpdate(this.currentCodeID); - } else { - this.handleRegister(); - } - } - - connectWallet(): void { - this.walletAccount = this.walletService.getAccount(); - } - - handleRegister() { - this.connectWallet(); - if (this.walletAccount) { - const payload = { - code_id: Number(this.currentCodeID), - type: this.selectedTypeContract, - account_address: this.userAddress, - }; - this.contractService.registerContractType(payload).subscribe( - (res) => { - if (res) { - this.handleCloseDialog(res); - this.isProcess = false; - } - }, - (error) => {}, - ); - } - } - - handleUpdate(codeID = undefined) { - this.contractService.updateContractType(Number(codeID), this.selectedTypeContract).subscribe( - (res) => { - if (res) { - this.handleCloseDialog(res); - this.isProcess = false; - } - }, - (error) => {}, - ); - } - - handleCloseDialog(res: any) { - this.modalReference.close(); - this.getListContract(); - this.selectedTypeContract = ''; - this.isEditMode = false; - if (res?.data?.Message) { - let msgError = res?.data?.Message.toString() || 'Error'; - this.toastr.error(msgError); - } else { - this.toastr.success(MESSAGES_CODE.SUCCESSFUL.Message); - } - } - - closeDialog(modal: any) { - this.selectedTypeContract = ''; - this.currentCodeID = null; - this.isDisable = true; - modal.close('Close click'); - } - - checkInput(): void { - this.isDisable = true; - if (this.currentCodeID && this.currentCodeID > 0 && this.selectedTypeContract) { - this.isDisable = false; - } - if (this.isEditMode && this.currentType === this.selectedTypeContract) { - this.isDisable = true; - } - } - - validateCurrentCodeID(event: any) { - const regex = new RegExp(/[0-9]/g); - let key = String.fromCharCode(!event.charCode ? event.which : event.charCode); - if (!regex.test(key)) { - event.preventDefault(); - return; - } - this.currentCodeID = event.target.value; - } -} diff --git a/src/app/pages/contracts/contracts.module.ts b/src/app/pages/contracts/contracts.module.ts index 5c4b193a3..283cd40e0 100644 --- a/src/app/pages/contracts/contracts.module.ts +++ b/src/app/pages/contracts/contracts.module.ts @@ -30,7 +30,6 @@ import { WriteContractModule } from './contracts-detail/contracts-contents/contr import { ContractsDetailComponent } from './contracts-detail/contracts-detail.component'; import { ContractsOverviewCardComponent } from './contracts-detail/contracts-overview-card/contracts-overview-card.component'; import { ContractsListComponent } from './contracts-list/contracts-list.component'; -import { ContractsRegisterComponent } from './contracts-register/contracts-register.component'; import { ContractsRoutingModule } from './contracts-routing.module'; import { ContractsTransactionsComponent } from './contracts-transactions/contracts-transactions.component'; import { ContractVerifyStepsComponent } from './contracts-verify/contract-verify-steps/contract-verify-steps.component'; @@ -48,7 +47,6 @@ import { ContractsVerifyComponent } from './contracts-verify/contracts-verify.co CodeContractComponent, ContractsVerifyComponent, ContractVerifyStepsComponent, - ContractsRegisterComponent, ], imports: [ CommonModule, From 17cbb78e5cb775d5e18092a4162a5613e938d960 Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 27 Sep 2023 16:45:56 +0700 Subject: [PATCH 122/184] [TamTM6] display to address tx detail, send type filter account detail --- src/app/core/services/transaction.service.ts | 7 ++++++ .../account-transaction-table.component.html | 4 ++-- .../account-transaction-table.component.ts | 11 ++++++--- .../token/nft-detail/nft-detail.component.ts | 2 +- .../token-holders-tab.component.html | 15 +++++++++++- .../token-transfers-tab.component.html | 17 +++++++++++-- .../token-transfers-tab.component.ts | 3 +-- .../token-content.component.html | 24 +++++++++++++------ .../token-transfer.component.ts | 11 +++++++-- 9 files changed, 74 insertions(+), 20 deletions(-) diff --git a/src/app/core/services/transaction.service.ts b/src/app/core/services/transaction.service.ts index 9a1cb58f3..625fef651 100644 --- a/src/app/core/services/transaction.service.ts +++ b/src/app/core/services/transaction.service.ts @@ -209,6 +209,7 @@ export class TransactionService extends CommonService { } } cw721_activity(where: {height: {_eq: $height}, cw721_token: {token_id: {_is_null: false}}, cw721_contract: {smart_contract: {name: {_neq: "crates.io:cw4973"}}}}) { + action from to cw721_token { @@ -219,6 +220,12 @@ export class TransactionService extends CommonService { address } } + smart_contract_event { + smart_contract_event_attributes { + value + key + } + } } } } diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index d0d313700..ca72bd58a 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -219,10 +219,10 @@
      - Selected Items ... + Selected Items ...
      {{ type.value }} diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index 04efc4f3b..9a5714ea0 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -180,10 +180,13 @@ export class AccountTransactionTableComponent { } searchTransactionType() { - if (this.transactionTypeKeyWord?.toLowerCase().length === 0 || this.transactionTypeKeyWord?.toLowerCase() === '') { + if ( + this.transactionTypeKeyWord?.toLowerCase().trim().length === 0 || + this.transactionTypeKeyWord?.toLowerCase().trim() === '' + ) { this.tnxType = this.tnxTypeOrigin; } else { - this.tnxType = this.tnxType?.filter( + this.tnxType = this.tnxTypeOrigin?.filter( (k) => k.value.toLowerCase().indexOf(this.transactionTypeKeyWord?.toLowerCase().trim()) > -1, ); } @@ -551,7 +554,9 @@ export class AccountTransactionTableComponent { initTnxFilterPanel() { if (this.transactionFilter.type) { - this.listTypeSelectedTemp = this.tnxTypeOrigin.filter((type) => this.transactionFilter.type.includes(type.label)); + this.listTypeSelectedTemp = this.tnxTypeOrigin?.filter((type) => + this.transactionFilter?.type?.includes(type.label), + ); if (this.listTypeSelectedTemp?.length === this.tnxTypeOrigin?.length) { this.checkAll = true; } diff --git a/src/app/pages/token/nft-detail/nft-detail.component.ts b/src/app/pages/token/nft-detail/nft-detail.component.ts index 032bcdceb..095813efe 100644 --- a/src/app/pages/token/nft-detail/nft-detail.component.ts +++ b/src/app/pages/token/nft-detail/nft-detail.component.ts @@ -206,7 +206,7 @@ export class NFTDetailComponent implements OnInit { let txs = convertDataAccountTransaction(res, this.coinInfo, TabsAccountLink.NftTxs, false, null); txs.forEach((element, index) => { element['token_id'] = element.tokenId; - element['type'] = res.transaction[index]?.events[0]?.smart_contract_events[0]?.cw721_activity?.action; + element['type'] = element.arrEvent[0]?.type?.replace('Contract: ', ''); element['from_address'] = element.fromAddress; element['to_address'] = element.toAddress; if (element['type'] === 'approve' || element['type'] === 'revoke') { diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html index 8d35f3027..f78df4321 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html @@ -53,7 +53,20 @@ "> -
      +
      + + <0,001 + + + + +
      {{ data[template.matColumnDef] || 0 }} diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html index c840b8633..377dc236e 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html @@ -72,7 +72,20 @@ -
      +
      +
      + <0,001 +
      + + +
      +
      @@ -170,7 +183,7 @@ !data.token_id || data['status'] === 'Fail' || data['token_id'] === 'More' || - data.modeExecute === modeExecuteTransaction.UnEquip || + data.modeExecute === modeExecuteTransaction.UnEquip || data['to_address']?.startsWith('Null') " [routerLink]="['/tokens/' + linkToken, contractAddress, data.token_id]"> diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts index c3e9da108..4db17590b 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts @@ -164,7 +164,7 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { element['from_address'] = element.fromAddress; element['to_address'] = element.toAddress; element['token_id'] = element.arrEvent?.length > 1 ? 'More' : element.tokenId; - element['type'] = res.transaction[index]?.events[0]?.smart_contract_events[0]?.cw721_activity?.action; + element['type'] = element.arrEvent[0]?.type?.replace('Contract: ', ''); if (this.typeContract === this.contractType.CW4973) { if (element['type'] === 'mint') { element['type'] = 'take'; @@ -225,7 +225,6 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { element['from_address'] = element.fromAddress; element['to_address'] = element.toAddress; element['type'] = element?.action; - element['amountToken'] = element.amount; }); if (this.dataSource.data.length > 0 && !isReload) { this.dataSource.data = [...this.dataSource.data, ...txs]; diff --git a/src/app/pages/token/token-detail/token-content/token-content.component.html b/src/app/pages/token/token-detail/token-content/token-content.component.html index c51ba99c9..8ce370452 100644 --- a/src/app/pages/token/token-detail/token-content/token-content.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content.component.html @@ -34,13 +34,22 @@ tokenDetail?.isNFTContract ? 'no-border-bottom pb-0' : 'pb-3' }}">
      BALANCE
      - - + +
      + + <0,001 + + + + +
      {{ tokenDetail.symbol || tokenDetail.name }} -       + {{ infoSearch['balance'] || 0 }}
      @@ -52,7 +61,8 @@ [appBigNumber]="infoSearch['balance']" [decimal]="tokenDetail.decimals || 0" [tokenPrice]="tokenDetail.price">
      - (
      { - if (res?.cw721_activity.length > 0) { + if (res?.cw721_activity?.length > 0) { + res.cw721_activity.forEach((element) => { + if (element.action === 'approve' || element.action === 'revoke') { + element.to = + element.smart_contract_event?.smart_contract_event_attributes?.find((k) => k.key === 'spender')?.value || + element['to']; + } + }); this.dataSourceNFTs.data = res.cw721_activity; } - if (res.cw20_activity.length > 0) { + if (res.cw20_activity?.length > 0) { this.dataSourceFTs.data = res.cw20_activity; res.cw20_activity.forEach((element) => { element.decimal = element.decimal || element.cw20_contract?.decimal || 6; From fa3f0a8b40ca664c113a24b7493603ed4e086e76 Mon Sep 17 00:00:00 2001 From: mtam Date: Thu, 28 Sep 2023 10:37:12 +0700 Subject: [PATCH 123/184] [TamTM6] fix get detail name tag --- .../popup-name-tag.component.ts | 18 +++++- .../private-name-tag.component.html | 56 +++++++++---------- .../private-name-tag.component.ts | 21 +++---- 3 files changed, 54 insertions(+), 41 deletions(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts index 57e875c96..afe21966c 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.ts @@ -50,7 +50,11 @@ export class PopupNameTagComponent implements OnInit { ngOnInit(): void { this.formInit(); if (this.data?.address) { - this.setDataFrom(this.data); + if (this.data.isGetDetail) { + this.getDetailNameTag(this.data?.address); + } else { + this.setDataFrom(this.data); + } } } @@ -201,4 +205,16 @@ export class PopupNameTagComponent implements OnInit { } } } + + getDetailNameTag(address = null) { + const payload = { + limit: 1, + keyword: address || '', + offset: 0, + }; + + this.nameTagService.getListPrivateNameTag(payload).subscribe((res) => { + this.setDataFrom(res?.data[0] || this.data); + }); + } } diff --git a/src/app/pages/profile/private-name-tag/private-name-tag.component.html b/src/app/pages/profile/private-name-tag/private-name-tag.component.html index 1974f4029..4e60d01c4 100644 --- a/src/app/pages/profile/private-name-tag/private-name-tag.component.html +++ b/src/app/pages/profile/private-name-tag/private-name-tag.component.html @@ -47,7 +47,8 @@
      + [content]="'Click the star icon to mark your favorite address
      on the top of the list'" + [class]="'fw-normal'">
      @@ -70,7 +71,7 @@ *ngIf="data.isFavorite" />
      - + {{ data[template.matColumnDef] | cutStringPipe : 8 : 8 }}
      @@ -123,45 +124,44 @@
      - + {{ data.address | cutStringPipe : 8 : 8 }} -
      +
      {{ data.note || 'Note:-' }}
      + class="ph ph-push-pin body-01 cursor-pointer text--white" + *ngIf="!data.isFavorite" + (click)="updateFavorite(data)"> + [src]="'assets/icons/icons-svg/white/push-pin.svg' | imageS3" + alt="" + width="16" + height="16" + class="cursor-pointer" + (click)="updateFavorite(data)" + *ngIf="data.isFavorite" />
      - -
        -
      • +
          +
        • Edit
          • -
        • +
        • Remove
          • @@ -173,7 +173,7 @@
          Type
          -
          Contract
          +
          {{ data.type }}
          Private name tag
          @@ -185,7 +185,7 @@
          Updated time
          -
          {{commonService.getDateValue(data.updatedAt)[0]}}
          +
          {{ commonService.getDateValue(data.updatedAt)[0] }}
      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 5eb609663..dcd4af506 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 @@ -66,7 +66,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { localStorage.removeItem('setAddressNameTag'); setTimeout(() => { - this.openPopup(data); + this.openPopup(data, true); }, 500); } @@ -128,11 +128,12 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { }); } - openPopup(data = null) { + openPopup(data = null, isGetDetail = false) { const dialogConfig = new MatDialogConfig(); dialogConfig.panelClass = 'grant-overlay-panel'; dialogConfig.disableClose = true; if (data) { + data['isGetDetail'] = isGetDetail; dialogConfig.data = data; } dialogConfig.data = { ...dialogConfig.data, ...{ currentLength: this.pageData?.length } }; @@ -141,8 +142,8 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { dialogRef.afterClosed().subscribe((result) => { if (result) { setTimeout(() => { - this.pageChange.selectPage(0); - }, 4000); + this.getListPrivateName(); + }, 3000); } }); } @@ -175,7 +176,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { setTimeout(() => { this.pageData.length--; this.pageEvent(this.pageData); - }, 1000); + }, 2000); }); } @@ -188,7 +189,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.nameTagService.updatePrivateNameTag(payload).subscribe((res) => { setTimeout(() => { this.getListPrivateName(); - }, 1000); + }, 2000); }); } @@ -201,11 +202,7 @@ export class PrivateNameTagComponent implements OnInit, OnDestroy { this.getListPrivateName(); } - navigateAddress(address): void { - if (isContract(address)) { - this.router.navigate(['/contracts', address]); - } else { - this.router.navigate(['/account', address]); - } + urlType(address) { + return isContract(address) ? '/contracts' : '/account'; } } From 5e478eb78029b343e39ac3e5578fb51c42bd8ad0 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 28 Sep 2023 14:13:43 +0700 Subject: [PATCH 124/184] update nft collection dropdown list --- .../account-detail/nft-list/nft-list.component.html | 7 ++++--- .../account-detail/nft-list/nft-list.component.scss | 7 ++++++- .../account/account-detail/nft-list/nft-list.component.ts | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 4053adfdd..2ff240992 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -12,18 +12,19 @@

      NFTs ({{ listCollection[ type="button" id="nftFilter" data-bs-toggle="dropdown" - aria-expanded="false"> + aria-expanded="false" + [disabled]="listCollection?.length === 1"> {{ nftFilterItem?.label | stringEllipsis : 16 }} ({{ nftFilterItem?.quantity }}) {{ nftFilterItem?.label | stringEllipsis : 35 }} ({{ nftFilterItem?.quantity }}){{ nftFilterItem?.label | stringEllipsis : 23 }} ({{ nftFilterItem?.quantity }})
      • { this.numLength = 16; if (state.matches) { - this.numLength = 32; + this.numLength = 23; } }); } From fd8d23b6a5ace900ee0ee7896ce43a1eb3c82a4e Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 28 Sep 2023 14:59:33 +0700 Subject: [PATCH 125/184] update popup add zeroes --- .../write-contact/write-contract.component.ts | 14 +++++++++----- .../popup-add-zero/popup-add-zero.component.ts | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts index e62f75891..2430571af 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts +++ b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts @@ -242,11 +242,15 @@ export class WriteContractComponent implements OnInit { if (result) { let amount = msg['fieldList'].find((k) => k.fieldName === 'amount')?.value || ''; //check amount is exit - const numPow = amount.toString() - ? Math.pow(10, result).toString().substring(1) - : Math.pow(10, result).toString(); - amount = amount.toString() + numPow; - msg['fieldList'].find((k) => k.fieldName === 'amount').value = amount.toString(); + if (amount === '' && result === 'custom') { + //To do + } else { + const numPow = amount.toString() + ? Math.pow(10, result).toString().substring(1) + : Math.pow(10, result).toString(); + amount = amount.toString() + numPow; + msg['fieldList'].find((k) => k.fieldName === 'amount').value = amount.toString(); + } } }); } diff --git a/src/app/shared/components/popup-add-zero/popup-add-zero.component.ts b/src/app/shared/components/popup-add-zero/popup-add-zero.component.ts index 935d22043..26e99b4fc 100644 --- a/src/app/shared/components/popup-add-zero/popup-add-zero.component.ts +++ b/src/app/shared/components/popup-add-zero/popup-add-zero.component.ts @@ -12,7 +12,7 @@ import { WalletService } from 'src/app/core/services/wallet.service'; export class PopupAddZeroComponent implements OnInit { selectedZeroes: string; lstZeroes = LIST_ZEROES; - numberCustom; + numberCustom = null; constructor( @Inject(MAT_DIALOG_DATA) public data: {}, @@ -31,7 +31,7 @@ export class PopupAddZeroComponent implements OnInit { this.closeDialog(this.numberCustom || this.selectedZeroes); } - checkCustomValue(){ + checkCustomValue() { this.numberCustom = this.numberCustom > 18 ? 18 : this.numberCustom; } From 3f3b1cedf8b8db1961fa507da8134f62ec597992 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Thu, 28 Sep 2023 15:56:36 +0700 Subject: [PATCH 126/184] fix bug UI after optimize code --- .../pages/profile/popup-name-tag/popup-name-tag.component.scss | 3 +++ .../proposal-detail/summary-info/summary-info.component.scss | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss index 279b16e57..75045e631 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss @@ -29,6 +29,9 @@ height: 40px; input { max-width: 95%; + @media (min-width: 991.98px) { + max-width: 100%; + } } } .text-area { diff --git a/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss b/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss index 66daa04fa..29927804a 100644 --- a/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss +++ b/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss @@ -4,7 +4,7 @@ } } -.proposal__summary-total { +::ng-deep.proposal__summary-total { color: var(--aura-white); .vote-bar { From 0a0f60cc576caf5350adedb6a8ffa4c92172243d Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 28 Sep 2023 15:57:25 +0700 Subject: [PATCH 127/184] fix issue filter asset type --- .../account-transaction-table.component.html | 37 ++++++++----------- .../account-transaction-table.component.scss | 15 ++++++++ .../popup-name-tag.component.scss | 3 ++ 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index ca72bd58a..8e5fecbb8 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -112,21 +112,28 @@

      -
      - {{ transactionFilter.typeTransfer }} - -
      diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss index 5f21da036..0eedbc388 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss @@ -28,6 +28,21 @@ border: 1px solid var(--aura-gray-8); padding: 0 16px; border-radius: 8px; + color: var(--aura-white); + + &.filter-result { + white-space: nowrap; + padding: 0 var(--spacer-4); + color: var(--aura-blue-3link); + border: 1px solid var(--aura-blue-4); + background: #222f3d; + border-radius: 8px; + height: 33px; + display: flex; + align-items: center; + width: fit-content; + min-width: fit-content; + } } @media (max-width: 376px) { width: calc(100vw - 68px); diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss index 279b16e57..75045e631 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss @@ -29,6 +29,9 @@ height: 40px; input { max-width: 95%; + @media (min-width: 991.98px) { + max-width: 100%; + } } } .text-area { From 6b6a74af1381f1c4d140eb17d138e411dbb726cd Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 28 Sep 2023 16:02:41 +0700 Subject: [PATCH 128/184] Revert "Merge pull request #2389 from aura-nw/feature/fix-rpc" This reverts commit ceb1546a47dc2257025b672c3f086215024f1a14, reversing changes made to 92648c98b3bf10a537bebbcbdb3934c184770b7b. --- package.json | 4 ++-- src/app/core/utils/signing/transaction-manager.ts | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a0f080e91..0ab371e1a 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ "@angular/platform-browser-dynamic": "~12.0.2", "@angular/router": "~12.0.2", "@coin98-com/connect-sdk": "^1.0.9", - "@cosmjs/cosmwasm-stargate": "^0.31.1", + "@cosmjs/cosmwasm-stargate": "^0.28.13", "@cosmjs/encoding": "^0.28.13", "@cosmjs/proto-signing": "^0.29.5", - "@cosmjs/stargate": "^0.31.1", + "@cosmjs/stargate": "^0.28.13", "@google/model-viewer": "^1.12.0", "@ng-bootstrap/ng-bootstrap": "^10.0.0", "@ngx-translate/core": "^13.0.0", diff --git a/src/app/core/utils/signing/transaction-manager.ts b/src/app/core/utils/signing/transaction-manager.ts index 78951c726..7614c4f1e 100644 --- a/src/app/core/utils/signing/transaction-manager.ts +++ b/src/app/core/utils/signing/transaction-manager.ts @@ -58,7 +58,10 @@ export async function createSignBroadcast( export async function getNetworkFee(network, address, messageType, memo = ''): Promise { //set default for multi gas - let multiGas = 1.6; + let multiGas = 1.3; + if (messageType?.typeUrl === TRANSACTION_TYPE_ENUM.MsgRevokeAllowance) { + multiGas = 1.4; + } let gasEstimation = 0; try { From d63bbe307f29fa99f61f1b2ac931073dc48a2e12 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 28 Sep 2023 16:31:44 +0700 Subject: [PATCH 129/184] fix issue filter asset type --- .../nft-list/nft-list.component.html | 2 +- .../account-detail/nft-list/nft-list.component.ts | 2 +- .../write-contact/write-contract.component.ts | 15 ++++++--------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 2ff240992..a94e9436a 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -18,7 +18,7 @@

      NFTs ({{ listCollection[ >{{ nftFilterItem?.label | stringEllipsis : 16 }} ({{ nftFilterItem?.quantity }}) {{ nftFilterItem?.label | stringEllipsis : 23 }} ({{ nftFilterItem?.quantity }}){{ nftFilterItem?.label | stringEllipsis : 22 }} ({{ nftFilterItem?.quantity }}) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts index ece8b198d..95ae4df1d 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts @@ -50,7 +50,7 @@ export class NftListComponent implements OnInit, OnChanges { this.breakpoint$.subscribe((state) => { this.numLength = 16; if (state.matches) { - this.numLength = 23; + this.numLength = 20; } }); } diff --git a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts index 2430571af..7ce309ad4 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts +++ b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts @@ -240,17 +240,14 @@ export class WriteContractComponent implements OnInit { dialogRef.afterClosed().subscribe((result) => { if (result) { + result = result === 'custom' ? 0 : result; let amount = msg['fieldList'].find((k) => k.fieldName === 'amount')?.value || ''; //check amount is exit - if (amount === '' && result === 'custom') { - //To do - } else { - const numPow = amount.toString() - ? Math.pow(10, result).toString().substring(1) - : Math.pow(10, result).toString(); - amount = amount.toString() + numPow; - msg['fieldList'].find((k) => k.fieldName === 'amount').value = amount.toString(); - } + const numPow = amount.toString() + ? Math.pow(10, result).toString().substring(1) + : Math.pow(10, result).toString(); + amount = amount.toString() + numPow; + msg['fieldList'].find((k) => k.fieldName === 'amount').value = amount.toString(); } }); } From b984b1e9a7c83b3f0b5cabbe9d508508ed147cf6 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Thu, 28 Sep 2023 16:46:04 +0700 Subject: [PATCH 130/184] fix issue filter asset type --- .../account-transaction-table.component.scss | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss index 0eedbc388..b2669e72a 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss @@ -71,16 +71,6 @@ } } -.box-type-selected { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - max-width: 200px; - @media (min-width: 375.98px) { - max-width: 250px; - } -} - .icon-expand { &.active { cursor: pointer; @@ -181,14 +171,6 @@ margin-bottom: 2px; } } -} - -.btn-select-type { - background-color: unset; - color: white; -} - -.account-transaction-table { ::ng-deep { .message-custom { transform: translate(0, 8px) !important; @@ -214,6 +196,12 @@ } } } + +.btn-select-type { + background-color: unset; + color: white; +} + .panel__btn-group { height: 72px; display: flex; From f22b0b135ec3cc5c756ef24cd40d4a83389ef922 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Thu, 28 Sep 2023 17:02:42 +0700 Subject: [PATCH 131/184] upsize --- angular.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angular.json b/angular.json index d7fe8b569..710a2a930 100644 --- a/angular.json +++ b/angular.json @@ -67,8 +67,8 @@ "production": { "budgets": [{ "type": "initial", - "maximumWarning": "10mb", - "maximumError": "10mb" + "maximumWarning": "15mb", + "maximumError": "15mb" }, { "type": "anyComponentStyle", From 5c1a3138b6728824578806e0112aefb1c2c0de79 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Thu, 28 Sep 2023 17:34:09 +0700 Subject: [PATCH 132/184] optimize account-transaction-table.component.scss --- .../account-transaction-table.component.html | 17 ++-- .../account-transaction-table.component.scss | 89 +++---------------- ...oulbound-account-token-list.component.scss | 12 --- .../soulbound-feature-tokens.component.scss | 12 --- src/assets/scss/aura-theme/border.scss | 3 + src/assets/scss/aura-theme/calendar.scss | 12 +++ src/assets/scss/aura-theme/popup.scss | 7 ++ src/assets/scss/aura-theme/typo.scss | 3 + src/assets/scss/custom.scss | 18 ++++ 9 files changed, 66 insertions(+), 107 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 8e5fecbb8..3e39fa36f 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -60,8 +60,9 @@
      -
      @@ -442,9 +445,9 @@ !(item.fromAddress?.startsWith('Null') || currentAddress?.startsWith('Null')) && item.fromAddress !== currentAddress "> -
      +
      IN OUT @@ -490,7 +493,7 @@ ">
      -
      +
      >99 +{{ data.arrEvent?.length - 1 }} diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss index b2669e72a..a77dc4eac 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss @@ -1,11 +1,8 @@ -@media (max-width: 991.99px) { - .button-filter { - padding: 8px; - } -} - .button-filter { position: relative; + @media (max-width: 991.99px) { + padding: 8px; + } &[aria-expanded='true'] { border: 2px solid var(--aura-white); } @@ -18,6 +15,7 @@ } } } + .box-filter { .divider.divider-vertical { min-height: 33px; @@ -51,6 +49,7 @@ width: 100%; } } + .tnx-filter-item { height: 44px; } @@ -100,14 +99,6 @@ } } -.table-transfer tr td { - &:nth-child(4), - &:nth-child(5), - &:nth-child(6) { - padding-top: var(--spacer-0) !important; - } -} - .account-transaction-table { .aura-status .status { background-color: unset; @@ -159,14 +150,9 @@ } } .box-number { - border: solid 1px var(--aura-gray-8); border-radius: 4px; - margin-left: var(--spacer-3); padding: 2px 6px 2px 6px; - display: flex; - align-items: center; font-size: 12px; - cursor: pointer; .icon-expand { margin-bottom: 2px; } @@ -178,16 +164,10 @@ } .box-token-transfer { min-width: 60px; - display: flex; - justify-content: flex-start; .token-transfer-status { - display: inline-flex; - align-items: center; padding: var(--spacer-2) var(--spacer-4); color: var(--aura-green-3); border-radius: 4px; - font-weight: 600; - font-size: 12px; width: auto; margin: auto; &.status-out { @@ -204,31 +184,10 @@ .panel__btn-group { height: 72px; - display: flex; - align-items: center; - justify-content: end; background-color: var(--aura-gray-9); margin: 0 -8px -16px -8px; } -mat-date-range-input { - height: 31px; - display: flex; - align-items: center; - padding-left: 16px; -} -.calendar-contain { - width: 225px; - border: 1px solid var(--aura-gray-8) !important; - border-radius: 8px; -} -::ng-deep { - .mat-datepicker-content .mat-calendar { - background: #24262e; - border: 1px solid #717582; - border-radius: 8px; - } -} .filter-contain { flex-wrap: nowrap; -ms-overflow-style: none; /* IE and Edge */ @@ -244,35 +203,12 @@ mat-date-range-input { display: none; } } -.btn-tns { - min-width: 200px; -} -.btn-mess { - min-width: 155px; -} - -.button-link { - color: var(--aura-blue-3link); -} .nft__unclaimed-noti { position: absolute; top: 0; right: 0; - width: 24px; - height: 24px; - border-radius: 50%; - display: flex; - align-items: center; - justify-content: center; - background-color: var(--aura-red-3); - color: white; transform: translate(50%, -50%); - &.noti--pill { - width: auto; - border-radius: 24px; - padding: 4px 8px; - } } .box-filter__desc { margin-top: -200px; @@ -291,13 +227,6 @@ mat-date-range-input { display: flex; align-items: center; } -.menu-hidden { - height: 0 !important; - width: 0 !important; - min-width: 0 !important; - overflow: hidden !important; - border: none !important; -} .tag-filter-box { min-height: 40px; border: 1px solid var(--aura-gray-9); @@ -341,3 +270,11 @@ mat-date-range-input { } } } + +.table-transfer tr td { + &:nth-child(4), + &:nth-child(5), + &:nth-child(6) { + padding-top: var(--spacer-0) !important; + } +} 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 b8bfbd2cc..48829e19e 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 @@ -74,18 +74,6 @@ margin-left: var(--spacer-1); width: 19px; height: 19px; - border-radius: 50%; - display: flex; - align-items: center; - justify-content: center; - background-color: var(--aura-red-3); - font-size: 10px; - font-weight: 600; - &.noti--pill { - width: auto; - border-radius: 24px; - padding: 4px 8px; - } } ::ng-deep { 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 93f43dd2e..73ccfcb1a 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 @@ -61,20 +61,8 @@ position: absolute; top: 0; right: 0; - width: 24px; - height: 24px; - border-radius: 50%; - display: flex; - align-items: center; - justify-content: center; - background-color: var(--aura-red-3); color: white; transform: translate(50%, -50%); - &.noti--pill { - width: auto; - border-radius: 24px; - padding: 4px 8px; - } } .sbt-card-contain { width: 130px; diff --git a/src/assets/scss/aura-theme/border.scss b/src/assets/scss/aura-theme/border.scss index 0afc30e69..29527fa7b 100644 --- a/src/assets/scss/aura-theme/border.scss +++ b/src/assets/scss/aura-theme/border.scss @@ -3,6 +3,9 @@ border: 1px solid !important; } // border color +.border-gray-8 { + border-color: var(--aura-gray-8) !important; +} .border-gray-9 { border-color: var(--aura-gray-9) !important; } diff --git a/src/assets/scss/aura-theme/calendar.scss b/src/assets/scss/aura-theme/calendar.scss index 55f992e21..b32c86487 100644 --- a/src/assets/scss/aura-theme/calendar.scss +++ b/src/assets/scss/aura-theme/calendar.scss @@ -58,3 +58,15 @@ mat-datepicker-toggle .mat-icon-button { border-radius: 8px !important; color: var(--aura-white) !important; } + +.mat-datepicker-content .mat-calendar { + background: #24262e; + border: 1px solid #717582; + border-radius: 8px; +} +mat-date-range-input { + height: 31px; + display: flex !important; + align-items: center; + padding-left: 16px; +} diff --git a/src/assets/scss/aura-theme/popup.scss b/src/assets/scss/aura-theme/popup.scss index 5f3d928b2..ed098abd6 100644 --- a/src/assets/scss/aura-theme/popup.scss +++ b/src/assets/scss/aura-theme/popup.scss @@ -52,3 +52,10 @@ background-color: var(--aura-gray-10); margin-bottom: 6px; } +.menu-hidden { + height: 0 !important; + width: 0 !important; + min-width: 0 !important; + overflow: hidden !important; + border: none !important; +} diff --git a/src/assets/scss/aura-theme/typo.scss b/src/assets/scss/aura-theme/typo.scss index 6e95548e8..6cfab8eb8 100644 --- a/src/assets/scss/aura-theme/typo.scss +++ b/src/assets/scss/aura-theme/typo.scss @@ -156,3 +156,6 @@ $textColors: ( .text-hover-gray { color: #9da2af; } +.button-link { + color: var(--aura-blue-3link); +} diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss index 97a562414..6c03a6b0c 100644 --- a/src/assets/scss/custom.scss +++ b/src/assets/scss/custom.scss @@ -789,3 +789,21 @@ body { .w-fit-content{ width: fit-content; } + + +.nft__unclaimed-noti { + width: 24px; + height: 24px; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + background-color: var(--aura-red-3); + font-size: 10px; + font-weight: 600; + &.noti--pill { + width: auto; + border-radius: 24px; + padding: 4px 8px; + } +} From d8e682caa6790aca2719393df255e35a75d622a0 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Fri, 29 Sep 2023 10:01:12 +0700 Subject: [PATCH 133/184] fix chart step 9min 24h --- src/app/pages/dashboard/dashboard-chart-options.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/dashboard/dashboard-chart-options.ts b/src/app/pages/dashboard/dashboard-chart-options.ts index 67db2951d..498fc14cd 100644 --- a/src/app/pages/dashboard/dashboard-chart-options.ts +++ b/src/app/pages/dashboard/dashboard-chart-options.ts @@ -99,11 +99,11 @@ export const CHART_CONFIG: { }; } = { ['24h']: { - initRange: 482, + initRange: 242, type: RangeType.minute, - value: 2, + value: 1, unit: 'd', - step: 3, + step: 9, }, ['7d']: { initRange: 168, From 7c83b46a3463afc338702acb31642a1681e1b3d6 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Fri, 29 Sep 2023 10:01:12 +0700 Subject: [PATCH 134/184] fix chart step 9min 24h (cherry picked from commit d8e682caa6790aca2719393df255e35a75d622a0) --- src/app/pages/dashboard/dashboard-chart-options.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/dashboard/dashboard-chart-options.ts b/src/app/pages/dashboard/dashboard-chart-options.ts index 67db2951d..498fc14cd 100644 --- a/src/app/pages/dashboard/dashboard-chart-options.ts +++ b/src/app/pages/dashboard/dashboard-chart-options.ts @@ -99,11 +99,11 @@ export const CHART_CONFIG: { }; } = { ['24h']: { - initRange: 482, + initRange: 242, type: RangeType.minute, - value: 2, + value: 1, unit: 'd', - step: 3, + step: 9, }, ['7d']: { initRange: 168, From 66adc072477a0745a60f7de0f318abb9a4a91496 Mon Sep 17 00:00:00 2001 From: mtam Date: Fri, 29 Sep 2023 10:38:05 +0700 Subject: [PATCH 135/184] [TamTM6] pick code --- .../nft-list/nft-list.component.html | 31 +++++++++-------- .../nft-list/nft-list.component.scss | 34 ++++++++++++++++++- .../soulbound-feature-tokens.component.html | 2 +- .../soulbound-feature-tokens.component.scss | 8 +++++ src/assets/scss/aura-theme/cards.scss | 2 +- 5 files changed, 59 insertions(+), 18 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index a94e9436a..61f5ffe3b 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -12,14 +12,12 @@

      NFTs ({{ listCollection[ type="button" id="nftFilter" data-bs-toggle="dropdown" - aria-expanded="false" - [disabled]="listCollection?.length === 1"> - {{ nftFilterItem?.label | stringEllipsis : 16 }} ({{ nftFilterItem?.quantity }}) - {{ nftFilterItem?.label | stringEllipsis : 22 }} ({{ nftFilterItem?.quantity }}) + [disabled]="listCollection?.length === 1" + aria-expanded="false"> +
      +
      {{ nftFilterItem?.label }}
      + ({{ nftFilterItem?.quantity }}) +
      @@ -34,7 +32,10 @@

      NFTs ({{ listCollection[ [class.mb-1]="i > 0" class="dropdown-item cursor-pointer px-4 px-lg-2" [class.active]="nftFilter === item.address"> - {{ (item.label | cutStringPipe : numLength) + ' (' + item.quantity + ')' }} +
      +
      {{ item.label }}
      + ({{ item.quantity }}) +

    @@ -87,14 +88,14 @@

    NFTs ({{ listCollection[ CW-721

    -
    +
    Token: - - {{ item.token_name | cutStringPipe : 16 }} - {{ item.token_name | cutStringPipe : 12 }} - + {{ item.token_name }} + {{ item.token_name }} +
    Token ID: diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss index 1f37c8df6..ce6b511a2 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.scss +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.scss @@ -95,7 +95,7 @@ padding: var(--spacer-3) var(--spacer-2); background-color: var(--aura-gray-10); - &>* { + & > * { color: var(--aura-white); } @@ -107,3 +107,35 @@ } } } + +.txt-collection-name { + max-width: 95%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin-right: 2px; + color: var(--aura-white); + &.label { + max-width: 235px; + } + @media (min-width: 991.98px) { + max-width: 87%; + &.label { + max-width: 145px; + } + } +} + +.nft-cards__item { + .box-name { + max-width: -webkit-fill-available; + .txt-collection-name { + @media (min-width: 991.98px) { + max-width: 150px; + } + @media (min-width: 1367px) { + max-width: 180px; + } + } + } +} 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 85c59502b..05c82a7e0 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 @@ -35,7 +35,7 @@

    ABTs ({{ totalABT || 0 }})

    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 93f43dd2e..f2c6490c0 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 @@ -43,6 +43,14 @@ opacity: 1; } } + ::ng-deep { + img, + video, + app-model-view, + app-audio-player { + border-radius: 8px; + } + } } } .nft__unclaimed { diff --git a/src/assets/scss/aura-theme/cards.scss b/src/assets/scss/aura-theme/cards.scss index db5225219..fc3568fa4 100644 --- a/src/assets/scss/aura-theme/cards.scss +++ b/src/assets/scss/aura-theme/cards.scss @@ -51,7 +51,7 @@ top: 0; left: 0; object-fit: fill; - border-radius: 8px; + border-radius: 8px 8px 0 0; } &::before { content: ''; From 3cdd846eb3a9000051997f38873a82bda45758ef Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Fri, 29 Sep 2023 11:51:16 +0700 Subject: [PATCH 136/184] update UI --- .../account-detail/nft-list/nft-list.component.html | 11 ++++++----- .../account-detail/nft-list/nft-list.component.scss | 8 +++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 61f5ffe3b..58e717396 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -26,6 +26,7 @@

    NFTs ({{ listCollection[ aria-labelledby="nftFilter" *ngIf="listCollection?.length > 0">
  • NFTs ({{ listCollection[ class="dropdown-item cursor-pointer px-4 px-lg-2" [class.active]="nftFilter === item.address">
    -
    {{ item.label }}
    + {{ item.label }} ({{ item.quantity }})
    • @@ -91,13 +92,13 @@

    NFTs ({{ listCollection[
    Token:
    - {{ item.token_name }} - {{ item.token_name }} + {{ item.token_name }} + {{ item.token_name }}
    -
    +
    Token ID: Date: Fri, 29 Sep 2023 11:55:27 +0700 Subject: [PATCH 137/184] update UI --- .../account/account-detail/nft-list/nft-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.html b/src/app/pages/account/account-detail/nft-list/nft-list.component.html index 58e717396..17872c268 100644 --- a/src/app/pages/account/account-detail/nft-list/nft-list.component.html +++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.html @@ -33,7 +33,7 @@

    NFTs ({{ listCollection[ [class.mb-1]="i > 0" class="dropdown-item cursor-pointer px-4 px-lg-2" [class.active]="nftFilter === item.address"> -
    +
    {{ item.label }} ({{ item.quantity }})
    From 04faef62fe9f3c07a444ee0f632059dc2333ce3d Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Fri, 29 Sep 2023 11:59:01 +0700 Subject: [PATCH 138/184] Merge remote-tracking branch 'origin/develop' into baseline/serenity_20230925 --- angular.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angular.json b/angular.json index 710a2a930..d7fe8b569 100644 --- a/angular.json +++ b/angular.json @@ -67,8 +67,8 @@ "production": { "budgets": [{ "type": "initial", - "maximumWarning": "15mb", - "maximumError": "15mb" + "maximumWarning": "10mb", + "maximumError": "10mb" }, { "type": "anyComponentStyle", From 4b99e475b08d7afe504ac6901c8d8971c5d699fa Mon Sep 17 00:00:00 2001 From: mtam Date: Fri, 29 Sep 2023 14:53:15 +0700 Subject: [PATCH 139/184] [TamTM6] fix balance nft, decimal token transfer --- .../token-holders-tab.component.html | 4 ++-- .../token-transfers-tab.component.ts | 7 +++---- .../token-content.component.html | 8 ++++++-- .../token-content/token-content.component.ts | 20 +++++++++++++++++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html index f78df4321..ed5cd5ff8 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html @@ -63,9 +63,9 @@ [content]="data[template.matColumnDef] | convertSmallNumber : decimalValue"> + [decimal]="decimalValue">
    diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts index 4db17590b..724550c6d 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts @@ -202,10 +202,8 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { if (this.keyWord?.length === LENGTH_CHARACTER.TRANSACTION && this.keyWord == this?.keyWord.toUpperCase()) { payload['txHash'] = this.keyWord; } else { - // if (this.keyWord?.length >= LENGTH_CHARACTER.ADDRESS && this.keyWord?.startsWith(this.prefixAdd)) { payload['sender'] = this.keyWord; payload['receiver'] = this.keyWord; - // } } } @@ -222,8 +220,9 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { let txs = convertDataAccountTransaction(res, this.coinInfo, TabsAccountLink.FtsTxs, false, null); txs.forEach((element, index) => { - element['from_address'] = element.fromAddress; - element['to_address'] = element.toAddress; + element['arrEvent'] = element.arrEvent.filter((k) => k.contractAddress === this.contractAddress); + element['from_address'] = element.arrEvent[0]?.fromAddress; + element['to_address'] = element.arrEvent[0]?.toAddress; element['type'] = element?.action; }); if (this.dataSource.data.length > 0 && !isReload) { diff --git a/src/app/pages/token/token-detail/token-content/token-content.component.html b/src/app/pages/token/token-detail/token-content/token-content.component.html index 8ce370452..01b041f3f 100644 --- a/src/app/pages/token/token-detail/token-content/token-content.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content.component.html @@ -38,13 +38,17 @@
    + *ngIf=" + (infoSearch['balance'] | balanceOf : tokenDetail.decimals) < 0.001 && infoSearch['balance'] != 0 + "> <0,001
    diff --git a/src/app/pages/token/token-detail/token-content/token-content.component.ts b/src/app/pages/token/token-detail/token-content/token-content.component.ts index 264deeac3..431135302 100644 --- a/src/app/pages/token/token-detail/token-content/token-content.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content.component.ts @@ -9,6 +9,7 @@ import { Globals } from 'src/app/global/global'; import { MAX_LENGTH_SEARCH_TOKEN, TOKEN_TAB } from '../../../../core/constants/token.constant'; import { TokenTab } from '../../../../core/constants/token.enum'; import { CommonService } from 'src/app/core/services/common.service'; +import { TokenService } from 'src/app/core/services/token.service'; @Component({ selector: 'app-token-content', @@ -52,6 +53,7 @@ export class TokenContentComponent implements OnInit { public global: Globals, private layout: BreakpointObserver, public commonService: CommonService, + private tokenService: TokenService, ) {} ngOnInit(): void { @@ -150,10 +152,10 @@ export class TokenContentComponent implements OnInit { } const client = await SigningCosmWasmClient.connect(this.chainInfo.rpc); try { - const data = await client.queryContractSmart(this.contractAddress, queryData); if (this.tokenDetail.isNFTContract) { - this.infoSearch['balance'] = data?.tokens?.length; + this.countBalanceNFT(address); } else { + const data = await client.queryContractSmart(this.contractAddress, queryData); this.infoSearch['balance'] = data?.balance; } } catch (error) {} @@ -162,4 +164,18 @@ export class TokenContentComponent implements OnInit { getMoreTx(event) { this.hasMore.emit(event); } + + countBalanceNFT(address) { + let payload = { + limit: 20, + offset: 0, + contractAddress: this.contractAddress, + owner: address, + token_id: null, + }; + + this.tokenService.getListTokenNFTFromIndexer(payload).subscribe((res) => { + this.infoSearch['balance'] = res.cw721_token_aggregate.aggregate.count || 0; + }); + } } From f4e0ef641018fa7c69250762ec45728e54c0d002 Mon Sep 17 00:00:00 2001 From: mtam Date: Fri, 29 Sep 2023 14:54:10 +0700 Subject: [PATCH 140/184] [TamTM6] revert decimalValuie --- .../token-holders-tab/token-holders-tab.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html index ed5cd5ff8..cbf0d3948 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html @@ -65,7 +65,7 @@ + [decimal]="decimalValue || 0">

    From 7e91eb1c668f260709cdb5f6a4b4d414290b06d2 Mon Sep 17 00:00:00 2001 From: mtam Date: Fri, 29 Sep 2023 14:55:00 +0700 Subject: [PATCH 141/184] [TamTM6] check null --- .../token-transfers-tab/token-transfers-tab.component.ts | 2 +- .../token/token-detail/token-content/token-content.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts index 724550c6d..b11359067 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts @@ -220,7 +220,7 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { let txs = convertDataAccountTransaction(res, this.coinInfo, TabsAccountLink.FtsTxs, false, null); txs.forEach((element, index) => { - element['arrEvent'] = element.arrEvent.filter((k) => k.contractAddress === this.contractAddress); + element['arrEvent'] = element.arrEvent?.filter((k) => k.contractAddress === this.contractAddress); element['from_address'] = element.arrEvent[0]?.fromAddress; element['to_address'] = element.arrEvent[0]?.toAddress; element['type'] = element?.action; diff --git a/src/app/pages/token/token-detail/token-content/token-content.component.ts b/src/app/pages/token/token-detail/token-content/token-content.component.ts index 431135302..95d33c926 100644 --- a/src/app/pages/token/token-detail/token-content/token-content.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content.component.ts @@ -175,7 +175,7 @@ export class TokenContentComponent implements OnInit { }; this.tokenService.getListTokenNFTFromIndexer(payload).subscribe((res) => { - this.infoSearch['balance'] = res.cw721_token_aggregate.aggregate.count || 0; + this.infoSearch['balance'] = res.cw721_token_aggregate?.aggregate?.count || 0; }); } } From 09d4544da59f506b37c2ca88fe211ed3464751e7 Mon Sep 17 00:00:00 2001 From: mtam Date: Fri, 29 Sep 2023 14:53:15 +0700 Subject: [PATCH 142/184] [TamTM6] fix balance nft, decimal token transfer (cherry picked from commit 4b99e475b08d7afe504ac6901c8d8971c5d699fa) --- .../token-holders-tab.component.html | 4 ++-- .../token-transfers-tab.component.ts | 7 +++---- .../token-content.component.html | 8 ++++++-- .../token-content/token-content.component.ts | 20 +++++++++++++++++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html index f78df4321..ed5cd5ff8 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html @@ -63,9 +63,9 @@ [content]="data[template.matColumnDef] | convertSmallNumber : decimalValue"> + [decimal]="decimalValue">
    diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts index 4db17590b..724550c6d 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts @@ -202,10 +202,8 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { if (this.keyWord?.length === LENGTH_CHARACTER.TRANSACTION && this.keyWord == this?.keyWord.toUpperCase()) { payload['txHash'] = this.keyWord; } else { - // if (this.keyWord?.length >= LENGTH_CHARACTER.ADDRESS && this.keyWord?.startsWith(this.prefixAdd)) { payload['sender'] = this.keyWord; payload['receiver'] = this.keyWord; - // } } } @@ -222,8 +220,9 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { let txs = convertDataAccountTransaction(res, this.coinInfo, TabsAccountLink.FtsTxs, false, null); txs.forEach((element, index) => { - element['from_address'] = element.fromAddress; - element['to_address'] = element.toAddress; + element['arrEvent'] = element.arrEvent.filter((k) => k.contractAddress === this.contractAddress); + element['from_address'] = element.arrEvent[0]?.fromAddress; + element['to_address'] = element.arrEvent[0]?.toAddress; element['type'] = element?.action; }); if (this.dataSource.data.length > 0 && !isReload) { diff --git a/src/app/pages/token/token-detail/token-content/token-content.component.html b/src/app/pages/token/token-detail/token-content/token-content.component.html index 8ce370452..01b041f3f 100644 --- a/src/app/pages/token/token-detail/token-content/token-content.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content.component.html @@ -38,13 +38,17 @@
    + *ngIf=" + (infoSearch['balance'] | balanceOf : tokenDetail.decimals) < 0.001 && infoSearch['balance'] != 0 + "> <0,001
    diff --git a/src/app/pages/token/token-detail/token-content/token-content.component.ts b/src/app/pages/token/token-detail/token-content/token-content.component.ts index 264deeac3..431135302 100644 --- a/src/app/pages/token/token-detail/token-content/token-content.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content.component.ts @@ -9,6 +9,7 @@ import { Globals } from 'src/app/global/global'; import { MAX_LENGTH_SEARCH_TOKEN, TOKEN_TAB } from '../../../../core/constants/token.constant'; import { TokenTab } from '../../../../core/constants/token.enum'; import { CommonService } from 'src/app/core/services/common.service'; +import { TokenService } from 'src/app/core/services/token.service'; @Component({ selector: 'app-token-content', @@ -52,6 +53,7 @@ export class TokenContentComponent implements OnInit { public global: Globals, private layout: BreakpointObserver, public commonService: CommonService, + private tokenService: TokenService, ) {} ngOnInit(): void { @@ -150,10 +152,10 @@ export class TokenContentComponent implements OnInit { } const client = await SigningCosmWasmClient.connect(this.chainInfo.rpc); try { - const data = await client.queryContractSmart(this.contractAddress, queryData); if (this.tokenDetail.isNFTContract) { - this.infoSearch['balance'] = data?.tokens?.length; + this.countBalanceNFT(address); } else { + const data = await client.queryContractSmart(this.contractAddress, queryData); this.infoSearch['balance'] = data?.balance; } } catch (error) {} @@ -162,4 +164,18 @@ export class TokenContentComponent implements OnInit { getMoreTx(event) { this.hasMore.emit(event); } + + countBalanceNFT(address) { + let payload = { + limit: 20, + offset: 0, + contractAddress: this.contractAddress, + owner: address, + token_id: null, + }; + + this.tokenService.getListTokenNFTFromIndexer(payload).subscribe((res) => { + this.infoSearch['balance'] = res.cw721_token_aggregate.aggregate.count || 0; + }); + } } From b45c980abf82610c3c2f44490bfed9cd42df491c Mon Sep 17 00:00:00 2001 From: mtam Date: Fri, 29 Sep 2023 14:54:10 +0700 Subject: [PATCH 143/184] [TamTM6] revert decimalValuie (cherry picked from commit f4e0ef641018fa7c69250762ec45728e54c0d002) --- .../token-holders-tab/token-holders-tab.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html index ed5cd5ff8..cbf0d3948 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-holders-tab/token-holders-tab.component.html @@ -65,7 +65,7 @@ + [decimal]="decimalValue || 0">

    From 7028282000c3d339e6a1892a80ddd1e08f370cd6 Mon Sep 17 00:00:00 2001 From: mtam Date: Fri, 29 Sep 2023 14:55:00 +0700 Subject: [PATCH 144/184] [TamTM6] check null (cherry picked from commit 7e91eb1c668f260709cdb5f6a4b4d414290b06d2) --- .../token-transfers-tab/token-transfers-tab.component.ts | 2 +- .../token/token-detail/token-content/token-content.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts index 724550c6d..b11359067 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts @@ -220,7 +220,7 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit { let txs = convertDataAccountTransaction(res, this.coinInfo, TabsAccountLink.FtsTxs, false, null); txs.forEach((element, index) => { - element['arrEvent'] = element.arrEvent.filter((k) => k.contractAddress === this.contractAddress); + element['arrEvent'] = element.arrEvent?.filter((k) => k.contractAddress === this.contractAddress); element['from_address'] = element.arrEvent[0]?.fromAddress; element['to_address'] = element.arrEvent[0]?.toAddress; element['type'] = element?.action; diff --git a/src/app/pages/token/token-detail/token-content/token-content.component.ts b/src/app/pages/token/token-detail/token-content/token-content.component.ts index 431135302..95d33c926 100644 --- a/src/app/pages/token/token-detail/token-content/token-content.component.ts +++ b/src/app/pages/token/token-detail/token-content/token-content.component.ts @@ -175,7 +175,7 @@ export class TokenContentComponent implements OnInit { }; this.tokenService.getListTokenNFTFromIndexer(payload).subscribe((res) => { - this.infoSearch['balance'] = res.cw721_token_aggregate.aggregate.count || 0; + this.infoSearch['balance'] = res.cw721_token_aggregate?.aggregate?.count || 0; }); } } From 3c6c25b84e237370999e11d63fbd636939663764 Mon Sep 17 00:00:00 2001 From: mtam Date: Fri, 29 Sep 2023 15:39:24 +0700 Subject: [PATCH 145/184] [TamTM6] fix decimal (cherry picked from commit 6049cf35d17c04d57e0f7789b0491f5f57924304) --- .../token-transfers-tab/token-transfers-tab.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html index 377dc236e..f0db8a3c4 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html @@ -82,7 +82,7 @@ [content]="data.arrEvent[0]?.amountTemp | convertSmallNumber : data.arrEvent[0]?.decimal">
    From 3a453f46aabc3c45500b1496c371b97459472248 Mon Sep 17 00:00:00 2001 From: mtam Date: Mon, 2 Oct 2023 11:34:56 +0700 Subject: [PATCH 146/184] [TamTM6] update border button nft --- .../token-transfer/token-transfer.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index 414684b73..b66a06202 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -234,7 +234,7 @@
    - +
    diff --git a/src/app/pages/fee-grant/popup-add-grant/popup-add-grant.component.scss b/src/app/pages/fee-grant/popup-add-grant/popup-add-grant.component.scss index 8dcee76d8..6f8d394e2 100644 --- a/src/app/pages/fee-grant/popup-add-grant/popup-add-grant.component.scss +++ b/src/app/pages/fee-grant/popup-add-grant/popup-add-grant.component.scss @@ -14,47 +14,11 @@ .form-check-input { background-color: transparent !important; } - i.ph-calendar-blank-fill { - display: block; - font-size: 2.2rem; - color: var(--aura-white); - } -} -::ng-deep { - .cdk-overlay-container--grant { - z-index: 2500 !important; - } - .mat-datepicker-content { - background-color: var(--aura-gray-10); - border: 1px solid #9DA1AC; - border-radius: 8px !important; - } - .mat-calendar-body-cell-content { - border-radius: 8px !important; - } - .mat-calendar-body-today:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical) { - background-color: #2BBBA3 !important; - border: none; - } - .mat-calendar-body-selected { - border: 1px solid #FFFFFF; - background-color: transparent; - color: var(--aura-white); - } - .mat-datepicker-popup { - left: 50%!important; - transform: translate(-50%, 10px); - @media (min-width: 992px) { - left: 50% !important; - right: 0; - transform: translate(calc(-32px), 19px); - } - } } .card-explain { padding: var(--spacer-6); background-color: #1C1D23; - border: 1px solid #363843; + border: 1px solid var(--aura-gray-9); border-radius: 10px; .input-group.form-check-input { background-color: #24262E !important; diff --git a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss index 75045e631..64a596df4 100644 --- a/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss +++ b/src/app/pages/profile/popup-name-tag/popup-name-tag.component.scss @@ -82,33 +82,3 @@ } } } - -.box-name-tag { - height: 26px; - display: inline-flex; - align-items: center; - font-size: 1.2rem; - font-weight: 400; - line-height: 1.6rem; - word-break: break-word; - background-color: var(--aura-gray-9); - border-radius: 4px 0px 0px 4px; - padding-left: var(--spacer-2); - padding-right: var(--spacer-5); - color: var(--aura-gray-light); - &:not(.private-name-tag) { - position: relative; - &:after { - content: ''; - position: absolute; - width: 0; - height: 0; - right: 0; - top: 0; - bottom: 0; - border-top: 13px solid transparent; - border-right: 15px solid #24262e; - border-bottom: 13px solid transparent; - } - } -} diff --git a/src/app/pages/proposal/proposal-detail/summary-info/current-status/current-status.component.html b/src/app/pages/proposal/proposal-detail/summary-info/current-status/current-status.component.html index 1258f0111..94a761f08 100644 --- a/src/app/pages/proposal/proposal-detail/summary-info/current-status/current-status.component.html +++ b/src/app/pages/proposal/proposal-detail/summary-info/current-status/current-status.component.html @@ -9,7 +9,7 @@

    Current Status

    {{ currentSubTitle }}
    -
    +
    • diff --git a/src/app/pages/proposal/proposal-detail/summary-info/current-status/current-status.component.scss b/src/app/pages/proposal/proposal-detail/summary-info/current-status/current-status.component.scss index 927cda2d2..e69de29bb 100644 --- a/src/app/pages/proposal/proposal-detail/summary-info/current-status/current-status.component.scss +++ b/src/app/pages/proposal/proposal-detail/summary-info/current-status/current-status.component.scss @@ -1,40 +0,0 @@ - .vote-bar { - @media (max-width: 991.98px) { - .vote-bar-ul { - width: 100%; - height: 20px; - } - - &__info { - position: absolute; - top: 5px; - bottom: 0; - transform: translate(-50%, -130%); - - &:before { - content: ''; - position: absolute; - left: 50%; - top: 110%; - transform: translateX(-50%); - height: 91%; - width: 4px; - background-color: var(--aura-white); - border-radius: 2px; - } - - &:after { - content: ''; - position: absolute; - left: 50%; - bottom: 0; - transform: translateX(-50%); - width: 0; - height: 0; - border-left: 10px solid transparent; - border-right: 10px solid transparent; - border-top: 10px solid #777E91; - } - } - } -} \ No newline at end of file diff --git a/src/app/pages/proposal/proposal-detail/summary-info/current-turnout/current-turnout.component.html b/src/app/pages/proposal/proposal-detail/summary-info/current-turnout/current-turnout.component.html index 62c2608ba..8d93e220a 100644 --- a/src/app/pages/proposal/proposal-detail/summary-info/current-turnout/current-turnout.component.html +++ b/src/app/pages/proposal/proposal-detail/summary-info/current-turnout/current-turnout.component.html @@ -18,7 +18,7 @@
    -
    +
    • diff --git a/src/app/pages/proposal/proposal-detail/summary-info/current-turnout/current-turnout.component.scss b/src/app/pages/proposal/proposal-detail/summary-info/current-turnout/current-turnout.component.scss index 1e697a5f5..e69de29bb 100644 --- a/src/app/pages/proposal/proposal-detail/summary-info/current-turnout/current-turnout.component.scss +++ b/src/app/pages/proposal/proposal-detail/summary-info/current-turnout/current-turnout.component.scss @@ -1,40 +0,0 @@ -.vote-bar { - @media (max-width: 991.98px) { - .vote-bar-ul { - width: 100%; - height: 20px; - } - - &__info { - position: absolute; - top: 5px; - bottom: 0; - transform: translate(-50%, -130%); - - &:before { - content: ''; - position: absolute; - left: 50%; - top: 110%; - transform: translateX(-50%); - height: 91%; - width: 4px; - background-color: var(--aura-white); - border-radius: 2px; - } - - &:after { - content: ''; - position: absolute; - left: 50%; - bottom: 0; - transform: translateX(-50%); - width: 0; - height: 0; - border-left: 10px solid transparent; - border-right: 10px solid transparent; - border-top: 10px solid #777E91; - } - } - } -} \ No newline at end of file diff --git a/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss b/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss index 29927804a..529eecf19 100644 --- a/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss +++ b/src/app/pages/proposal/proposal-detail/summary-info/summary-info.component.scss @@ -13,43 +13,6 @@ border-radius: 4px; position: relative; - ul.vote-bar-ul { - background-color: var(--aura-gray-8); - border-radius: 4px; - - li.bg { - &--primary { - background-color: var(--aura-green-3); - } - - &--danger { - background-color: var(--aura-danger); - } - - &--info { - background-color: var(--aura-red-2); - } - - &--secondary { - background-color: var(--aura-gray-8); - } - - &--purple { - background-color: var(--aura-secondary); - } - } - - li:first-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - } - - li:last-child { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - } - } - &__info { position: absolute; top: 0; @@ -183,7 +146,7 @@ border-radius: 50%; &.--w-0 { - width: 0px; + width: 0; } &.status--primary { @@ -204,20 +167,12 @@ } } -.border-right { - border-right: 2px solid var(--aura-neutrals-3); -} - .content--fixed-height { @media (min-width: 992px) { min-height: 48px; } } -.border-right { - border-right: 1px solid var(--aura-gray-9); -} - .g-ellipsis__type { @media (max-width: 991.99px) { width: 200px; diff --git a/src/app/pages/proposal/proposal.component.scss b/src/app/pages/proposal/proposal.component.scss index 07733545c..deaa42d4d 100644 --- a/src/app/pages/proposal/proposal.component.scss +++ b/src/app/pages/proposal/proposal.component.scss @@ -1,3 +1,11 @@ +.vote-bar { + width: 60%; + @media (max-width: 991.98px) { + width: 80%; + height: 20px; + } +} + .proposal-lasted { margin-bottom: 20px; color: var(--aura-white); @@ -27,19 +35,6 @@ .vote-bar { margin-right: 20px; - - ul { - background-color: var(--aura-gray-8); - border-radius: 4px; - li:first-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - } - li:last-child { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - } - } } .most-vote { @@ -114,14 +109,6 @@ } } -.vote-bar { - width: 60%; - @media (max-width: 991.98px) { - width: 80%; - height: 20px; - } -} - table { min-width: 800px; } 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 48829e19e..bb8b4068b 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 @@ -91,16 +91,6 @@ } } -.box-private { - .private-name-tag { - height: 24px; - padding: 0 var(--spacer-2); - background-color: var(--aura-gray-10); - border-radius: 16px; - border: 1px solid var(--aura-gray-8); - } -} - .btn-private { width: fit-content; } diff --git a/src/app/pages/statistics/top-statistics/top-statistic-transaction/top-statistic-transaction.component.scss b/src/app/pages/statistics/top-statistics/top-statistic-transaction/top-statistic-transaction.component.scss index 974471b9a..55d974280 100644 --- a/src/app/pages/statistics/top-statistics/top-statistic-transaction/top-statistic-transaction.component.scss +++ b/src/app/pages/statistics/top-statistics/top-statistic-transaction/top-statistic-transaction.component.scss @@ -5,19 +5,15 @@ width: 70px; } } - .aura-table th.mat-header-cell { min-width: 100px; } - .aura-table th.mat-header-cell:nth-child(1) { min-width: 80px; } - .aura-table th.mat-header-cell:nth-child(2) { min-width: 190px; } - .aura-table th.mat-header-cell:nth-child(3), .aura-table th.mat-header-cell:nth-child(4) { min-width: 140px; diff --git a/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.scss b/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.scss index a0e3aec76..8b5ec9690 100644 --- a/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.scss +++ b/src/app/pages/token/token-detail/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.scss @@ -35,15 +35,3 @@ } } } - -.box-nft { - ::ng-deep { - .box-name-tag { - &:not(.private-name-tag) { - &:after { - border-right: 15px solid var(--aura-black) !important; - } - } - } - } -} diff --git a/src/app/shared/components/name-tag/name-tag.component.scss b/src/app/shared/components/name-tag/name-tag.component.scss index bd5afe837..3a4f00050 100644 --- a/src/app/shared/components/name-tag/name-tag.component.scss +++ b/src/app/shared/components/name-tag/name-tag.component.scss @@ -1,41 +1,3 @@ .box-name-tag { - height: 26px; - display: inline-flex; - align-items: center; - font-size: 1.2rem; - font-weight: 400; - line-height: 1.6rem; - word-break: break-word; - background-color: var(--aura-gray-9); - border-radius: 4px 0px 0px 4px; - padding-left: var(--spacer-2); - padding-right: var(--spacer-5); color: var(--aura-gray-2); - &.private-name-tag { - padding: 0 var(--spacer-2); - background-color: var(--aura-gray-10); - border-radius: 16px; - border: 1px solid var(--aura-gray-8); - } - &:not(.private-name-tag) { - position: relative; - &:after { - content: ''; - position: absolute; - width: 0; - height: 0; - right: 0; - top: 0; - bottom: 0; - border-top: 13px solid transparent; - border-right: 15px solid #24262E; - border-bottom: 13px solid transparent; - } - } -} - -.icon-name-tag { - width: 16px; - height: 16px; - margin-right: 4px; } diff --git a/src/assets/scss/aura-theme/border.scss b/src/assets/scss/aura-theme/border.scss index 29527fa7b..1f5868c0e 100644 --- a/src/assets/scss/aura-theme/border.scss +++ b/src/assets/scss/aura-theme/border.scss @@ -16,3 +16,7 @@ .border-radius--sm { border-radius: 8px !important; } + +.border-right { + border-right: 1px solid var(--aura-gray-9); +} diff --git a/src/assets/scss/aura-theme/calendar.scss b/src/assets/scss/aura-theme/calendar.scss index b32c86487..f1a4b1b47 100644 --- a/src/assets/scss/aura-theme/calendar.scss +++ b/src/assets/scss/aura-theme/calendar.scss @@ -7,6 +7,17 @@ mat-datepicker-toggle .mat-icon-button { } .mat-datepicker-content { margin-top: 8px !important; + background-color: var(--aura-gray-10); + border: 1px solid #9DA1AC; + border-radius: 8px !important; +} +.mat-calendar-body-cell-content { + border-radius: 8px !important; +} +.mat-calendar-body-selected { + border: 1px solid #FFFFFF; + background-color: transparent; + color: var(--aura-white); } .mat-date-range-input-separator { margin: 0 !important; @@ -70,3 +81,6 @@ mat-date-range-input { align-items: center; padding-left: 16px; } +.cdk-overlay-container--grant { + z-index: 2500 !important; +} diff --git a/src/assets/scss/aura-theme/name-tag.scss b/src/assets/scss/aura-theme/name-tag.scss new file mode 100644 index 000000000..f95888ec5 --- /dev/null +++ b/src/assets/scss/aura-theme/name-tag.scss @@ -0,0 +1,49 @@ +.box-private { + max-width: 100%; +} +.private-name-tag { + height: 24px; + padding: 0 var(--spacer-2); + background-color: var(--aura-gray-10); + border-radius: 16px; + border: 1px solid var(--aura-gray-8); + font-size: 1.2rem; + font-weight: 400; +} + +.box-name-tag { + height: 26px; + max-width: 100%; + display: inline-flex; + align-items: center; + font-size: 1.2rem; + font-weight: 400; + line-height: 1.6rem; + word-break: break-word; + background-color: var(--aura-gray-9); + border-radius: 4px 0 0 4px; + padding-left: var(--spacer-2); + padding-right: var(--spacer-5); + color: var(--aura-gray-light); + &:not(.private-name-tag) { + position: relative; + &:after { + content: ''; + position: absolute; + width: 0; + height: 0; + right: 0; + top: 0; + bottom: 0; + border-top: 13px solid transparent; + border-right: 15px solid var(--aura-black); + border-bottom: 13px solid transparent; + } + } +} + +.icon-name-tag { + width: 16px; + height: 16px; + margin-right: 4px; +} diff --git a/src/assets/scss/aura-theme/typo.scss b/src/assets/scss/aura-theme/typo.scss index 6cfab8eb8..cde7de1eb 100644 --- a/src/assets/scss/aura-theme/typo.scss +++ b/src/assets/scss/aura-theme/typo.scss @@ -159,3 +159,9 @@ $textColors: ( .button-link { color: var(--aura-blue-3link); } +.line-claim { + display: inline-block; + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis; +} diff --git a/src/assets/scss/aura-theme/voting.scss b/src/assets/scss/aura-theme/voting.scss new file mode 100644 index 000000000..b4765dfb6 --- /dev/null +++ b/src/assets/scss/aura-theme/voting.scss @@ -0,0 +1,76 @@ +.vote-bar { + ul { + background-color: var(--aura-gray-8); + border-radius: 4px; + overflow: hidden; + li:first-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + } + li:last-child { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + } + li.bg { + &--primary { + background-color: var(--aura-green-3); + } + + &--danger { + background-color: var(--aura-danger); + } + + &--info { + background-color: var(--aura-red-2); + } + + &--secondary { + background-color: var(--aura-gray-8); + } + + &--purple { + background-color: var(--aura-secondary); + } + } + } + &--mob { + @media (max-width: 991.98px) { + .vote-bar-ul { + width: 100%; + height: 20px; + } + + &__info { + position: absolute; + top: 5px; + bottom: 0; + transform: translate(-50%, -130%); + + &:before { + content: ''; + position: absolute; + left: 50%; + top: 110%; + transform: translateX(-50%); + height: 91%; + width: 4px; + background-color: var(--aura-white); + border-radius: 2px; + } + + &:after { + content: ''; + position: absolute; + left: 50%; + bottom: 0; + transform: translateX(-50%); + width: 0; + height: 0; + border-left: 10px solid transparent; + border-right: 10px solid transparent; + border-top: 10px solid #777E91; + } + } + } + } +} diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss index 6c03a6b0c..3909f16c0 100644 --- a/src/assets/scss/custom.scss +++ b/src/assets/scss/custom.scss @@ -679,12 +679,6 @@ body { padding-left: var(--spacer-2); padding-right: var(--spacer-5); color: var(--aura-gray-light); - &.private-name-tag { - padding: 0 var(--spacer-2); - background-color: var(--aura-gray-10); - border-radius: 16px; - border: 1px solid var(--aura-gray-8); - } &:not(.private-name-tag) { position: relative; &:after { diff --git a/src/styles.scss b/src/styles.scss index b088d3fb8..f7502e59f 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -54,6 +54,8 @@ $minia-theme: mat.define-dark-theme((color: (primary: $minia-primary, @import "assets/scss/aura-theme/border"; @import "assets/scss/aura-theme/chart"; @import "assets/scss/aura-theme/calendar"; +@import "assets/scss/aura-theme/voting"; +@import "assets/scss/aura-theme/name-tag"; /* You can add global styles to this file, and also import other style files */ From 4706fc839bddd2de7f5d9a49b75ca3470e19eb6d Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Mon, 2 Oct 2023 15:46:57 +0700 Subject: [PATCH 149/184] add spacing bottom for Non-Fungible Token (NFT) Transfer data --- .../token-transfer/token-transfer.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index b66a06202..e93fc11e4 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -158,7 +158,7 @@
      -
      +
      Token ID {{ data?.cw721_token?.token_id }}
      From 68ae5abf622ef9a5f654c944c3fe8d4c3087fd15 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Mon, 2 Oct 2023 16:04:59 +0700 Subject: [PATCH 150/184] add spacing bottom for Non-Fungible Token (NFT) Transfer data --- .../token-transfer/token-transfer.component.html | 2 +- .../token-transfer/token-transfer.component.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html index e93fc11e4..b2a1add9c 100644 --- a/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html +++ b/src/app/pages/transaction/transaction-detail/token-transfer/token-transfer.component.html @@ -162,7 +162,7 @@
      Token ID {{ data?.cw721_token?.token_id }}
      -
      +
      {{ data?.cw721_token?.token_id }}
      Date: Tue, 3 Oct 2023 09:57:13 +0700 Subject: [PATCH 151/184] . --- src/app/core/services/transaction.service.ts | 61 +++++++++++++++++++ .../depositors/depositors.component.ts | 3 +- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/app/core/services/transaction.service.ts b/src/app/core/services/transaction.service.ts index 625fef651..db1bd208b 100644 --- a/src/app/core/services/transaction.service.ts +++ b/src/app/core/services/transaction.service.ts @@ -146,6 +146,67 @@ export class TransactionService extends CommonService { .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null))); } + getProposalDeposit(payload) { + const operationsDoc = ` + query queryProposalDeposit( + $limit: Int = 100 + $order: order_by = desc + $value: String = null + $heightGT: Int = null + $heightLT: Int = null + $indexGT: Int = null + $indexLT: Int = null + $hash: String = null + $height: Int = null + ) { + ${this.envDB} { + transaction( + limit: $limit + where: { + hash: { _eq: $hash } + height: { _eq: $height } + event_attributes: { + value: { _eq: $value} + composite_key: { _eq: "proposal_deposit.proposal_id"} + key: { _eq: "proposal_id"} + } + _and: [ + { height: { _gt: $heightGT } } + { index: { _gt: $indexGT } } + { height: { _lt: $heightLT } } + { index: { _lt: $indexLT } } + ] + } + order_by: [{ height: $order}, {index: $order }] + ) { + id + height + hash + event_attributes{ + value + composite_key + } + } + } + } + `; + return this.http + .post(this.graphUrl, { + query: operationsDoc, + variables: { + limit: 100, + order: "desc", + value: payload.value, + heightGT: null, + indexGT: null, + indexLT: null, + height: null + }, + operationName: 'queryProposalDeposit', + }) + .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null))); + } + txsDetailLcd(txhash: string) { return axios.get(`${this.chainInfo.rest}/${LCD_COSMOS.TX}/txs/${txhash}`); } diff --git a/src/app/pages/proposal/proposal-detail/depositors/depositors.component.ts b/src/app/pages/proposal/proposal-detail/depositors/depositors.component.ts index 1625b2072..9d56fba0c 100644 --- a/src/app/pages/proposal/proposal-detail/depositors/depositors.component.ts +++ b/src/app/pages/proposal/proposal-detail/depositors/depositors.component.ts @@ -55,8 +55,9 @@ export class DepositorsComponent implements OnInit, OnDestroy { compositeKey: 'proposal_deposit.proposal_id' }; - this.transactionService.getListTxCondition(payload).subscribe({ + this.transactionService.getProposalDeposit(payload).subscribe({ next: (res) => { + console.log(res) let dataList: any[] = []; if (res?.transaction?.length > 0) { dataList = res?.transaction?.filter( From dc24ea95efeed21b6482abb655729238f75166b4 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 3 Oct 2023 11:46:01 +0700 Subject: [PATCH 152/184] update query deposit --- src/app/core/services/transaction.service.ts | 1 + .../depositors/depositors.component.ts | 31 +++++++------------ .../proposal-table.component.html | 6 ++-- .../proposal-table.component.ts | 2 +- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/app/core/services/transaction.service.ts b/src/app/core/services/transaction.service.ts index db1bd208b..1949f2bcd 100644 --- a/src/app/core/services/transaction.service.ts +++ b/src/app/core/services/transaction.service.ts @@ -182,6 +182,7 @@ export class TransactionService extends CommonService { id height hash + timestamp event_attributes{ value composite_key diff --git a/src/app/pages/proposal/proposal-detail/depositors/depositors.component.ts b/src/app/pages/proposal/proposal-detail/depositors/depositors.component.ts index 9d56fba0c..d76d30c7c 100644 --- a/src/app/pages/proposal/proposal-detail/depositors/depositors.component.ts +++ b/src/app/pages/proposal/proposal-detail/depositors/depositors.component.ts @@ -52,33 +52,24 @@ export class DepositorsComponent implements OnInit, OnDestroy { key: 'proposal_id', value: this.proposalId?.toString(), limit: 100, // get all - compositeKey: 'proposal_deposit.proposal_id' + compositeKey: 'proposal_deposit.proposal_id', }; this.transactionService.getProposalDeposit(payload).subscribe({ next: (res) => { - console.log(res) let dataList: any[] = []; if (res?.transaction?.length > 0) { - dataList = res?.transaction?.filter( - (transaction) => - transaction?.data?.tx?.body?.messages[0]['@type'] === TRANSACTION_TYPE_ENUM.Deposit || - (transaction?.data?.tx?.body?.messages[0]['@type'] === TRANSACTION_TYPE_ENUM.SubmitProposalTx && - transaction?.data?.tx?.body?.messages[0]?.initial_deposit?.length > 0), - ); - - dataList.forEach((item) => { - if (item.data?.tx?.body?.messages[0]['@type'] === TRANSACTION_TYPE_ENUM.SubmitProposalTx) { - item.depositors = item.data?.tx?.body?.messages[0]?.proposer; - item.amount = balanceOf(item.data?.tx?.body?.messages[0].initial_deposit[0].amount); - } else { - item.depositors = item.data?.tx?.body?.messages[0]?.depositor; - item.amount = balanceOf(item.data?.tx?.body?.messages[0].amount[0].amount); - } - item.txhash = item?.hash; - item.timestamp = item?.timestamp; + dataList = res?.transaction; + dataList.forEach((tx) => { + tx['event_attributes'].forEach((item) => { + if (item.composite_key === 'proposal_deposit.amount') { + tx.amount = balanceOf(item?.value.replace(this.coinMinimalDenom, '')); + } + if (item.composite_key === 'transfer.sender') { + tx.depositors = item?.value; + } + }); }); - this.depositorsList = dataList; this.dataLength = dataList?.length || 0; 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 80ffb8a85..893ff2278 100644 --- a/src/app/pages/proposal/proposal-table/proposal-table.component.html +++ b/src/app/pages/proposal/proposal-table/proposal-table.component.html @@ -221,11 +221,11 @@ { label: 'TxHash', class: 'body-01', - info: data.txhash + info: data.hash ? '' + - shortenAddress(data.txhash) + + shortenAddress(data.hash) + '' : '-' }, diff --git a/src/app/pages/proposal/proposal-table/proposal-table.component.ts b/src/app/pages/proposal/proposal-table/proposal-table.component.ts index b1ec0bcd1..6d86ea11f 100644 --- a/src/app/pages/proposal/proposal-table/proposal-table.component.ts +++ b/src/app/pages/proposal/proposal-table/proposal-table.component.ts @@ -72,7 +72,7 @@ export class ProposalTableComponent implements OnInit, OnChanges { desktopOnly: true, isNameTag: true, }, - { matColumnDef: 'txhash', headerCellDef: 'TxHash', isUrl: '/transaction', isShort: true }, + { matColumnDef: 'hash', headerCellDef: 'TxHash', isUrl: '/transaction', isShort: true }, { matColumnDef: 'amount', headerCellDef: 'Amount' }, { matColumnDef: 'timestamp', headerCellDef: 'Time' }, ]; From bf3d2312edd8843d7e0e137ac37de2aac4a7d1b8 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 3 Oct 2023 13:36:44 +0700 Subject: [PATCH 153/184] upgrade cosmjs version --- package.json | 4 ++-- src/app/core/utils/signing/transaction-manager.ts | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0ab371e1a..a0f080e91 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ "@angular/platform-browser-dynamic": "~12.0.2", "@angular/router": "~12.0.2", "@coin98-com/connect-sdk": "^1.0.9", - "@cosmjs/cosmwasm-stargate": "^0.28.13", + "@cosmjs/cosmwasm-stargate": "^0.31.1", "@cosmjs/encoding": "^0.28.13", "@cosmjs/proto-signing": "^0.29.5", - "@cosmjs/stargate": "^0.28.13", + "@cosmjs/stargate": "^0.31.1", "@google/model-viewer": "^1.12.0", "@ng-bootstrap/ng-bootstrap": "^10.0.0", "@ngx-translate/core": "^13.0.0", diff --git a/src/app/core/utils/signing/transaction-manager.ts b/src/app/core/utils/signing/transaction-manager.ts index 7614c4f1e..78951c726 100644 --- a/src/app/core/utils/signing/transaction-manager.ts +++ b/src/app/core/utils/signing/transaction-manager.ts @@ -58,10 +58,7 @@ export async function createSignBroadcast( export async function getNetworkFee(network, address, messageType, memo = ''): Promise { //set default for multi gas - let multiGas = 1.3; - if (messageType?.typeUrl === TRANSACTION_TYPE_ENUM.MsgRevokeAllowance) { - multiGas = 1.4; - } + let multiGas = 1.6; let gasEstimation = 0; try { From 0a34c002cedf4ec5d1e50892e83a7f0e98e71bb7 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 3 Oct 2023 14:19:27 +0700 Subject: [PATCH 154/184] update css --- .../account-transaction-table.component.html | 2 +- .../account-transaction-table.component.scss | 12 +- .../depositors/depositors.component.ts | 1 - .../summary-info/summary-info.component.scss | 298 +++++++++--------- .../token-transfers-tab.component.html | 2 +- 5 files changed, 162 insertions(+), 153 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 3e39fa36f..0c44c2f4c 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -113,7 +113,7 @@
      From ff07507a951767d4f42ec89d7f81fa3e665c238a Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 3 Oct 2023 14:35:39 +0700 Subject: [PATCH 155/184] update css --- .../account-transaction-table.component.html | 2 +- .../account-transaction-table.component.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index 0c44c2f4c..e17ff22dd 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -445,7 +445,7 @@ !(item.fromAddress?.startsWith('Null') || currentAddress?.startsWith('Null')) && item.fromAddress !== currentAddress "> -
      +
      diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts index 331d7d9f4..89f7e952e 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts @@ -48,9 +48,9 @@ export class AccountTransactionTableComponent { templatesToken: Array = [ { matColumnDef: 'tx_hash', headerCellDef: 'Tx Hash', headerWidth: 14 }, { matColumnDef: 'type', headerCellDef: 'Message', headerWidth: 17 }, - { matColumnDef: 'timestamp', headerCellDef: 'Time', headerWidth: 15 }, - { matColumnDef: 'fromAddress', headerCellDef: 'From', headerWidth: 17 }, - { matColumnDef: 'toAddress', headerCellDef: 'To', headerWidth: 18 }, + { matColumnDef: 'timestamp', headerCellDef: 'Time', headerWidth: 17 }, + { matColumnDef: 'fromAddress', headerCellDef: 'From', headerWidth: 24 }, + { matColumnDef: 'toAddress', headerCellDef: 'To', headerWidth: 20 }, ]; displayedColumns: string[]; From 941f3ec56c17afa43f54288657fab78927d43a91 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 3 Oct 2023 15:28:19 +0700 Subject: [PATCH 156/184] update build config --- angular.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angular.json b/angular.json index d7fe8b569..710a2a930 100644 --- a/angular.json +++ b/angular.json @@ -67,8 +67,8 @@ "production": { "budgets": [{ "type": "initial", - "maximumWarning": "10mb", - "maximumError": "10mb" + "maximumWarning": "15mb", + "maximumError": "15mb" }, { "type": "anyComponentStyle", From ae5f1e51ff53e39b32969ac239fbaa1228fd4701 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Tue, 3 Oct 2023 17:08:57 +0700 Subject: [PATCH 157/184] update contract list, contract detail optimize css --- src/app/core/services/contract.service.ts | 5 +- .../account-detail.component.scss | 6 -- .../account-transaction-table.component.scss | 6 -- .../block-detail/block-detail.component.html | 2 +- .../contract-info-card.component.html | 6 +- .../contracts-list.component.html | 55 +++++++------------ .../contracts-list.component.scss | 7 ++- .../contracts-list.component.ts | 23 +++++++- .../summary-info/summary-info.component.scss | 5 -- ...oulbound-account-token-list.component.scss | 6 -- src/assets/scss/aura-theme/name-tag.scss | 20 +++---- 11 files changed, 63 insertions(+), 78 deletions(-) diff --git a/src/app/core/services/contract.service.ts b/src/app/core/services/contract.service.ts index 2ec8c5d06..b13131484 100644 --- a/src/app/core/services/contract.service.ts +++ b/src/app/core/services/contract.service.ts @@ -86,6 +86,7 @@ export class ContractService extends CommonService { name label code_id + version code { type code_id_verifications(order_by: {updated_at: desc}) { @@ -134,7 +135,9 @@ export class ContractService extends CommonService { address creator instantiate_hash - name + name + version + label cw721_contract { name symbol diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss index 14d4ffa34..b649c1c03 100644 --- a/src/app/pages/account/account-detail/account-detail.component.scss +++ b/src/app/pages/account/account-detail/account-detail.component.scss @@ -120,12 +120,6 @@ section.account-detail { } } -.name-tag:not(.private-name-tag) { - &:after { - border-right: 15px solid var(--aura-gray-10); - } -} - .name-tag { max-width: 100%; } diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss index 1d498257e..8f040f265 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss @@ -93,12 +93,6 @@ } } -::ng-deep .box-name-tag:not(.private-name-tag) { - &:after { - border-right: 15px solid var(--aura-gray-10); - } -} - .account-transaction-table { .aura-status .status { background-color: unset; 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 72e53f565..7c5c0a3dc 100644 --- a/src/app/pages/blocks/block-detail/block-detail.component.html +++ b/src/app/pages/blocks/block-detail/block-detail.component.html @@ -166,7 +166,7 @@

      Transactions

      - {{ data[template.matColumnDef] | cutStringPipe : 20 }} + {{ data[template.matColumnDef] }}
      +{{ data.lstType?.length - 1 }}
      diff --git a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html index 8091366db..1589e95d4 100644 --- a/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html +++ b/src/app/pages/contracts/contracts-detail/contract-info-card/contract-info-card.component.html @@ -15,7 +15,7 @@
      Information
      Contract Name
      -
      {{ contractDetail.name }}
      +
      {{ contractDetail.name }} ({{contractDetail.version}})
      Public Name
      @@ -75,8 +75,8 @@
      More Info
      {{ contractDetail.code?.type ?? '-' }}
      -
      Contract Version
      -
      {{ contractDetail.code?.code_id_verifications[0]?.compiler_version ?? '-' }}
      +
      Label
      +
      {{ contractDetail.label ?? '-' }}
      Contract Creator
      diff --git a/src/app/pages/contracts/contracts-list/contracts-list.component.html b/src/app/pages/contracts/contracts-list/contracts-list.component.html index e21f5c790..d3140920d 100644 --- a/src/app/pages/contracts/contracts-list/contracts-list.component.html +++ b/src/app/pages/contracts/contracts-list/contracts-list.component.html @@ -148,44 +148,29 @@

      Contracts

      -
      - {{ (data[template.matColumnDef] | cutStringPipe : 16) || '-' }} +
      + + {{ (data[template.matColumnDef] | cutStringPipe : 16) || '-' }} + + +
      - - {{ data['cw20_contract']?.name | stringEllipsis : 16 }} - - - {{ data['cw721_contract']?.name | stringEllipsis : 16 }} - - - {{ data['cw721_contract']?.name | stringEllipsis : 16 }} - - - - - +
      + + {{ data['token_tracker'] | stringEllipsis : 16 }} + + + - + + +
      Contracts

    		 -
    +
    		@@ -158,7 +158,7 @@

    Contracts

    - + {{ data['token_tracker'] | stringEllipsis : 16 }} Date: Wed, 4 Oct 2023 11:39:38 +0700 Subject: [PATCH 161/184] [TamTM6] fix display private name tag community pool --- .../proposal-list/community-pool-proposal.component.html | 7 +++++-- .../card-mob-explain/card-mob-explain.component.html | 8 +++++++- .../cards/card-mob-explain/card-mob-explain.component.ts | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/app/pages/community-pool/proposal-list/community-pool-proposal.component.html b/src/app/pages/community-pool/proposal-list/community-pool-proposal.component.html index 570609fb5..bf0bad0ef 100644 --- a/src/app/pages/community-pool/proposal-list/community-pool-proposal.component.html +++ b/src/app/pages/community-pool/proposal-list/community-pool-proposal.component.html @@ -96,6 +96,7 @@

    Community Pool Spent Proposals

    Community Pool Spent Proposals [status]="getStatus(data.status)" [content]="[ { + address: distributionAcc, label: 'Sender', - class: !commonService.checkDisplayTooltip(distributionAcc) ? 'name-tag-label' : '', + class: !commonService.checkDisplayTooltip(distributionAcc) ? 'name-tag' : '', info: !commonService.checkDisplayTooltip(distributionAcc) ? 'Community Pool Spent Proposals '' }, { + address: data.content.recipient, label: 'Recipient', - class: !commonService.checkDisplayTooltip(data.content.recipient) ? 'name-tag-label' : '', + class: !commonService.checkDisplayTooltip(data.content.recipient) ? 'name-tag' : '', info: !commonService.checkDisplayTooltip(data.content.recipient) ? '
    {{ data.label }}
    -
    +
    {{ denom }} diff --git a/src/app/shared/components/cards/card-mob-explain/card-mob-explain.component.ts b/src/app/shared/components/cards/card-mob-explain/card-mob-explain.component.ts index 555a209f0..d2e1d185b 100644 --- a/src/app/shared/components/cards/card-mob-explain/card-mob-explain.component.ts +++ b/src/app/shared/components/cards/card-mob-explain/card-mob-explain.component.ts @@ -1,5 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { EnvironmentService } from 'src/app/core/data-services/environment.service'; +import { CommonService } from 'src/app/core/services/common.service'; export interface CardMobExplainTitle { label: string; @@ -11,6 +12,7 @@ export interface CardMobContent { class?: string; info: any; isAmount?: boolean; + address?: string; } @Component({ selector: 'app-card-mob-explain', @@ -23,7 +25,8 @@ export class CardMobExplainComponent implements OnInit { @Input() status: any; @Input() content: CardMobContent[]; @Input() tokenAmount: any; - constructor(private environmentService: EnvironmentService) {} + @Input() data: any; + constructor(private environmentService: EnvironmentService, public commonService: CommonService) {} ngOnInit(): void {} } From 59902d1a366168bd671e495bc10215efeb980af3 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 4 Oct 2023 11:43:52 +0700 Subject: [PATCH 162/184] fix bug UI name-tag --- .../cards/card-mob-explain/card-mob-explain.component.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/shared/components/cards/card-mob-explain/card-mob-explain.component.scss b/src/app/shared/components/cards/card-mob-explain/card-mob-explain.component.scss index 2abe8bc6e..e11a321ec 100644 --- a/src/app/shared/components/cards/card-mob-explain/card-mob-explain.component.scss +++ b/src/app/shared/components/cards/card-mob-explain/card-mob-explain.component.scss @@ -27,6 +27,11 @@ } } } + .name-tag:not(.private-name-tag) { + &:after { + border-right: 15px solid var(--aura-gray-9); + } + } } .button-explain:has(.rotate) { transform: rotate(180deg); From 5cd798a0a8e8492f875b69bd3d043e28dfd8cb49 Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 4 Oct 2023 14:28:43 +0700 Subject: [PATCH 163/184] [TamTM6] load name tag --- src/app/app.component.ts | 4 ++-- .../contracts-transactions.component.ts | 4 +++- .../shared/components/name-tag/name-tag.component.ts | 12 +++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d78eb8b04..5bbf95d9e 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -68,7 +68,7 @@ export class AppComponent implements OnInit { }); } - getListNameTag(): void { + async getListNameTag() { const payload = { limit: 500, nextKey: 0, @@ -83,7 +83,7 @@ export class AppComponent implements OnInit { // get list name tag if not login email const userEmail = localStorage.getItem('userEmail'); if (!userEmail) { - this.commonService.getListNameTag(payload).subscribe((res) => { + await this.commonService.getListNameTag(payload).subscribe((res) => { this.globals.listNameTag = this.commonService.listNameTag = res.data?.nameTags; }); return; diff --git a/src/app/pages/contracts/contracts-transactions/contracts-transactions.component.ts b/src/app/pages/contracts/contracts-transactions/contracts-transactions.component.ts index a28418e54..646ac6970 100644 --- a/src/app/pages/contracts/contracts-transactions/contracts-transactions.component.ts +++ b/src/app/pages/contracts/contracts-transactions/contracts-transactions.component.ts @@ -9,7 +9,7 @@ import { TableTemplate } from 'src/app/core/models/common.model'; import { ITableContract } from 'src/app/core/models/contract.model'; import { CommonService } from 'src/app/core/services/common.service'; import { TransactionService } from 'src/app/core/services/transaction.service'; -import { convertDataTransaction } from 'src/app/global/global'; +import { Globals, convertDataTransaction } from 'src/app/global/global'; import { TableData } from 'src/app/shared/components/contract-table/contract-table.component'; @Component({ @@ -63,6 +63,7 @@ export class ContractsTransactionsComponent implements OnInit { private route: ActivatedRoute, private transactionService: TransactionService, public commonService: CommonService, + private global: Globals ) { const valueColumn = this.templates.find((item) => item.matColumnDef === 'value'); @@ -76,6 +77,7 @@ export class ContractsTransactionsComponent implements OnInit { } ngOnInit(): void { + this.commonService['listNameTag'] = this.commonService['listNameTag'] || this.global?.listNameTag; this.contractAddress = this.route.snapshot.paramMap.get('addressId'); this.contractInfo.contractsAddress = this.contractAddress; this.payload['value'] = this.contractAddress; diff --git a/src/app/shared/components/name-tag/name-tag.component.ts b/src/app/shared/components/name-tag/name-tag.component.ts index 71c08bf04..8211a410d 100644 --- a/src/app/shared/components/name-tag/name-tag.component.ts +++ b/src/app/shared/components/name-tag/name-tag.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnInit} from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnInit } from '@angular/core'; import { LENGTH_CHARACTER } from 'src/app/core/constants/common.constant'; import { CommonService } from 'src/app/core/services/common.service'; import { Globals } from 'src/app/global/global'; @@ -30,15 +30,17 @@ export class NameTagComponent implements OnInit { extendUrlLink = ''; - constructor( - public commonService: CommonService, - public global: Globals) {} + constructor(public commonService: CommonService, public global: Globals) {} ngOnInit(): void { - this.commonService['listNameTag'] = this.global?.listNameTag; if (this.extendUrl) { this.extendUrlLink = this.commonService.findUrlNameTag(this.value || this.paramUrl); } + + setTimeout(() => { + this.commonService['listNameTag'] = this.commonService['listNameTag'] || this.global?.listNameTag; + console.log(this.global); + }, 1000); } isContractAddress(address) { From a6a0f9af2f77ca8d8baff674f7e7a47220d357b7 Mon Sep 17 00:00:00 2001 From: mtam Date: Wed, 4 Oct 2023 14:30:41 +0700 Subject: [PATCH 164/184] [TamTM6] remove log --- src/app/shared/components/name-tag/name-tag.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/shared/components/name-tag/name-tag.component.ts b/src/app/shared/components/name-tag/name-tag.component.ts index 8211a410d..f797d4d36 100644 --- a/src/app/shared/components/name-tag/name-tag.component.ts +++ b/src/app/shared/components/name-tag/name-tag.component.ts @@ -39,7 +39,6 @@ export class NameTagComponent implements OnInit { setTimeout(() => { this.commonService['listNameTag'] = this.commonService['listNameTag'] || this.global?.listNameTag; - console.log(this.global); }, 1000); } From 30d3569664f666a1df885a41ee09ac91ce389c96 Mon Sep 17 00:00:00 2001 From: letrieuthien Date: Wed, 4 Oct 2023 14:39:07 +0700 Subject: [PATCH 165/184] fix bug card --- .../account-transaction-table.component.scss | 3 +++ .../token-detail/token-overview/token-overview.component.scss | 4 +++- src/assets/scss/aura-theme/cards.scss | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss index 025888481..5c3904977 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.scss @@ -272,6 +272,9 @@ display: none; } } + &:not(.filter-result) { + min-width: 200px !important; + } } .table-transfer tr td { diff --git a/src/app/pages/token/token-detail/token-overview/token-overview.component.scss b/src/app/pages/token/token-detail/token-overview/token-overview.component.scss index 16dc7cff1..f49221b1c 100644 --- a/src/app/pages/token/token-detail/token-overview/token-overview.component.scss +++ b/src/app/pages/token/token-detail/token-overview/token-overview.component.scss @@ -3,7 +3,9 @@ width: 50%; flex-shrink: 0; position: relative; - padding-right: 20px; + @media (min-width: 376px) { + padding-right: 20px; + } &:after { content: ''; position: absolute; diff --git a/src/assets/scss/aura-theme/cards.scss b/src/assets/scss/aura-theme/cards.scss index d8b33861c..60e8dd74d 100644 --- a/src/assets/scss/aura-theme/cards.scss +++ b/src/assets/scss/aura-theme/cards.scss @@ -97,7 +97,7 @@ } .nft__body { padding: var(--spacer-3); - // margin-top: var(--spacer-2); + min-height: 74px; } .nft__info { // overflow: hidden; From 53f04aedc86e5e41eb84690bb951bb12b4e4c402 Mon Sep 17 00:00:00 2001 From: nhphuc2411 Date: Wed, 4 Oct 2023 15:17:37 +0700 Subject: [PATCH 166/184] fix bug filter --- .../account-transaction-table.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html index e17ff22dd..9a71c1a75 100644 --- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html +++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html @@ -111,7 +111,7 @@ {{ transactionFilter.endDate | date : 'MM/dd/yyyy' }}
    -
    +
    diff --git a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts index 7ce309ad4..8775ab5f1 100644 --- a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts +++ b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts @@ -4,7 +4,6 @@ import { TranslateService } from '@ngx-translate/core'; import { Schema, Validator } from 'jsonschema'; import * as _ from 'lodash'; import { MESSAGES_CODE_CONTRACT } from 'src/app/core/constants/messages.constant'; -import { EnvironmentService } from 'src/app/core/data-services/environment.service'; import { getRef, getType, parseValue } from 'src/app/core/helpers/contract-schema'; import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service'; import { WalletService } from 'src/app/core/services/wallet.service'; @@ -19,15 +18,9 @@ export class WriteContractComponent implements OnInit { @Input() contractDetailData: any; isExpand = false; - isConnectedWallet = false; - walletAddress = ''; userAddress = ''; walletAccount: any; - chainInfo = this.environmentService.configValue.chain_info; - denom = this.environmentService.configValue.chain_info.currencies[0].coinDenom; - coinMinimalDenom = this.environmentService.configValue.chain_info.currencies[0].coinMinimalDenom; - jsValidator = new Validator(); root: any[]; @@ -35,14 +28,13 @@ export class WriteContractComponent implements OnInit { public walletService: WalletService, private toastr: NgxToastrService, public translate: TranslateService, - private environmentService: EnvironmentService, private dialog: MatDialog, ) {} ngOnInit(): void { this.walletService.wallet$.subscribe((wallet) => { if (wallet) { - this.userAddress = wallet.bech32Address; + this.userAddress = wallet?.bech32Address; } else { this.userAddress = null; } @@ -57,15 +49,6 @@ export class WriteContractComponent implements OnInit { this.root = this.makeSchemaInput(this.jsValidator.schemas['/'].oneOf); } } catch {} - - this.walletService.wallet$.subscribe((wallet) => { - if (wallet) { - this.isConnectedWallet = true; - this.walletAddress = this.walletService.wallet?.bech32Address; - } else { - this.isConnectedWallet = false; - } - }); } expandMenu(closeAll = false): void { @@ -241,12 +224,12 @@ export class WriteContractComponent implements OnInit { dialogRef.afterClosed().subscribe((result) => { if (result) { result = result === 'custom' ? 0 : result; - let amount = msg['fieldList'].find((k) => k.fieldName === 'amount')?.value || ''; + let amount = msg['fieldList']?.find((k) => k.fieldName === 'amount')?.value || ''; //check amount is exit const numPow = amount.toString() - ? Math.pow(10, result).toString().substring(1) - : Math.pow(10, result).toString(); - amount = amount.toString() + numPow; + ? Math.pow(10, result)?.toString().substring(1) + : Math.pow(10, result)?.toString(); + amount = amount?.toString() + numPow; msg['fieldList'].find((k) => k.fieldName === 'amount').value = amount.toString(); } }); 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 23d17fe96..8c28f43cb 100644 --- a/src/app/pages/validators/validators-detail/validators-detail.component.ts +++ b/src/app/pages/validators/validators-detail/validators-detail.component.ts @@ -79,7 +79,6 @@ export class ValidatorsDetailComponent implements OnInit { isOpenDialog = false; breakpoint$ = this.layout.observe([Breakpoints.Small, Breakpoints.XSmall]); - chainInfo = this.environmentService.configValue.chain_info; denom = this.environmentService.configValue.chain_info.currencies[0].coinDenom; timeInterval = this.environmentService.configValue.timeInterval; diff --git a/src/app/shared/components/name-tag/name-tag.component.ts b/src/app/shared/components/name-tag/name-tag.component.ts index f797d4d36..880fb8ddc 100644 --- a/src/app/shared/components/name-tag/name-tag.component.ts +++ b/src/app/shared/components/name-tag/name-tag.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { LENGTH_CHARACTER } from 'src/app/core/constants/common.constant'; import { CommonService } from 'src/app/core/services/common.service'; import { Globals } from 'src/app/global/global'; From 1d5619c024021d36df42f630635dfaaecee28cb8 Mon Sep 17 00:00:00 2001 From: mtam Date: Thu, 5 Oct 2023 14:11:37 +0700 Subject: [PATCH 179/184] [TamTM6] update layout contract list --- .../contracts-list/contracts-list.component.html | 8 ++++---- .../contracts-list/contracts-list.component.scss | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/app/pages/contracts/contracts-list/contracts-list.component.html b/src/app/pages/contracts/contracts-list/contracts-list.component.html index f262c37e9..5593fe7f6 100644 --- a/src/app/pages/contracts/contracts-list/contracts-list.component.html +++ b/src/app/pages/contracts/contracts-list/contracts-list.component.html @@ -97,7 +97,7 @@

    Contracts

    		 -
    +
    		@@ -149,8 +149,8 @@

    Contracts
    - - {{ (data[template.matColumnDef] | cutStringPipe : 16) || '-' }} + + {{ (data[template.matColumnDef] | cutStringPipe : 28) || '-' }}
    @@ -159,7 +159,7 @@

    Contracts

    - {{ data['token_tracker'] | stringEllipsis : 16 }} + {{ data['token_tracker'] | stringEllipsis : 18 }}
  • - +