From 6e1c51584bdf735076ed26e6d611f2c7b88f0824 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 16 Mar 2020 20:04:16 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../fragment/wallet/LoadedWalletFragment.kt   | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
index 0f304ba5db..806431837a 100644
--- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
@@ -124,6 +124,16 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
             val tag = arguments!!.getParcelable<Tag>(NfcAdapter.EXTRA_TAG)
             if (tag != null) onTagDiscovered(tag)
         }
+
+        viewModel = ViewModelProviders.of(this).get(LoadedWalletViewModel::class.java)
+
+        // set rate info to CoinData
+        viewModel.getRateInfo().observe(this, Observer<Float> { rate ->
+            ctx.coinData.rate = rate
+            ctx.coinData.rateAlter = rate
+            updateViews()
+        })
+        viewModel.requestRateInfo(ctx)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -299,21 +309,6 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
         startVerify(lastTag)
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        viewModel = ViewModelProviders.of(this).get(LoadedWalletViewModel::class.java)
-
-        // set rate info to CoinData
-        viewModel.getRateInfo().observe(this, Observer<Float> { rate ->
-            ctx.coinData.rate = rate
-            ctx.coinData.rateAlter = rate
-            requestCounter--
-            updateViews()
-        })
-        requestCounter++
-        viewModel.requestRateInfo(ctx)
-    }
-
     override fun onPause() {
         super.onPause()
         if (timerHideErrorAndMessage != null) {
@@ -720,10 +715,8 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
 
         requestBalanceAndUnspentTransactions()
 
-        if (::viewModel.isInitialized) {
-            requestCounter++
+        if (::viewModel.isInitialized)
             viewModel.requestRateInfo(ctx)
-        }
 
         if (requestCounter == 0) {
             // if no connection and no requests posted