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

SN-2813: ui lib version upgrade #183

Merged
merged 16 commits into from
Sep 12, 2023
Merged

Conversation

AmadeyKuspakov
Copy link
Contributor

No description provided.

@AmadeyKuspakov AmadeyKuspakov force-pushed the SN-2813/cut-and-paste-problems-fix branch from 44520d9 to 5f8dd7c Compare August 30, 2023 23:00
@arvifox arvifox force-pushed the SN-2813/cut-and-paste-problems-fix branch from 5f8dd7c to e11e778 Compare August 31, 2023 10:28
@arvifox arvifox force-pushed the SN-2813/cut-and-paste-problems-fix branch from e11e778 to aa4b03c Compare August 31, 2023 10:33
mrZizik
mrZizik previously approved these changes Sep 6, 2023
AmadeyKuspakov and others added 4 commits September 6, 2023 20:50
…ste-problems-fix

# Conflicts:
#	build.gradle
#	feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt
#	feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt
#	feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/qr/QrCodeFlowViewModelTest.kt
#	feature_assets_impl/src/test/java/jp/co/soramitsu/feature_assets_impl/presentation/send/TransferAmountViewModelTest.kt
#	feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddViewModel.kt
#	feature_polkaswap_impl/src/test/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/polkaswap/liquidity/add/AddLiquidityViewModelTest.kt
@AmadeyKuspakov AmadeyKuspakov force-pushed the SN-2813/cut-and-paste-problems-fix branch from 33eb245 to 9fb3779 Compare September 12, 2023 01:39
@arvifox arvifox force-pushed the SN-2813/cut-and-paste-problems-fix branch from 9c4d85e to 308e756 Compare September 12, 2023 09:59
@arvifox arvifox merged commit d4adb28 into develop Sep 12, 2023
1 check passed
@arvifox arvifox deleted the SN-2813/cut-and-paste-problems-fix branch September 12, 2023 10:19
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.

3 participants