Merge pull request #1539 from novasamatech/rc/7.12.3

Rc/7.12.3
novasamatech · May 30, 2024 · 1262a7f · 1262a7f
2 parents e452250 + f6ba517
commit 1262a7f
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '7.12.2'
-        versionCode = 134
+        versionName = '7.12.3'
+        versionCode = 135
 
         applicationId = "io.novafoundation.nova"
         releaseApplicationSuffix = "market"

diff --git a/feature-deep-linking/build.gradle b/feature-deep-linking/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation project(':feature-governance-api')
     implementation project(':feature-currency-api')
     implementation project(':feature-buy-api')
+    implementation project(":feature-wallet-connect-api")
 
     implementation kotlinDep
 

diff --git a/...c/main/java/io/novafoundation/nova/feature_deep_linking/di/DeepLinkingFeatureComponent.kt b/...c/main/java/io/novafoundation/nova/feature_deep_linking/di/DeepLinkingFeatureComponent.kt
@@ -8,6 +8,7 @@ import io.novafoundation.nova.feature_account_api.di.AccountFeatureApi
 import io.novafoundation.nova.feature_dapp_api.di.DAppFeatureApi
 import io.novafoundation.nova.feature_deep_linking.presentation.handling.DeepLinkingRouter
 import io.novafoundation.nova.feature_governance_api.di.GovernanceFeatureApi
+import io.novafoundation.nova.feature_wallet_connect_api.di.WalletConnectFeatureApi
 import io.novafoundation.nova.runtime.di.RuntimeApi
 
 @Component(
@@ -36,7 +37,8 @@ interface DeepLinkingFeatureComponent : DeepLinkingFeatureApi {
             RuntimeApi::class,
             AccountFeatureApi::class,
             GovernanceFeatureApi::class,
-            DAppFeatureApi::class
+            DAppFeatureApi::class,
+            WalletConnectFeatureApi::class
         ]
     )
     interface DeepLinkingFeatureDependenciesComponent : DeepLinkingFeatureDependencies

diff --git a/...ain/java/io/novafoundation/nova/feature_deep_linking/di/DeepLinkingFeatureDependencies.kt b/...ain/java/io/novafoundation/nova/feature_deep_linking/di/DeepLinkingFeatureDependencies.kt
@@ -15,6 +15,7 @@ import io.novafoundation.nova.feature_dapp_api.data.repository.DAppMetadataRepos
 import io.novafoundation.nova.feature_governance_api.data.MutableGovernanceState
 import io.novafoundation.nova.feature_governance_api.data.source.GovernanceSourceRegistry
 import io.novafoundation.nova.feature_governance_api.presentation.referenda.common.ReferendaStatusFormatter
+import io.novafoundation.nova.feature_wallet_connect_api.presentation.WalletConnectService
 import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry
 
 interface DeepLinkingFeatureDependencies {
@@ -50,4 +51,6 @@ interface DeepLinkingFeatureDependencies {
     val mutableGovernanceState: MutableGovernanceState
 
     val encryptionDefaults: EncryptionDefaults
+
+    val walletConnectService: WalletConnectService
 }
diff --git a/.../src/main/java/io/novafoundation/nova/feature_deep_linking/di/DeepLinkingFeatureHolder.kt b/.../src/main/java/io/novafoundation/nova/feature_deep_linking/di/DeepLinkingFeatureHolder.kt
@@ -6,6 +6,7 @@ import io.novafoundation.nova.feature_account_api.di.AccountFeatureApi
 import io.novafoundation.nova.feature_dapp_api.di.DAppFeatureApi
 import io.novafoundation.nova.feature_deep_linking.presentation.handling.DeepLinkingRouter
 import io.novafoundation.nova.feature_governance_api.di.GovernanceFeatureApi
+import io.novafoundation.nova.feature_wallet_connect_api.di.WalletConnectFeatureApi
 import io.novafoundation.nova.runtime.di.RuntimeApi
 import javax.inject.Inject
 
@@ -21,6 +22,7 @@ class DeepLinkingFeatureHolder @Inject constructor(
             .accountFeatureApi(getFeature(AccountFeatureApi::class.java))
             .governanceFeatureApi(getFeature(GovernanceFeatureApi::class.java))
             .dAppFeatureApi(getFeature(DAppFeatureApi::class.java))
+            .walletConnectFeatureApi(getFeature(WalletConnectFeatureApi::class.java))
             .build()
 
         return DaggerDeepLinkingFeatureComponent.factory()

diff --git a/.../src/main/java/io/novafoundation/nova/feature_deep_linking/di/DeepLinkingFeatureModule.kt b/.../src/main/java/io/novafoundation/nova/feature_deep_linking/di/DeepLinkingFeatureModule.kt
@@ -3,7 +3,6 @@ package io.novafoundation.nova.feature_deep_linking.di
 import dagger.Module
 import dagger.Provides
 import io.novafoundation.nova.app.root.presentation.deepLinks.handlers.AssetDetailsDeepLinkHandler
-import io.novafoundation.nova.app.root.presentation.deepLinks.handlers.BuyCallbackDeepLinkHandler
 import io.novafoundation.nova.app.root.presentation.deepLinks.handlers.DAppDeepLinkHandler
 import io.novafoundation.nova.app.root.presentation.deepLinks.handlers.ImportMnemonicDeepLinkHandler
 import io.novafoundation.nova.app.root.presentation.deepLinks.handlers.ReferendumDeepLinkHandler
@@ -15,7 +14,10 @@ import io.novafoundation.nova.feature_account_api.domain.interfaces.AccountRepos
 import io.novafoundation.nova.feature_dapp_api.data.repository.DAppMetadataRepository
 import io.novafoundation.nova.feature_deep_linking.presentation.handling.DeepLinkingRouter
 import io.novafoundation.nova.feature_deep_linking.presentation.handling.RootDeepLinkHandler
+import io.novafoundation.nova.feature_deep_linking.presentation.handling.handlers.BuyCallbackDeepLinkHandler
+import io.novafoundation.nova.feature_deep_linking.presentation.handling.handlers.WalletConnectPairDeeplinkHandler
 import io.novafoundation.nova.feature_governance_api.data.MutableGovernanceState
+import io.novafoundation.nova.feature_wallet_connect_api.presentation.WalletConnectService
 import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry
 
 @Module()
@@ -71,6 +73,12 @@ class DeepLinkingFeatureModule {
         resourceManager: ResourceManager
     ) = BuyCallbackDeepLinkHandler(resourceManager)
 
+    @Provides
+    fun provideWalletConnectDeepLinkHandler(
+        walletConnectService: WalletConnectService,
+        automaticInteractionGate: AutomaticInteractionGate
+    ) = WalletConnectPairDeeplinkHandler(walletConnectService, automaticInteractionGate)
+
     @Provides
     fun provideAssetDetailsDeepLinkHandler(
         deepLinkingRouter: DeepLinkingRouter,
@@ -93,15 +101,17 @@ class DeepLinkingFeatureModule {
         dappDeepLinkHandler: DAppDeepLinkHandler,
         referendumDeepLinkHandler: ReferendumDeepLinkHandler,
         buyCallbackDeepLinkHandler: BuyCallbackDeepLinkHandler,
-        assetDetailsDeepLinkHandler: AssetDetailsDeepLinkHandler
+        assetDetailsDeepLinkHandler: AssetDetailsDeepLinkHandler,
+        walletConnectPairDeeplinkHandler: WalletConnectPairDeeplinkHandler,
     ): RootDeepLinkHandler {
         val deepLinkHandlers = listOf(
             stakingDashboardDeepLinkHandler,
             importMnemonicDeepLinkHandler,
             dappDeepLinkHandler,
             referendumDeepLinkHandler,
             buyCallbackDeepLinkHandler,
-            assetDetailsDeepLinkHandler
+            assetDetailsDeepLinkHandler,
+            walletConnectPairDeeplinkHandler
         )
 
         return RootDeepLinkHandler(deepLinkHandlers)

diff --git a/...on/nova/feature_deep_linking/presentation/handling/handlers/BuyCallbackDeepLinkHandler.kt b/...on/nova/feature_deep_linking/presentation/handling/handlers/BuyCallbackDeepLinkHandler.kt
@@ -1,4 +1,4 @@
-package io.novafoundation.nova.app.root.presentation.deepLinks.handlers
+package io.novafoundation.nova.feature_deep_linking.presentation.handling.handlers
 
 import android.net.Uri
 import io.novafoundation.nova.common.resources.ResourceManager

diff --git a/...nnect/WalletConnectPairDeeplinkHandler.kt → ...dlers/WalletConnectPairDeeplinkHandler.kt b/...nnect/WalletConnectPairDeeplinkHandler.kt → ...dlers/WalletConnectPairDeeplinkHandler.kt
@@ -1,4 +1,4 @@
-package io.novafoundation.nova.app.root.presentation.deepLinks.handlers.walletConnect
+package io.novafoundation.nova.feature_deep_linking.presentation.handling.handlers
 
 import android.net.Uri
 import io.novafoundation.nova.common.utils.sequrity.AutomaticInteractionGate