Merge/5.16.2 #3536
Merged
Merge/5.16.2 #3536
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Release to hotfix/5.16.2
Signed-off-by: Mama1emon <[email protected]>
Signed-off-by: Mama1emon <[email protected]>
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]>
Signed-off-by: Mama1emon <[email protected]>
Signed-off-by: Mama1emon <[email protected]>
Signed-off-by: Mama1emon <[email protected]>
Signed-off-by: Mama1emon <[email protected]>
Signed-off-by: Mama1emon <[email protected]>
Hotfix/5.16.2
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
Signed-off-by: Mama1emon <[email protected]>
Mama1emon
force-pushed
the
merge/5.16.2
branch
from
85e6902
to
4c29943
Compare
nzeeei
approved these changes
Oct 10, 2024
iMaks99
approved these changes
Oct 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.