From c5582928168c13590779ee4f3b0863951ab90155 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 24 Sep 2021 17:44:21 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../main/java/com/tangem/tap/common/extensions/Navigation.kt  | 1 +
 app/src/main/java/com/tangem/tap/common/images/Picasso.kt     | 1 +
 app/src/main/java/com/tangem/tap/domain/UrlBitmapLoader.kt    | 4 ++++
 .../main/java/com/tangem/tap/features/home/HomeFragment.kt    | 2 +-
 .../java/com/tangem/tap/features/home/redux/HomeMiddleware.kt | 3 ++-
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
index c7e04cf44f..3a119fd683 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
@@ -36,6 +36,7 @@ fun FragmentActivity.openFragment(
     fgShareTransition?.apply {
         fragment.sharedElementEnterTransition = enterTransitionSet
         fragment.sharedElementReturnTransition = exitTransitionSet
+        transaction.setReorderingAllowed(true)
         shareElements.forEach { shareElement ->
             shareElement.wView.get()?.let { view ->
                 transaction.addSharedElement(view, shareElement.name)
diff --git a/app/src/main/java/com/tangem/tap/common/images/Picasso.kt b/app/src/main/java/com/tangem/tap/common/images/Picasso.kt
index c3b1d139a3..df364efdb7 100644
--- a/app/src/main/java/com/tangem/tap/common/images/Picasso.kt
+++ b/app/src/main/java/com/tangem/tap/common/images/Picasso.kt
@@ -23,6 +23,7 @@ class PicassoHelper {
         private fun getOkHttpForPicasso(application: Application): OkHttpClient {
             val okHttpBuilder = OkHttpClient.Builder()
             okHttpBuilder.cache(Cache(File(application.filesDir, "artworks"), Long.MAX_VALUE))
+            okHttpBuilder.callTimeout(15000, TimeUnit.MILLISECONDS)
             okHttpBuilder.addInterceptor { chain ->
                 val cacheControl = CacheControl.Builder()
                         .maxStale(KEEP_CACHE_MAX_DAYS, TimeUnit.DAYS)
diff --git a/app/src/main/java/com/tangem/tap/domain/UrlBitmapLoader.kt b/app/src/main/java/com/tangem/tap/domain/UrlBitmapLoader.kt
index d09d8ed3bc..1f4897a487 100644
--- a/app/src/main/java/com/tangem/tap/domain/UrlBitmapLoader.kt
+++ b/app/src/main/java/com/tangem/tap/domain/UrlBitmapLoader.kt
@@ -5,6 +5,7 @@ import android.graphics.drawable.Drawable
 import com.squareup.picasso.Picasso
 import com.squareup.picasso.Target
 import com.tangem.common.services.Result
+import timber.log.Timber
 
 /**
 [REDACTED_AUTHOR]
@@ -26,13 +27,16 @@ open class DownloadTarget(
 ) : Target {
 
     override fun onBitmapLoaded(bitmap: Bitmap, from: Picasso.LoadedFrom) {
+        Timber.d("onBitmapLoaded")
         callback(Result.Success(bitmap))
     }
 
     override fun onBitmapFailed(e: java.lang.Exception?, errorDrawable: Drawable?) {
+        Timber.d("onBitmapFailed")
         callback.invoke(Result.Failure(e))
     }
 
     override fun onPrepareLoad(placeHolderDrawable: Drawable?) {
+        Timber.d("onPrepareLoad")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
index 168941d2c5..457509098f 100644
--- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
@@ -41,7 +41,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
         super.onViewCreated(view, savedInstanceState)
 
         val transitionViews = mutableListOf<ShareElement>()
-        transitionViews.add(ShareElement(WeakReference(imv_front_card), "imv_front_card"))
+        transitionViews.add(ShareElement(WeakReference(imv_front_card), imv_front_card.transitionName))
         val shareTransition = FragmentShareTransition(transitionViews, DetailsTransition(), DetailsTransition())
 
         store.dispatch(HomeAction.SetFragmentShareTransition(shareTransition))
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
index 0a6e7945f4..bbb37ceded 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@@ -61,7 +61,8 @@ private fun launchOnboardingService() {
     service.onReadyToProceed = {
         store.dispatch(OnboardingAction.SetData(it))
         changeButtonState(ButtonState.ENABLED)
-        store.dispatch(NavigationAction.NavigateTo(it.onboardingScreen))
+        val sharedTransition = store.state.homeState.shareTransition
+        store.dispatch(NavigationAction.NavigateTo(it.onboardingScreen, fragmentShareTransition = sharedTransition))
     }
 
     service.onFailedToProceedToOnboardingCase = {