Merge branch 'master' into mononaut/hybrid-acceleration-checkout

This commit is contained in:
wiz
2024-06-28 21:26:23 +09:00
committed by GitHub
10 changed files with 85 additions and 63 deletions

View File

@@ -651,7 +651,7 @@
<ng-template #acceleratingRow>
<tr>
<td rowspan="2" colspan="2" style="padding: 0;">
<app-active-acceleration-box [tx]="tx" [accelerationInfo]="accelerationInfo" [miningStats]="miningStats"></app-active-acceleration-box>
<app-active-acceleration-box [tx]="tx" [accelerationInfo]="accelerationInfo" [miningStats]="miningStats" [chartPositionLeft]="isMobile"></app-active-acceleration-box>
</td>
</tr>
<tr></tr>

View File

@@ -749,6 +749,11 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
this.tx.acceleratedBy = cpfpInfo.acceleratedBy;
this.setIsAccelerated(firstCpfp);
}
if (!this.isAcceleration && this.fragmentParams.has('accelerate')) {
this.onAccelerateClicked();
}
this.txChanged$.next(true);
this.cpfpInfo = cpfpInfo;
@@ -886,14 +891,10 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
// simulate normal anchor fragment behavior
applyFragment(): void {
const anchor = Array.from(this.fragmentParams.entries()).find(([frag, value]) => value === '');
if (anchor?.length) {
if (anchor[0] === 'accelerate') {
setTimeout(this.onAccelerateClicked.bind(this), 100);
} else {
const anchorElement = document.getElementById(anchor[0]);
if (anchorElement) {
anchorElement.scrollIntoView();
}
if (anchor?.length && anchor[0] !== 'accelerate') {
const anchorElement = document.getElementById(anchor[0]);
if (anchorElement) {
anchorElement.scrollIntoView();
}
}
}

View File

@@ -9,6 +9,11 @@ import { AccelerateCheckout } from '../accelerate-checkout/accelerate-checkout.c
import { AccelerateFeeGraphComponent } from '../accelerate-checkout/accelerate-fee-graph.component';
const routes: Routes = [
{
path: '',
redirectTo: '/',
pathMatch: 'full',
},
{
path: ':id',
component: TransactionComponent,