From 2522072ec6ca5216ded9f79726077a87de7c8cd5 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 11 Dec 2020 11:01:36 +0300 Subject: [PATCH 1/4] 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(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) { From abccafead4eaf8bb85d46761cbbd9f5a0927a0af Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 11 Dec 2020 13:13:08 +0300 Subject: [PATCH 2/4] Updated on 2026-08-14 --- .../com/tangem/tap/features/wallet/redux/WalletMiddleware.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletMiddleware.kt index 2d7032ba07..ca8e438a96 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletMiddleware.kt @@ -282,9 +282,10 @@ private class TopUpMiddleware { when (action) { is WalletAction.TopUpAction.TopUp -> { val config = store.state.globalState.configManager?.config ?: return + val defaultAddress = store.state.walletState.walletAddresses!!.list[0].address val url = TopUpHelper.getUrl( store.state.walletState.currencyData.currencySymbol!!, - store.state.walletState.walletAddresses!!.selectedAddress.address, + defaultAddress, config.moonPayApiKey, config.moonPayApiSecretKey ) From ea875f01126e7003cbb48ca3cfc6116389835715 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 11 Dec 2020 13:14:58 +0300 Subject: [PATCH 3/4] Updated on 2026-08-14 --- .../java/com/tangem/tap/common/extensions/Navigation.kt | 6 +----- 1 file changed, 1 insertion(+), 5 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 8f6f36f982..56f0d70061 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,11 +18,7 @@ import com.tangem.wallet.R fun FragmentActivity.openFragment(screen: AppScreen, addToBackStack: Boolean = true) { val transaction = this.supportFragmentManager.beginTransaction() - 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) - } + transaction.replace(R.id.fragment_container, fragmentFactory(screen), screen.name) if (addToBackStack && screen != AppScreen.Home) transaction.addToBackStack(null) transaction.commitAllowingStateLoss() } From 993e166299c5216d5f08448e3324b5e30ba9edd7 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 11 Dec 2020 13:24:00 +0300 Subject: [PATCH 4/4] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/MainActivity.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt index ccc80bb0db..2a20c88628 100644 --- a/app/src/main/java/com/tangem/tap/MainActivity.kt +++ b/app/src/main/java/com/tangem/tap/MainActivity.kt @@ -88,6 +88,7 @@ class MainActivity : AppCompatActivity() { if (tag != null) { intent.action = null store.dispatch(NavigationAction.NavigateTo(AppScreen.Home)) + store.dispatch(NavigationAction.PopBackTo(AppScreen.Home)) store.dispatch(HomeAction.ReadCard) } }