From 2522072ec6ca5216ded9f79726077a87de7c8cd5 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 11 Dec 2020 11:01:36 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/src/main/java/com/tangem/tap/MainActivity.kt     |  2 +-
 .../com/tangem/tap/common/extensions/Navigation.kt   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index ef059014db..ccc80bb0db 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -87,7 +87,7 @@ class MainActivity : AppCompatActivity() {
             val tag = intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)
             if (tag != null) {
                 intent.action = null
-                store.dispatch(NavigationAction.NavigateTo(AppScreen.Home, false))
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.Home))
                 store.dispatch(HomeAction.ReadCard)
             }
         }
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 28b425b515..8f6f36f982 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
@@ -18,13 +18,13 @@ import com.tangem.wallet.R
 
 fun FragmentActivity.openFragment(screen: AppScreen, addToBackStack: Boolean = true) {
     val transaction = this.supportFragmentManager.beginTransaction()
-            .add(
-                    R.id.fragment_container,
-                    fragmentFactory(screen),
-                    screen.name
-            )
+            if (screen == AppScreen.Home) {
+                transaction.replace(R.id.fragment_container, fragmentFactory(screen), screen.name)
+            } else {
+                transaction.add(R.id.fragment_container, fragmentFactory(screen), screen.name)
+            }
     if (addToBackStack && screen != AppScreen.Home) transaction.addToBackStack(null)
-    transaction.commitAllowingStateLoss();
+    transaction.commitAllowingStateLoss()
 }
 
 fun FragmentActivity.popBackTo(screen: AppScreen?, inclusive: Boolean = false) {