diff --git a/docker/frontend/entrypoint.sh b/docker/frontend/entrypoint.sh index 5e79b262f..5b072ba8d 100644 --- a/docker/frontend/entrypoint.sh +++ b/docker/frontend/entrypoint.sh @@ -18,6 +18,7 @@ fi __MAINNET_ENABLED__=${MAINNET_ENABLED:=true} __TESTNET_ENABLED__=${TESTNET_ENABLED:=false} +__TESTNET4_ENABLED__=${TESTNET_ENABLED:=false} __SIGNET_ENABLED__=${SIGNET_ENABLED:=false} __LIQUID_ENABLED__=${LIQUID_ENABLED:=false} __LIQUID_TESTNET_ENABLED__=${LIQUID_TESTNET_ENABLED:=false} @@ -46,6 +47,7 @@ __ADDITIONAL_CURRENCIES__=${ADDITIONAL_CURRENCIES:=false} # Export as environment variables to be used by envsubst export __MAINNET_ENABLED__ export __TESTNET_ENABLED__ +export __TESTNET4_ENABLED__ export __SIGNET_ENABLED__ export __LIQUID_ENABLED__ export __LIQUID_TESTNET_ENABLED__ diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 0acc07322..41c0ce47f 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -53,13 +53,26 @@ Spiral - - - - - - - + + + + + + + + + + + + @@ -259,22 +272,10 @@ Bisq - - - BlueWallet - - - - Muun - Electrum - - - Specter - Sparrow @@ -283,21 +284,37 @@ Phoenix - - - LNBits + + + COLDCARD - - - Mercury + + + ZEUS + + + + Mutiny Blixt - - - ZEUS + + + Nunchuk + + + + BlueWallet + + + + Boltz + + + + LNBits @@ -307,13 +324,9 @@ Schildbach - - - Nunchuk - - - - COLDCARD + + + Specter @@ -323,13 +336,13 @@ Galoy - - - Boltz + + + Muun - - - Mutiny + + + bitcoin-s diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html index ec2636be2..927fe1792 100644 --- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html +++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html @@ -4,11 +4,11 @@ - - + - - diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss index deadf4df2..b01a902a4 100644 --- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss +++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss @@ -16,7 +16,7 @@ width: auto; min-width: auto; } - &.mobile { + &.chart-left { width: 100%; } } @@ -26,7 +26,7 @@ width: 100%; } - &.mobile { + &.chart-left { width: auto; } diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts index 51495f332..90df9987c 100644 --- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts +++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts @@ -28,6 +28,7 @@ export class ActiveAccelerationBox implements OnChanges { @Input() miningStats: MiningStats; @Input() pools: number[]; @Input() chartOnly: boolean = false; + @Input() chartPositionLeft: boolean = false; acceleratedByPercentage: string = ''; @@ -132,8 +133,4 @@ export class ActiveAccelerationBox implements OnChanges { } this.chartInstance = ec; } - - isMobile() { - return window.innerWidth <= 767.98; - } } \ No newline at end of file diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index 7cba84784..cb20abe1e 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -651,7 +651,7 @@ diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index c84eb8787..c4b4a6af1 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -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(); } } } diff --git a/frontend/src/app/components/transaction/transaction.module.ts b/frontend/src/app/components/transaction/transaction.module.ts index 5429a22cc..b98c33e2a 100644 --- a/frontend/src/app/components/transaction/transaction.module.ts +++ b/frontend/src/app/components/transaction/transaction.module.ts @@ -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, diff --git a/frontend/src/app/docs/api-docs/api-docs.component.ts b/frontend/src/app/docs/api-docs/api-docs.component.ts index 76d9de8d0..b655b3969 100644 --- a/frontend/src/app/docs/api-docs/api-docs.component.ts +++ b/frontend/src/app/docs/api-docs/api-docs.component.ts @@ -72,7 +72,7 @@ export class ApiDocsComponent implements OnInit, AfterViewInit { this.auditEnabled = this.env.AUDIT; this.network$ = merge(of(''), this.stateService.networkChanged$).pipe( tap((network: string) => { - if (this.env.BASE_MODULE === 'mempool' && network !== '') { + if (this.env.BASE_MODULE === 'mempool' && network !== '' && this.env.ROOT_NETWORK === '') { this.baseNetworkUrl = `/${network}`; } else if (this.env.BASE_MODULE === 'liquid') { if (!['', 'liquid'].includes(network)) { @@ -195,6 +195,10 @@ export class ApiDocsComponent implements OnInit, AfterViewInit { } } + if (network === this.env.ROOT_NETWORK) { + curlNetwork = ''; + } + let text = code.codeTemplate.curl; for (let index = 0; index < curlResponse.length; index++) { const curlText = curlResponse[index]; diff --git a/frontend/src/app/docs/code-template/code-template.component.ts b/frontend/src/app/docs/code-template/code-template.component.ts index bd03f5b16..b31def01c 100644 --- a/frontend/src/app/docs/code-template/code-template.component.ts +++ b/frontend/src/app/docs/code-template/code-template.component.ts @@ -284,7 +284,7 @@ yarn add @mempool/liquid.js`; const headersString = code.headers ? ` -H "${code.headers}"` : ``; if (this.env.BASE_MODULE === 'mempool') { - if (this.network === 'main' || this.network === '') { + if (this.network === 'main' || this.network === '' || this.network === this.env.ROOT_NETWORK) { if (this.method === 'POST') { return `curl${headersString} -X POST -sSLd "${text}"`; } @@ -296,7 +296,7 @@ yarn add @mempool/liquid.js`; return `curl${headersString} -sSL "${this.hostname}/${this.network}${text}"`; } else if (this.env.BASE_MODULE === 'liquid') { if (this.method === 'POST') { - if (this.network !== 'liquid') { + if (this.network !== 'liquid' || this.network === this.env.ROOT_NETWORK) { text = text.replace('/api', `/${this.network}/api`); } return `curl${headersString} -X POST -sSLd "${text}"`;
Accelerated to + Accelerated to +
@if (accelerationInfo?.acceleratedFeeRate && (!tx.effectiveFeePerVsize || accelerationInfo.acceleratedFeeRate >= tx.effectiveFeePerVsize)) { @@ -17,7 +17,7 @@ }
+
- +