From 94bbdde90ac99a995b47692f701425800f77e9be Mon Sep 17 00:00:00 2001 From: Valentun Date: Thu, 23 Jan 2025 16:30:25 +0300 Subject: [PATCH 1/2] Fix return to dashboard navigation --- .../app/navigation/staking/StakingNavigationModule.kt | 4 ++-- .../navigators/staking/StakingDashboardNavigator.kt | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/staking/StakingNavigationModule.kt b/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/staking/StakingNavigationModule.kt index e92110bcdf..dd97c19eeb 100644 --- a/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/staking/StakingNavigationModule.kt +++ b/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/staking/StakingNavigationModule.kt @@ -21,8 +21,8 @@ class StakingNavigationModule { @Provides @ApplicationScope - fun provideStakingDashboardNavigator(): StakingDashboardNavigator { - return StakingDashboardNavigator() + fun provideStakingDashboardNavigator(navigationHoldersRegistry: NavigationHoldersRegistry): StakingDashboardNavigator { + return StakingDashboardNavigator(navigationHoldersRegistry) } @Provides diff --git a/app/src/main/java/io/novafoundation/nova/app/root/navigation/navigators/staking/StakingDashboardNavigator.kt b/app/src/main/java/io/novafoundation/nova/app/root/navigation/navigators/staking/StakingDashboardNavigator.kt index 5e00d65277..dcccd4be36 100644 --- a/app/src/main/java/io/novafoundation/nova/app/root/navigation/navigators/staking/StakingDashboardNavigator.kt +++ b/app/src/main/java/io/novafoundation/nova/app/root/navigation/navigators/staking/StakingDashboardNavigator.kt @@ -3,11 +3,15 @@ package io.novafoundation.nova.app.root.navigation.navigators.staking import androidx.lifecycle.MutableLiveData import androidx.navigation.NavController import io.novafoundation.nova.app.R +import io.novafoundation.nova.app.root.navigation.navigators.BaseNavigator +import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry import io.novafoundation.nova.common.utils.Event import io.novafoundation.nova.common.utils.event import io.novafoundation.nova.feature_staking_impl.presentation.StakingDashboardRouter -class StakingDashboardNavigator : StakingDashboardRouter { +class StakingDashboardNavigator( + navigationHoldersRegistry: NavigationHoldersRegistry +) : BaseNavigator(navigationHoldersRegistry), StakingDashboardRouter { private var stakingTabNavController: NavController? = null private var pendingAction: Int? = null @@ -36,7 +40,9 @@ class StakingDashboardNavigator : StakingDashboardRouter { } override fun returnToStakingDashboard() { - stakingTabNavController?.navigate(R.id.back_to_main) + navigationBuilder() + .action(R.id.back_to_main) + .navigateInFirstAttachedContext() returnToStakingTabRoot() scrollToDashboardTopEvent.value = Unit.event() From 7233850966a11b1f82324cb07ba7aedd7d33a0d1 Mon Sep 17 00:00:00 2001 From: Valentun Date: Thu, 23 Jan 2025 17:59:05 +0300 Subject: [PATCH 2/2] Bump version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7de2d946fd..62eb560e92 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ buildscript { ext { // App version - versionName = '9.2.1' - versionCode = 171 + versionName = '9.2.2' + versionCode = 172 applicationId = "io.novafoundation.nova" releaseApplicationSuffix = "market"