machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for bisq pagination and tx type select history

Browse Source
This commit is contained in:
softsimon 2020-08-11 00:01:22 +07:00
parent b00a9ee938
commit 95bab64424
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts
View File

@ -40,6 +40,7 @@ export class BisqTransactionsComponent implements OnInit {
{ id: 11, name: 'Unlock' }, { id: 11, name: 'Unlock' },
{ id: 12, name: 'Vote reveal' }, { id: 12, name: 'Vote reveal' },
]; ];
txTypesDefaultChecked = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
txTypeDropdownSettings: IMultiSelectSettings = { txTypeDropdownSettings: IMultiSelectSettings = {
buttonClasses: 'btn btn-primary btn-sm', buttonClasses: 'btn btn-primary btn-sm',
@ -74,7 +75,7 @@ export class BisqTransactionsComponent implements OnInit {
this.seoService.setTitle('Transactions', true); this.seoService.setTitle('Transactions', true);
this.radioGroupForm = this.formBuilder.group({ this.radioGroupForm = this.formBuilder.group({
txTypes: [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]], txTypes: [this.txTypesDefaultChecked],
}); });
this.loadingItems = Array(this.itemsPerPage); this.loadingItems = Array(this.itemsPerPage);
@ -84,8 +85,6 @@ export class BisqTransactionsComponent implements OnInit {
this.paginationMaxSize = 3; this.paginationMaxSize = 3;
} }
this.route.queryParams.subscribe(() => console.log('changed'));
this.transactions$ = merge( this.transactions$ = merge(
this.route.queryParams this.route.queryParams
.pipe( .pipe(
@ -101,13 +100,18 @@ export class BisqTransactionsComponent implements OnInit {
if (queryParams.page) { if (queryParams.page) {
const newPage = parseInt(queryParams.page, 10); const newPage = parseInt(queryParams.page, 10);
this.page = newPage; this.page = newPage;
this.cd.markForCheck(); } else {
this.page = 1;
} }
if (queryParams.types) { if (queryParams.types) {
const types = queryParams.types.split(',').map((str: string) => parseInt(str, 10)); const types = queryParams.types.split(',').map((str: string) => parseInt(str, 10));
this.types = types.map((id: number) => this.txTypes[id - 1]); this.types = types.map((id: number) => this.txTypes[id - 1]);
this.radioGroupForm.get('txTypes').setValue(types, { emitEvent: false }); this.radioGroupForm.get('txTypes').setValue(types, { emitEvent: false });
} else {
this.types = [];
this.radioGroupForm.get('txTypes').setValue(this.txTypesDefaultChecked, { emitEvent: false });
} }
this.cd.markForCheck();
}) })
), ),
this.radioGroupForm.valueChanges this.radioGroupForm.valueChanges