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

Mwr-911 #442

Merged
merged 86 commits into from
Oct 29, 2024
Merged

Mwr-911 #442

merged 86 commits into from
Oct 29, 2024

Conversation

arvifox
Copy link
Contributor

@arvifox arvifox commented Oct 29, 2024

No description provided.

C4tWithShell and others added 30 commits July 20, 2023 22:54
# Conflicts:
#	app/build.gradle
#	build.gradle
# Conflicts:
#	Jenkinsfile
#	app/build.gradle
#	build.gradle
#	feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/data/BlockExplorerManager.kt
# Conflicts:
#	app/build.gradle
#	build.gradle
arvifox and others added 24 commits February 21, 2024 12:06
# Conflicts:
#	app/build.gradle.kts
#	build.gradle.kts
#	feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt
#	feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsViewModel.kt
#	feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/assetsettings/AssetSettingsViewModelTest.kt
#	feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/ProfileViewModel.kt
#	feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/data/mappers/PoolLocalMapper.kt
#	feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/data/repository/PolkaswapRepositoryImpl.kt
#	feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/domain/PoolsInteractorImpl.kt
#	feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/PoolDetailsScreen.kt
#	feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityremove/LiquidityRemoveViewModel.kt
#	feature_sora_card_api/src/main/java/jp/co/soramitsu/feature_sora_card_api/util/SoraCardContractUtil.kt
#	feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardDetailsViewModel.kt
#	feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardMainSoraContentCard.kt
#	feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/CardsHubViewModel.kt
#	feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/claim/ClaimViewModel.kt
#	feature_wallet_impl/src/test/java/jp/co/soramitsu/feature_wallet_impl/presentation/claim/ClaimViewModelTest.kt
#	gradle/libs.versions.toml
@arvifox arvifox self-assigned this Oct 29, 2024
@C4tWithShell C4tWithShell merged commit 2ab4a95 into develop Oct 29, 2024
4 checks passed
@C4tWithShell C4tWithShell deleted the mwr-911 branch October 29, 2024 12:55
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.

8 participants