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

Merge pull request #5421 from mempool/mononaut/rbf-tracker-redirect

Browse Source 
Fix broken pizza rbf link to /tracker
This commit is contained in:
wiz 2024-08-05 14:04:20 -04:00 committed by GitHub
commit 36b91cfdfd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/components/tracker/tracker.component.html
View File

@ -46,7 +46,7 @@
@if (replaced) { @if (replaced) {
<div class="alert-replaced" role="alert"> <div class="alert-replaced" role="alert">
<span i18n="transaction.rbf.replacement|RBF replacement">This transaction has been replaced by:</span> <span i18n="transaction.rbf.replacement|RBF replacement">This transaction has been replaced by:</span>
<app-truncate [text]="latestReplacement" [lastChars]="12" [link]="['/tracker/' | relativeUrl, latestReplacement]"></app-truncate> <app-truncate [text]="latestReplacement" [lastChars]="12" [link]="['/tx/' | relativeUrl, latestReplacement]" [queryParams]="{mode: 'status'}"></app-truncate>
</div> </div>
} @else { } @else {
<div class="tracker-bar"> <div class="tracker-bar">

2
frontend/src/app/route-guards.ts
View File

@ -13,7 +13,7 @@ class GuardService {
trackerGuard(route: Route, segments: UrlSegment[]): boolean { trackerGuard(route: Route, segments: UrlSegment[]): boolean {
const preferredRoute = this.router.getCurrentNavigation()?.extractedUrl.queryParams?.mode; const preferredRoute = this.router.getCurrentNavigation()?.extractedUrl.queryParams?.mode;
return preferredRoute !== 'details' && this.navigationService.isInitialLoad() && window.innerWidth <= 767.98; return (preferredRoute === 'status' || (preferredRoute !== 'details' && this.navigationService.isInitialLoad())) && window.innerWidth <= 767.98;
} }
} }

2
frontend/src/app/shared/components/truncate/truncate.component.html
View File

@ -1,6 +1,6 @@
<span class="truncate" [style.max-width]="maxWidth ? maxWidth + 'px' : null" [style.justify-content]="textAlign" [class.inline]="inline"> <span class="truncate" [style.max-width]="maxWidth ? maxWidth + 'px' : null" [style.justify-content]="textAlign" [class.inline]="inline">
<ng-container *ngIf="link"> <ng-container *ngIf="link">
<a [routerLink]="link" class="truncate-link" [target]="external ? '_blank' : '_self'"> <a [routerLink]="link" [queryParams]="queryParams" class="truncate-link" [target]="external ? '_blank' : '_self'">
<ng-container *ngIf="rtl; then rtlTruncated; else ltrTruncated;"></ng-container> <ng-container *ngIf="rtl; then rtlTruncated; else ltrTruncated;"></ng-container>
</a> </a>
</ng-container> </ng-container>

1
frontend/src/app/shared/components/truncate/truncate.component.ts
View File

@ -10,6 +10,7 @@ export class TruncateComponent {
@Input() text: string; @Input() text: string;
@Input() link: any = null; @Input() link: any = null;
@Input() external: boolean = false; @Input() external: boolean = false;
@Input() queryParams: any = undefined;
@Input() lastChars: number = 4; @Input() lastChars: number = 4;
@Input() maxWidth: number = null; @Input() maxWidth: number = null;
@Input() inline: boolean = false; @Input() inline: boolean = false;