From 6e2e5ba086f4552900f4f0df1bc9c9f7cc4d0690 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 18 Oct 2022 17:08:52 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../wallet/ui/OnboardingWalletFragment.kt     | 21 +++++--
 .../tap/features/wallet/ui/WalletFragment.kt  | 57 ++++++++++++-------
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
index 5a8376070a..8a444373b5 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.onboarding.products.wallet.ui
 
-import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.View
@@ -15,6 +14,7 @@ import androidx.transition.TransitionInflater
 import androidx.transition.TransitionManager
 import by.kirich1409.viewbindingdelegate.viewBinding
 import coil.load
+import coil.size.Scale
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.button.MaterialButton
@@ -466,14 +466,25 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
         }
 
         private fun handleCardArtworks(state: OnboardingWalletState) = with(walletFragment.binding) {
+            //TODO: SaltPay: remove hardCode
             if (state.onboardingSaltPayState?.saltPayCardArtworkUrl == null) {
-                // if saltPay url not loaded -> load from resource
-                val bitmap = BitmapFactory.decodeResource(walletFragment.resources, R.drawable.img_salt_pay_visa)
-                imvFrontCard.setImageBitmap(bitmap)
+                imvFrontCard.load(R.drawable.img_salt_pay_visa) {
+                    scale(Scale.FILL)
+                    crossfade(enable = true)
+                }
             } else {
                 walletFragment.loadImageIntoImageView(state.onboardingSaltPayState.saltPayCardArtworkUrl, imvFrontCard)
             }
-            walletFragment.loadImageIntoImageView(state.cardArtworkUrl, imvFirstBackupCard)
+            imvFirstBackupCard.load(R.drawable.card_placeholder_wallet)
+
+            // if (state.onboardingSaltPayState?.saltPayCardArtworkUrl == null) {
+            //     //if saltPay url not loaded -> load from resource
+            //     val bitmap = BitmapFactory.decodeResource(walletFragment.resources, R.drawable.img_salt_pay_visa)
+            //     imvFrontCard.setImageBitmap(bitmap)
+            // } else {
+            //     walletFragment.loadImageIntoImageView(state.onboardingSaltPayState.saltPayCardArtworkUrl, imvFrontCard)
+            // }
+            // walletFragment.loadImageIntoImageView(state.cardArtworkUrl, imvFirstBackupCard)
 
             //TODO: at now we can hide the image only by changing alpha channel to 0, because
             // the OnboardingWalletFragment and WalletCardsWidget manipulate it visibility through changing
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index b7748269e4..1f7d881721 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -26,7 +26,6 @@ import com.tangem.tap.domain.statePrinter.printScanResponseState
 import com.tangem.tap.domain.statePrinter.printWalletState
 import com.tangem.tap.domain.termsOfUse.CardTou
 import com.tangem.tap.features.details.redux.DetailsAction
-import com.tangem.tap.features.wallet.redux.Artwork
 import com.tangem.tap.features.wallet.redux.ErrorType
 import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.features.wallet.redux.WalletAction
@@ -53,11 +52,14 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-        activity?.onBackPressedDispatcher?.addCallback(this, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
-            }
-        })
+        activity?.onBackPressedDispatcher?.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
+                }
+            },
+        )
         val inflater = TransitionInflater.from(requireContext())
         enterTransition = inflater.inflateTransition(R.transition.slide_right)
         exitTransition = inflater.inflateTransition(R.transition.fade)
@@ -110,7 +112,6 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
         }
     }
 
-
     override fun newState(state: WalletState) {
         if (activity == null || view == null) return
 
@@ -142,7 +143,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
         }
 
         setupNoInternetHandling(state)
-        setupCardImage(state.cardImage)
+        setupCardImage(state)
 
         if (!isSaltPay) showWarningsIfPresent(state.mainWarningsList)
 
@@ -167,7 +168,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
                 binding.srlWallet.isRefreshing = false
                 (activity as? MainActivity)?.showSnackbar(
                     text = R.string.wallet_notification_no_internet,
-                    buttonTitle = R.string.common_retry
+                    buttonTitle = R.string.common_retry,
                 ) { store.dispatch(WalletAction.LoadData) }
             }
         } else {
@@ -175,13 +176,24 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
         }
     }
 
-    private fun setupCardImage(cardImage: Artwork?) {
-        binding.ivCard.load(cardImage?.artworkId) {
-            scale(Scale.FIT)
-            crossfade(enable = true)
-            placeholder(R.drawable.card_placeholder_black)
-            error(R.drawable.card_placeholder_black)
-            fallback(R.drawable.card_placeholder_black)
+    private fun setupCardImage(state: WalletState) {
+        //TODO: SaltPay: remove hardCode
+        if (store.state.globalState.scanResponse?.isSaltPay() == true) {
+            binding.ivCard.load(R.drawable.img_salt_pay_visa) {
+                scale(Scale.FIT)
+                crossfade(enable = true)
+                placeholder(R.drawable.card_placeholder_black)
+                error(R.drawable.card_placeholder_black)
+                fallback(R.drawable.card_placeholder_black)
+            }
+        } else {
+            binding.ivCard.load(state.cardImage?.artworkId) {
+                scale(Scale.FIT)
+                crossfade(enable = true)
+                placeholder(R.drawable.card_placeholder_black)
+                error(R.drawable.card_placeholder_black)
+                fallback(R.drawable.card_placeholder_black)
+            }
         }
     }
 
@@ -190,11 +202,13 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
             R.id.details_menu -> {
                 store.dispatch(GlobalAction.UpdateFeedbackInfo(store.state.walletState.walletManagers))
                 store.state.globalState.scanResponse?.let { scanNoteResponse ->
-                    store.dispatch(DetailsAction.PrepareScreen(
-                        scanNoteResponse,
-                        store.state.walletState.walletManagers.map { it.wallet },
-                        CardTou(),
-                    ))
+                    store.dispatch(
+                        DetailsAction.PrepareScreen(
+                            scanNoteResponse,
+                            store.state.walletState.walletManagers.map { it.wallet },
+                            CardTou(),
+                        ),
+                    )
                     store.dispatch(NavigationAction.NavigateTo(AppScreen.Details))
                     true
                 }
@@ -207,5 +221,4 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         if (store.state.walletState.shouldShowDetails) inflater.inflate(R.menu.wallet, menu)
     }
-
 }
\ No newline at end of file