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

[accelerator] fiat limits

Browse Source
This commit is contained in:
Mononaut 2024-06-30 03:20:33 +00:00
parent 2798b43913
commit bf37affe47
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
View File

@ -391,7 +391,7 @@
</div> </div>
} }
} }
@if (cashappEnabled) { @if (canPayWithCashapp) {
<div class="col-sm text-center d-flex flex-column justify-content-center align-items-center"> <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
<p>Pay <app-fiat [value]="cost"></app-fiat> with</p> <p>Pay <app-fiat [value]="cost"></app-fiat> with</p>
<img class="paymentMethod mx-2" src="/resources/cash-app.svg" height=55 (click)="moveToStep('cashapp')"> <img class="paymentMethod mx-2" src="/resources/cash-app.svg" height=55 (click)="moveToStep('cashapp')">

2
frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
View File

@ -466,7 +466,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
} }
get canPayWithCashapp() { get canPayWithCashapp() {
return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp'); return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp') && this.cost < 400000;
} }
get canPayWithBalance() { get canPayWithBalance() {

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

@ -120,7 +120,7 @@
<div class="spinner-border text-light" style="width: 1em; height: 1em"></div> <div class="spinner-border text-light" style="width: 1em; height: 1em"></div>
</div> </div>
<span class="explainer">&nbsp;</span> <span class="explainer">&nbsp;</span>
} @else if (showAccelerationSummary && !accelerationFlowCompleted) { } @else if (showAccelerationSummary) {
<ng-container *ngIf="(ETA$ | async) as eta;"> <ng-container *ngIf="(ETA$ | async) as eta;">
<app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout> <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
</ng-container> </ng-container>

7
frontend/src/app/components/tracker/tracker.component.ts
View File

@ -386,18 +386,19 @@ export class TrackerComponent implements OnInit, OnDestroy {
} }
if (!this.mempoolPosition.accelerated) { if (!this.mempoolPosition.accelerated) {
if (!this.showAccelerationSummary) { if (!this.accelerationFlowCompleted && !this.showAccelerationSummary && this.mempoolPosition.block > 0) {
this.showAccelerationSummary = true; this.showAccelerationSummary = true;
this.miningService.getMiningStats('1w').subscribe(stats => { this.miningService.getMiningStats('1w').subscribe(stats => {
this.miningStats = stats; this.miningStats = stats;
}); });
} }
if (txPosition.position?.block > 0 && this.tx.weight < 4000) { if (txPosition.position?.block > 0) {
this.accelerationEligible = true; this.accelerationEligible = true;
} }
} else if (this.showAccelerationSummary) { } else if (this.showAccelerationSummary) {
setTimeout(() => { setTimeout(() => {
this.accelerationFlowCompleted = true; this.accelerationFlowCompleted = true;
this.showAccelerationSummary = false;
}, 2000); }, 2000);
} }
} }
@ -742,6 +743,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
return; return;
} }
this.enterpriseService.goal(8); this.enterpriseService.goal(8);
this.accelerationFlowCompleted = false;
this.showAccelerationSummary = true && this.acceleratorAvailable; this.showAccelerationSummary = true && this.acceleratorAvailable;
this.scrollIntoAccelPreview = true; this.scrollIntoAccelPreview = true;
return false; return false;
@ -777,6 +779,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
this.auditStatus = null; this.auditStatus = null;
this.accelerationPositions = null; this.accelerationPositions = null;
this.accelerationEligible = false; this.accelerationEligible = false;
this.accelerationFlowCompleted = false;
this.trackerStage = 'waiting'; this.trackerStage = 'waiting';
document.body.scrollTo(0, 0); document.body.scrollTo(0, 0);
this.leaveTransaction(); this.leaveTransaction();

4
frontend/src/app/components/transaction/transaction.component.html
View File

@ -540,9 +540,9 @@
@if (eta.blocks >= 7) { @if (eta.blocks >= 7) {
<span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') ? 'etaDeepMempool d-flex justify-content-end align-items-center' : ''"> <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') ? 'etaDeepMempool d-flex justify-content-end align-items-center' : ''">
<span i18n="transaction.eta.in-several-hours|Transaction ETA in several hours or more">In several hours (or more)</span> <span i18n="transaction.eta.in-several-hours|Transaction ETA in several hours or more">In several hours (or more)</span>
<!-- @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') { @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary) {
<a class="btn btn-sm accelerateDeepMempool btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a> <a class="btn btn-sm accelerateDeepMempool btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
} --> }
</span> </span>
} @else if (network === 'liquid' || network === 'liquidtestnet') { } @else if (network === 'liquid' || network === 'liquidtestnet') {
<app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time> <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>

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

@ -139,6 +139,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
acceleratorAvailable: boolean = this.stateService.env.ACCELERATOR && this.stateService.network === ''; acceleratorAvailable: boolean = this.stateService.env.ACCELERATOR && this.stateService.network === '';
showAccelerationSummary = false; showAccelerationSummary = false;
showAccelerationDetails = false; showAccelerationDetails = false;
accelerationFlowCompleted = false;
scrollIntoAccelPreview = false; scrollIntoAccelPreview = false;
accelerationEligible = false; accelerationEligible = false;
auditEnabled: boolean = this.stateService.env.AUDIT && this.stateService.env.BASE_MODULE === 'mempool' && this.stateService.env.MINING_DASHBOARD === true; auditEnabled: boolean = this.stateService.env.AUDIT && this.stateService.env.BASE_MODULE === 'mempool' && this.stateService.env.MINING_DASHBOARD === true;
@ -409,7 +410,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
} }
if (!this.mempoolPosition.accelerated) { if (!this.mempoolPosition.accelerated) {
if (!this.showAccelerationSummary) { if (!this.accelerationFlowCompleted && !this.showAccelerationSummary) {
this.showAccelerationSummary = true; this.showAccelerationSummary = true;
this.miningService.getMiningStats('1w').subscribe(stats => { this.miningService.getMiningStats('1w').subscribe(stats => {
this.miningStats = stats; this.miningStats = stats;
@ -420,6 +421,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
} }
} else if (this.showAccelerationSummary) { } else if (this.showAccelerationSummary) {
setTimeout(() => { setTimeout(() => {
this.accelerationFlowCompleted = true;
this.showAccelerationSummary = false; this.showAccelerationSummary = false;
}, 2000); }, 2000);
} }
@ -709,6 +711,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
document.location.hash = '#accelerate'; document.location.hash = '#accelerate';
this.enterpriseService.goal(8); this.enterpriseService.goal(8);
this.accelerationFlowCompleted = false;
this.showAccelerationSummary = true && this.acceleratorAvailable; this.showAccelerationSummary = true && this.acceleratorAvailable;
this.scrollIntoAccelPreview = true; this.scrollIntoAccelPreview = true;
return false; return false;
@ -789,9 +792,11 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
this.isAcceleration = (this.tx.acceleration || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id)))); this.isAcceleration = (this.tx.acceleration || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id))));
if (this.isAcceleration) { if (this.isAcceleration) {
if (initialState) { if (initialState) {
this.accelerationFlowCompleted = true;
this.showAccelerationSummary = false; this.showAccelerationSummary = false;
} else if (this.showAccelerationSummary) { } else if (this.showAccelerationSummary) {
setTimeout(() => { setTimeout(() => {
this.accelerationFlowCompleted = true;
this.showAccelerationSummary = false; this.showAccelerationSummary = false;
}, 2000); }, 2000);
} }
@ -864,6 +869,8 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
this.filters = []; this.filters = [];
this.showCpfpDetails = false; this.showCpfpDetails = false;
this.accelerationInfo = null; this.accelerationInfo = null;
this.accelerationEligible = false;
this.accelerationFlowCompleted = false;
this.txInBlockIndex = null; this.txInBlockIndex = null;
this.mempoolPosition = null; this.mempoolPosition = null;
this.pool = null; this.pool = null;