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

Merge/5.16.2 #3536

Merged
merged 18 commits into from
Oct 10, 2024
Merged

Merge/5.16.2 #3536

merged 18 commits into from
Oct 10, 2024

Conversation

Mama1emon
Copy link
Contributor

No description provided.

kozarezvlad and others added 17 commits October 4, 2024 10:50
Signed-off-by: Mama1emon <[email protected]>
* AND-8706 Define Ring product type using saved data

Signed-off-by: Mama1emon <[email protected]>

* AND-8706 Fix image loading

Signed-off-by: Mama1emon <[email protected]>

---------

Signed-off-by: Mama1emon <[email protected]>
AND-8725 Update ring promo title
…/5.16.2

# Conflicts:
#	app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
#	app/src/main/java/com/tangem/tap/TangemApplication.kt
#	app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
#	app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
#	app/src/main/java/com/tangem/tap/domain/sdk/impl/DefaultTangemSdkManager.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
#	app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
#	app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
#	core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
#	core/res/src/main/res/values-de/strings.xml
#	core/res/src/main/res/values-es/strings.xml
#	core/res/src/main/res/values-fr/strings.xml
#	core/res/src/main/res/values-ja/strings.xml
#	core/res/src/main/res/values-ru/strings.xml
#	core/res/src/main/res/values/strings.xml
#	domain/staking/src/main/java/com/tangem/domain/staking/InvalidatePendingTransactionsUseCase.kt
#	gradle/dependencies.toml
@Mama1emon Mama1emon requested a review from a team as a code owner October 10, 2024 12:06
Copy link

Pull reviewers stats

Stats of the last 30 days for tangem-app-android:

User Total reviews Time to review Total comments
nzeeei 111 52m 20
kozarezvlad 98 38m 24
iMaks99 89 54m 8
Mama1emon 77 49m 34
Yoggam1 47 51m 1
Sateetas 40 34m 2
MasterBin 32 39m 4
iiiburnyiii 13 20m 1

⚡️ Pull request stats

Signed-off-by: Mama1emon <[email protected]>
@Mama1emon Mama1emon merged commit c86bbac into develop Oct 10, 2024
4 checks passed
@Mama1emon Mama1emon deleted the merge/5.16.2 branch October 10, 2024 12:30
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.

5 participants