Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nominaton pools/confirm unbond #1053

Merged
merged 29 commits into from
Aug 11, 2023

Conversation

valentunn
Copy link
Member

image

# Conflicts:
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/di/staking/nominationPool/NominationPoolModule.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/di/components/ComponentsModule.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/di/components/NominationPoolsModule.kt
# Conflicts:
#	app/src/main/java/io/novafoundation/nova/app/root/navigation/staking/nominationPools/NominationPoolsStakingNavigator.kt
#	app/src/main/res/navigation/staking_main_graph.xml
#	common/src/main/res/values/strings.xml
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/calls/ExtrinsicBuilderExt.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/repository/NominationPoolStateRepository.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/di/StakingFeatureComponent.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/di/staking/nominationPool/NominationPoolModule.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/NominationPoolSharedComputation.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/alerts/NominationPoolsAlertsInteractor.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/stakeSummary/NominationPoolStakeSummaryInteractor.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/NominationPoolsRouter.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/components/stakeActions/nominationPools/NominationPoolsStakeActionsComponent.kt
Base automatically changed from nomination_pools/setup_unbond to nomination_pool_base August 11, 2023 08:18
# Conflicts:
#	app/src/main/java/io/novafoundation/nova/app/root/navigation/staking/nominationPools/NominationPoolsStakingNavigator.kt
#	app/src/main/res/navigation/nomination_pools_unbond_graph.xml
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/di/StakingFeatureComponent.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/unbond/NominationPoolsUnbondInteractor.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/NominationPoolsRouter.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/nominationPools/unbond/common/di/NominationPoolsCommonUnbondModule.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/nominationPools/unbond/setup/NominationPoolsSetupUnbondViewModel.kt
#	feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/nominationPools/unbond/setup/di/NominationPoolsSetupUnbondModule.kt
@valentunn valentunn merged commit 48e5df6 into nomination_pool_base Aug 11, 2023
1 check failed
@valentunn valentunn deleted the nominaton_pools/confirm_unbond branch August 11, 2023 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants