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

Bugfix: Refetch unconfirmed transaction when returning back online.

Browse Source
This commit is contained in:
softsimon 2020-03-24 21:01:29 +07:00
parent a244458928
commit ffa97fedf3
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/src/app/components/transaction/transaction.component.ts
View File

@ -3,7 +3,7 @@ import { ElectrsApiService } from '../../services/electrs-api.service';
import { ActivatedRoute, ParamMap } from '@angular/router'; import { ActivatedRoute, ParamMap } from '@angular/router';
import { switchMap, filter, take } from 'rxjs/operators'; import { switchMap, filter, take } from 'rxjs/operators';
import { Transaction, Block } from '../../interfaces/electrs.interface'; import { Transaction, Block } from '../../interfaces/electrs.interface';
import { of } from 'rxjs'; import { of, merge } from 'rxjs';
import { StateService } from '../../services/state.service'; import { StateService } from '../../services/state.service';
import { WebsocketService } from '../../services/websocket.service'; import { WebsocketService } from '../../services/websocket.service';
import { AudioService } from 'src/app/services/audio.service'; import { AudioService } from 'src/app/services/audio.service';
@ -49,11 +49,19 @@ export class TransactionComponent implements OnInit, OnDestroy {
this.isLoadingTx = true; this.isLoadingTx = true;
this.transactionTime = -1; this.transactionTime = -1;
document.body.scrollTo(0, 0); document.body.scrollTo(0, 0);
if (history.state.data) { return merge(
return of(history.state.data); of(true),
} else { this.stateService.connectionState$
return this.electrsApiService.getTransaction$(this.txId); .pipe(filter((state) => state === 2 && this.tx && !this.tx.status.confirmed) ),
} )
.pipe(
switchMap(() => {
if (history.state.data) {
return of(history.state.data);
}
return this.electrsApiService.getTransaction$(this.txId);
})
);
}) })
) )
.subscribe((tx: Transaction) => { .subscribe((tx: Transaction) => {