Minor nav abstraction

src/app/components/new-tab/new-tab.component.html

@@ -8,8 +8,8 @@
   class="search-form"
   appSticky
   [ngClass]="{ 'search-margin': hideTopSites$ | async }"
-  (activated)="navigate(['new-tab', 'search'])"
-  (canceled)="navigate(['new-tab', 'main'])"
+  (activated)="navigate('search')"
+  (canceled)="navigate('main')"
 />
 <section class="content">
   <router-outlet />

src/app/components/new-tab/new-tab.component.ts

@@ -41,8 +41,8 @@ export class NewTabComponent implements OnInit {
   hideTopSites$: Observable<boolean>;
 
   constructor(
-    private homeService: HomeService,
-    private navService: NavService
+    private readonly homeService: HomeService,
+    private readonly navService: NavService
   ) {}
 
   ngOnInit() {
@@ -54,8 +54,8 @@ export class NewTabComponent implements OnInit {
     );
   }
 
-  async navigate(commands) {
-    await this.navService.navigate(commands);
+  async navigate(...command: string[]) {
+    await this.navService.navigate(['/new-tab', ...command]);
     scrollTop();
   }
 }

src/app/components/popup/popup.component.html

@@ -1,7 +1,7 @@
 <app-search-form class="search-form" 
   appSticky
-  (activated)="navigate(['popup', 'search'])"
-  (canceled)="navigate(['popup', 'main'])" />
+  (activated)="navigate('search')"
+  (canceled)="navigate('main')" />
 <div class="content">
   <router-outlet />
 </div>

src/app/components/popup/popup.component.ts

@@ -20,10 +20,10 @@ import { SearchFormComponent } from '../search-form/search-form.component';
   imports: [RouterOutlet, SearchFormComponent, StickyDirective],
 })
 export class PopupComponent {
-  constructor(private navService: NavService) {}
+  constructor(private readonly navService: NavService) {}
 
-  async navigate(commands) {
-    await this.navService.navigate(commands);
+  async navigate(...commands: string[]) {
+    await this.navService.navigate(['/popup', ...commands]);
     scrollTop();
   }
 }