Fix /tx redirect merge conflicts
This commit is contained in:
		
							parent
							
								
									d59bc085e5
								
							
						
					
					
						commit
						53a36d042f
					
				| @ -142,10 +142,10 @@ let routes: Routes = [ | ||||
|     data: { preload: true }, | ||||
|   }, | ||||
|   { | ||||
|     path: 'tx/:id', | ||||
|     path: 'tx', | ||||
|     canMatch: [TrackerGuard], | ||||
|     runGuardsAndResolvers: 'always', | ||||
|     component: TrackerComponent, | ||||
|     loadChildren: () => import('./components/tracker/tracker.module').then(m => m.TrackerModule), | ||||
|   }, | ||||
|   { | ||||
|     path: '', | ||||
|  | ||||
| @ -31,6 +31,8 @@ import { TrackerStage } from './tracker-bar.component'; | ||||
| import { MiningService, MiningStats } from '../../services/mining.service'; | ||||
| import { ETA, EtaService } from '../../services/eta.service'; | ||||
| import { getTransactionFlags, getUnacceleratedFeeRate } from '../../shared/transaction.utils'; | ||||
| import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe'; | ||||
| 
 | ||||
| 
 | ||||
| interface Pool { | ||||
|   id: number; | ||||
|  | ||||
| @ -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( | ||||
|             $localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:` | ||||
|           ); | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user