diff --git a/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt b/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
index c86e0f9392..45dae620de 100644
--- a/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
+++ b/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
@@ -4,6 +4,8 @@ import com.tangem.TangemSdkLogger
 import com.tangem.blockchainsdk.BlockchainSDKFactory
 import com.tangem.core.analytics.filter.OneTimeEventFilter
 import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+import com.tangem.core.navigation.share.ShareManager
+import com.tangem.core.navigation.url.UrlOpener
 import com.tangem.datasource.asset.loader.AssetLoader
 import com.tangem.datasource.config.ConfigManager
 import com.tangem.datasource.connection.NetworkConnectionManager
@@ -110,4 +112,8 @@ interface ApplicationEntryPoint {
     fun getDetailsFeatureToggles(): DetailsFeatureToggles
 
     fun getDetailsEntryPoint(): DetailsEntryPoint
+
+    fun getUrlOpener(): UrlOpener
+
+    fun getShareManager(): ShareManager
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/TangemApplication.kt b/app/src/main/java/com/tangem/tap/TangemApplication.kt
index 47aeee6e6f..414c48552b 100644
--- a/app/src/main/java/com/tangem/tap/TangemApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TangemApplication.kt
@@ -181,7 +181,6 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
 
     private val saveBlockchainErrorUseCase: SaveBlockchainErrorUseCase
         get() = entryPoint.getSaveBlockchainErrorUseCase()
-    // endregion
 
     private val detailsFeatureToggles: DetailsFeatureToggles
         get() = entryPoint.getDetailsFeatureToggles()
@@ -189,6 +188,13 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
     private val detailsEntryPoint: DetailsEntryPoint
         get() = entryPoint.getDetailsEntryPoint()
 
+    private val urlOpener
+        get() = entryPoint.getUrlOpener()
+
+    private val shareManager
+        get() = entryPoint.getShareManager()
+    // endregion
+
     override fun onCreate() {
         super.onCreate()
 
@@ -276,6 +282,8 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
                     saveBlockchainErrorUseCase = saveBlockchainErrorUseCase,
                     detailsFeatureToggles = detailsFeatureToggles,
                     detailsEntryPoint = detailsEntryPoint,
+                    urlOpener = urlOpener,
+                    shareManager = shareManager,
                 ),
             ),
         )
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Store.kt b/app/src/main/java/com/tangem/tap/common/extensions/Store.kt
index 3d7a938cf3..6c7ab7e524 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Store.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Store.kt
@@ -5,8 +5,6 @@ import com.tangem.domain.redux.StateDialog
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
-import com.tangem.tap.common.share.shareManager
-import com.tangem.tap.common.url.urlOpener
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.scope
@@ -83,12 +81,12 @@ suspend fun dispatchOnMain(vararg actions: Action) {
     withMainContext { actions.forEach { store.dispatch(it) } }
 }
 
-fun Store<*>.dispatchOpenUrl(url: String) {
-    urlOpener.openUrl(url)
+fun Store<AppState>.dispatchOpenUrl(url: String) {
+    inject(DaggerGraphState::urlOpener).openUrl(url)
 }
 
-fun Store<*>.dispatchShare(url: String) {
-    shareManager.shareText(url)
+fun Store<AppState>.dispatchShare(url: String) {
+    inject(DaggerGraphState::shareManager).shareText(url)
 }
 
 inline fun <reified T> Store<AppState>.inject(getDependency: DaggerGraphState.() -> T?): T {
diff --git a/app/src/main/java/com/tangem/tap/common/share/IntentShareManager.kt b/app/src/main/java/com/tangem/tap/common/share/IntentShareManager.kt
index e681c2c36f..51b829de5f 100644
--- a/app/src/main/java/com/tangem/tap/common/share/IntentShareManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/share/IntentShareManager.kt
@@ -5,9 +5,7 @@ import com.tangem.core.navigation.share.ShareManager
 import com.tangem.tap.foregroundActivityObserver
 import com.tangem.tap.withForegroundActivity
 
-internal val shareManager = IntentShareManager
-
-internal object IntentShareManager : ShareManager {
+internal class IntentShareManager : ShareManager {
 
     override fun shareText(text: String) {
         foregroundActivityObserver.withForegroundActivity { activity ->
diff --git a/app/src/main/java/com/tangem/tap/common/ui/RussianCardholdersWarningBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/common/ui/RussianCardholdersWarningBottomSheetDialog.kt
index 05dd766362..5b0ac2e000 100644
--- a/app/src/main/java/com/tangem/tap/common/ui/RussianCardholdersWarningBottomSheetDialog.kt
+++ b/app/src/main/java/com/tangem/tap/common/ui/RussianCardholdersWarningBottomSheetDialog.kt
@@ -9,7 +9,6 @@ import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.dispatchDialogHide
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.redux.AppDialog
-import com.tangem.tap.common.url.urlOpener
 import com.tangem.tap.store
 import com.tangem.wallet.databinding.DialogRussiansCardholdersWarningBinding
 
@@ -44,7 +43,7 @@ class RussianCardholdersWarningBottomSheetDialog(
             dismiss()
         }
         binding?.btnNo?.setOnClickListener {
-            urlOpener.openUrl(INSTRUCTION_URL)
+            store.dispatchOpenUrl(INSTRUCTION_URL)
             dismiss()
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/common/url/CustomTabsUrlOpener.kt b/app/src/main/java/com/tangem/tap/common/url/CustomTabsUrlOpener.kt
index 72ec8c830c..549f514b01 100644
--- a/app/src/main/java/com/tangem/tap/common/url/CustomTabsUrlOpener.kt
+++ b/app/src/main/java/com/tangem/tap/common/url/CustomTabsUrlOpener.kt
@@ -15,9 +15,7 @@ import com.tangem.tap.foregroundActivityObserver
 import com.tangem.tap.withForegroundActivity
 import com.tangem.wallet.R
 
-internal val urlOpener = CustomTabsUrlOpener
-
-internal object CustomTabsUrlOpener : UrlOpener {
+internal class CustomTabsUrlOpener : UrlOpener {
 
     override fun openUrl(url: String) {
         foregroundActivityObserver.withForegroundActivity {
diff --git a/app/src/main/java/com/tangem/tap/di/UtilsModule.kt b/app/src/main/java/com/tangem/tap/di/UtilsModule.kt
index 2fd4252342..fd11c7ef1a 100644
--- a/app/src/main/java/com/tangem/tap/di/UtilsModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/UtilsModule.kt
@@ -20,11 +20,11 @@ internal object UtilsModule {
 
     @Provides
     @Singleton
-    fun provideShareManager(): ShareManager = IntentShareManager
+    fun provideShareManager(): ShareManager = IntentShareManager()
 
     @Provides
     @Singleton
-    fun provideUrlOpener(): UrlOpener = CustomTabsUrlOpener
+    fun provideUrlOpener(): UrlOpener = CustomTabsUrlOpener()
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
index df60e9704e..e7ac985d9f 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
@@ -18,11 +18,11 @@ import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.extensions.addContext
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.feedback.FeedbackEmail
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
-import com.tangem.tap.common.url.urlOpener
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
@@ -180,7 +180,7 @@ internal class DetailsViewModel(
 
     private fun handleSocialNetworkClick(link: SocialNetworkLink) {
         Analytics.send(Settings.ButtonSocialNetwork(link.network))
-        urlOpener.openUrl(link.url)
+        store.dispatchOpenUrl(link.url)
     }
 
     private fun getSocialLinks(): ImmutableList<SocialNetworkLink> {
diff --git a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
index 3dc61535c0..08d6c0997f 100644
--- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
@@ -3,6 +3,8 @@ package com.tangem.tap.proxy.redux
 import com.tangem.TangemSdkLogger
 import com.tangem.blockchainsdk.BlockchainSDKFactory
 import com.tangem.core.navigation.email.EmailSender
+import com.tangem.core.navigation.share.ShareManager
+import com.tangem.core.navigation.url.UrlOpener
 import com.tangem.datasource.asset.loader.AssetLoader
 import com.tangem.datasource.connection.NetworkConnectionManager
 import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
@@ -34,8 +36,8 @@ import com.tangem.features.staking.api.navigation.StakingRouter
 import com.tangem.features.tester.api.TesterRouter
 import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
 import com.tangem.features.wallet.navigation.WalletRouter
-import com.tangem.tap.domain.walletconnect2.domain.WalletConnectInteractor
 import com.tangem.tap.domain.walletconnect2.domain.LegacyWalletConnectRepository
+import com.tangem.tap.domain.walletconnect2.domain.WalletConnectInteractor
 import com.tangem.tap.domain.walletconnect2.domain.WalletConnectSessionsRepository
 import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles
 import com.tangem.tap.proxy.AppStateHolder
@@ -81,4 +83,6 @@ data class DaggerGraphState(
     val detailsFeatureToggles: DetailsFeatureToggles? = null,
     val detailsEntryPoint: DetailsEntryPoint? = null,
     val stakingRouter: StakingRouter? = null,
+    val urlOpener: UrlOpener? = null,
+    val shareManager: ShareManager? = null,
 ) : StateType
\ No newline at end of file