diff --git a/src/core/components/tabs-outlet/tabs-outlet.ts b/src/core/components/tabs-outlet/tabs-outlet.ts index 81f56cb08..725b92b29 100644 --- a/src/core/components/tabs-outlet/tabs-outlet.ts +++ b/src/core/components/tabs-outlet/tabs-outlet.ts @@ -28,7 +28,7 @@ import { Subscription } from 'rxjs'; import { CoreUtils } from '@services/utils/utils'; import { Params } from '@angular/router'; import { CoreNavBarButtonsComponent } from '../navbar-buttons/navbar-buttons'; -import { StackEvent } from '@ionic/angular/directives/navigation/stack-utils'; +import { StackDidChangeEvent } from '@ionic/angular/common/directives/navigation/stack-utils'; import { CoreNavigator } from '@services/navigator'; import { CoreTabBase, CoreTabsBaseComponent } from '@classes/tabs'; import { CoreDirectivesRegistry } from '@singletons/directives-registry'; @@ -90,7 +90,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent { + this.stackEventsSubscription = this.ionTabs.outlet.stackDidChange.subscribe(async (stackEvent: StackDidChangeEvent) => { if (!this.isCurrentView) { return; } diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts index a0f33b6f4..2c164ce84 100644 --- a/src/core/services/navigator.ts +++ b/src/core/services/navigator.ts @@ -15,7 +15,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Params } from '@angular/router'; -import { NavigationOptions } from '@ionic/angular/providers/nav-controller'; +import { NavigationOptions } from '@ionic/angular/common/providers/nav-controller'; import { CoreConstants } from '@/core/constants'; import { CoreDomUtils } from '@services/utils/dom'; @@ -437,8 +437,8 @@ export class CoreNavigatorService { * * @returns Promise resolved when done. */ - back(): Promise { - return NavController.pop(); + async back(): Promise { + await NavController.pop(); } /** diff --git a/src/types/angular.d.ts b/src/types/angular.d.ts index 4f63bb656..ca503972d 100644 --- a/src/types/angular.d.ts +++ b/src/types/angular.d.ts @@ -13,7 +13,7 @@ // limitations under the License. import { UrlTree } from '@angular/router'; -import { NavigationOptions } from '@ionic/angular/providers/nav-controller'; +import { NavigationOptions } from '@ionic/angular/common/providers/nav-controller'; declare module '@ionic/angular' {