Fix /tx redirect merge conflicts

This commit is contained in:
Mononaut 2024-07-26 16:10:09 +00:00
parent d59bc085e5
commit 53a36d042f
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
3 changed files with 11 additions and 2 deletions

View File

@ -142,10 +142,10 @@ let routes: Routes = [
data: { preload: true }, data: { preload: true },
}, },
{ {
path: 'tx/:id', path: 'tx',
canMatch: [TrackerGuard], canMatch: [TrackerGuard],
runGuardsAndResolvers: 'always', runGuardsAndResolvers: 'always',
component: TrackerComponent, loadChildren: () => import('./components/tracker/tracker.module').then(m => m.TrackerModule),
}, },
{ {
path: '', path: '',

View File

@ -31,6 +31,8 @@ import { TrackerStage } from './tracker-bar.component';
import { MiningService, MiningStats } from '../../services/mining.service'; import { MiningService, MiningStats } from '../../services/mining.service';
import { ETA, EtaService } from '../../services/eta.service'; import { ETA, EtaService } from '../../services/eta.service';
import { getTransactionFlags, getUnacceleratedFeeRate } from '../../shared/transaction.utils'; import { getTransactionFlags, getUnacceleratedFeeRate } from '../../shared/transaction.utils';
import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
interface Pool { interface Pool {
id: number; id: number;

View File

@ -518,6 +518,13 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
}); });
} }
} }
if (window.innerWidth <= 767.98) {
this.router.navigate([this.relativeUrlPipe.transform('/tx'), this.txId], {
queryParamsHandling: 'merge',
preserveFragment: true,
queryParams: { mode: 'details' },
});
}
this.seoService.setTitle( this.seoService.setTitle(
$localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:` $localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`
); );