Migrate web3modal to appkit

core/bom/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
         api(project(":core:modal"))
         api(project(":protocol:sign"))
         api(project(":protocol:notify"))
-        api(project(":product:web3modal"))
+        api(project(":product:appkit"))
         api(project(":product:walletkit"))
     }
 }

product/web3modal/build.gradle.kts → product/appkit/build.gradle.kts

@@ -14,7 +14,7 @@ project.apply {
 }
 
 android {
-    namespace = "com.walletconnect.web3.modal"
+    namespace = "com.reown.appkit"
     compileSdk = COMPILE_SDK
 
     defaultConfig {

product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/TestUtils.kt → product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/TestUtils.kt

@@ -1,4 +1,4 @@
-package com.walletconnect.web3.modal.ui
+package com.reown.appkit.ui
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -8,8 +8,8 @@ import androidx.navigation.compose.ComposeNavigator
 import androidx.navigation.compose.composable
 import androidx.navigation.createGraph
 import androidx.navigation.testing.TestNavHostController
-import com.walletconnect.web3.modal.ui.navigation.Route
-import com.walletconnect.web3.modal.ui.navigation.addTitleArg
+import com.reown.appkit.ui.navigation.Route
+import com.reown.appkit.ui.navigation.addTitleArg
 
 @Composable
 fun rememberTestNavController(): TestNavHostController {

product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt → product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBarTest.kt

@@ -1,14 +1,14 @@
-package com.walletconnect.web3.modal.ui.components.internal
+package com.reown.appkit.ui.components.internal
 
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon
-import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription
-import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags
-import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition
+import com.reown.appkit.ui.components.internal.commons.BackArrowIcon
+import com.reown.appkit.ui.components.internal.commons.ContentDescription
+import com.reown.appkit.ui.components.internal.commons.TestTags
+import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition
 import org.junit.Rule
 import org.junit.Test
 import org.junit.Assert.*

product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt → product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootStateTest.kt

@@ -1,11 +1,11 @@
-package com.walletconnect.web3.modal.ui.components.internal.root
+package com.reown.appkit.ui.components.internal.root
 
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.test.junit4.createComposeRule
-import com.walletconnect.web3.modal.ui.navigation.Route
-import com.walletconnect.web3.modal.ui.rememberTestNavController
+import com.reown.appkit.ui.navigation.Route
+import com.reown.appkit.ui.rememberTestNavController
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Rule

product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt → product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootTest.kt

@@ -1,16 +1,16 @@
-package com.walletconnect.web3.modal.ui.components.internal.root
+package com.reown.appkit.ui.components.internal.root
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
-import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription
-import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags
-import com.walletconnect.web3.modal.ui.navigation.Route
-import com.walletconnect.web3.modal.ui.rememberTestNavController
-import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition
+import com.reown.appkit.ui.components.internal.commons.ContentDescription
+import com.reown.appkit.ui.components.internal.commons.TestTags
+import com.reown.appkit.ui.navigation.Route
+import com.reown.appkit.ui.rememberTestNavController
+import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition
 import org.junit.Rule
 import org.junit.Test
 

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt → product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt

@@ -1,4 +1,4 @@
-package com.walletconnect.web3.modal.client
+package com.reown.appkit.client
 
 import androidx.activity.ComponentActivity
 import com.reown.android.internal.common.di.AndroidCommonDITags
@@ -10,16 +10,16 @@ import com.reown.sign.client.Sign
 import com.reown.sign.client.SignClient
 import com.reown.sign.common.exceptions.SignClientAlreadyInitializedException
 import com.walletconnect.util.Empty
-import com.walletconnect.web3.modal.client.models.Account
-import com.walletconnect.web3.modal.client.models.Session
-import com.walletconnect.web3.modal.client.models.AppKitClientAlreadyInitializedException
-import com.walletconnect.web3.modal.client.models.request.Request
-import com.walletconnect.web3.modal.client.models.request.SentRequestResult
-import com.walletconnect.web3.modal.di.appKitModule
-import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate
-import com.walletconnect.web3.modal.domain.model.Session.WalletConnect
-import com.walletconnect.web3.modal.domain.model.toModalError
-import com.walletconnect.web3.modal.engine.AppKitEngine
+import com.reown.appkit.client.models.Account
+import com.reown.appkit.client.models.Session
+import com.reown.appkit.client.models.AppKitClientAlreadyInitializedException
+import com.reown.appkit.client.models.request.Request
+import com.reown.appkit.client.models.request.SentRequestResult
+import com.reown.appkit.di.appKitModule
+import com.reown.appkit.domain.delegate.AppKitDelegate
+import com.reown.appkit.domain.model.Session.WalletConnect
+import com.reown.appkit.domain.model.toModalError
+import com.reown.appkit.engine.AppKitEngine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.jetbrains.annotations.ApiStatus.Experimental
@@ -221,7 +221,7 @@ object AppKit {
 
     @Deprecated(
         message = "Modal.Params.Request is deprecated",
-        replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.models.Request")
+        replaceWith = ReplaceWith("com.reown.appkit.client.models.Request")
     )
     fun request(
         request: Modal.Params.Request,
@@ -302,7 +302,7 @@ object AppKit {
      */
     @Deprecated(
         message = "Getting active session is replaced with getAccount()",
-        replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.AppKit.getAccount()"),
+        replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"),
         level = DeprecationLevel.WARNING
     )
     internal fun getActiveSessionByTopic(topic: String) = SignClient.getActiveSessionByTopic(topic)?.toModal()
@@ -313,7 +313,7 @@ object AppKit {
      */
     @Deprecated(
         message = "Getting active session is replaced with getAccount()",
-        replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.AppKit.getAccount()"),
+        replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"),
         level = DeprecationLevel.WARNING
     )
     fun getActiveSession(): Modal.Model.Session? {

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt → product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt

@@ -1,10 +1,10 @@
-package com.walletconnect.web3.modal.client
+package com.reown.appkit.client
 
 import com.reown.android.internal.common.signing.cacao.Cacao
 import com.reown.sign.client.Sign
-import com.walletconnect.web3.modal.client.models.Account
-import com.walletconnect.web3.modal.client.models.Session
-import com.walletconnect.web3.modal.client.models.request.Request
+import com.reown.appkit.client.models.Account
+import com.reown.appkit.client.models.Session
+import com.reown.appkit.client.models.request.Request
 import java.text.SimpleDateFormat
 import java.util.Calendar
 

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt → product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt

@@ -1,4 +1,4 @@
-package com.walletconnect.web3.modal.client
+package com.reown.appkit.client
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.Keep
@@ -57,7 +57,7 @@ object Modal {
 
         @Deprecated(
             message = "Converted to sealed class to support multiple connectors",
-            replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.models.Request"),
+            replaceWith = ReplaceWith("com.reown.appkit.client.models.Request"),
             level = DeprecationLevel.WARNING
         )
         data class Request(
@@ -186,7 +186,7 @@ object Modal {
 
         @Deprecated(
             message = "Converted to sealed class to support multiple connectors",
-            replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.models.SentRequestResult"),
+            replaceWith = ReplaceWith("com.reown.appkit.client.models.SentRequestResult"),
             level = DeprecationLevel.WARNING
         )
         data class SentRequest(

product/appkit/src/main/kotlin/com/reown/appkit/client/models/Account.kt

@@ -0,0 +1,8 @@
+package com.reown.appkit.client.models
+
+import com.reown.appkit.client.Modal
+
+data class Account(
+    val address: String,
+    val chain: Modal.Model.Chain
+)

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt → product/appkit/src/main/kotlin/com/reown/appkit/client/models/Exceptions.kt

@@ -1,4 +1,4 @@
-package com.walletconnect.web3.modal.client.models
+package com.reown.appkit.client.models
 
 import com.reown.android.internal.common.exception.WalletConnectException
 

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt → product/appkit/src/main/kotlin/com/reown/appkit/client/models/Session.kt

@@ -1,7 +1,7 @@
-package com.walletconnect.web3.modal.client.models
+package com.reown.appkit.client.models
 
 import com.reown.android.Core
-import com.walletconnect.web3.modal.client.Modal
+import com.reown.appkit.client.Modal
 
 sealed class Session {
 

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/Request.kt → product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/Request.kt

@@ -1,4 +1,4 @@
-package com.walletconnect.web3.modal.client.models.request
+package com.reown.appkit.client.models.request
 
 data class Request(
     val method: String,

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt → product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/SentRequestResult.kt

@@ -1,7 +1,7 @@
-package com.walletconnect.web3.modal.client.models.request
+package com.reown.appkit.client.models.request
 
 import com.reown.sign.client.Sign
-import com.walletconnect.web3.modal.engine.coinbase.CoinbaseResult
+import com.reown.appkit.engine.coinbase.CoinbaseResult
 
 sealed class SentRequestResult {
     abstract val method: String

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt → product/appkit/src/main/kotlin/com/reown/appkit/data/BalanceRpcRepository.kt

@@ -1,11 +1,11 @@
-package com.walletconnect.web3.modal.data
+package com.reown.appkit.data
 
 import com.reown.foundation.util.Logger
-import com.walletconnect.web3.modal.client.Modal
-import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRequest
-import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRpcResponse
-import com.walletconnect.web3.modal.data.network.BalanceService
-import com.walletconnect.web3.modal.domain.model.Balance
+import com.reown.appkit.client.Modal
+import com.reown.appkit.data.json_rpc.balance.BalanceRequest
+import com.reown.appkit.data.json_rpc.balance.BalanceRpcResponse
+import com.reown.appkit.data.network.BalanceService
+import com.reown.appkit.domain.model.Balance
 
 internal class BalanceRpcRepository(
     private val balanceService: BalanceService,

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt → product/appkit/src/main/kotlin/com/reown/appkit/data/BlockchainRepository.kt

@@ -1,9 +1,9 @@
-package com.walletconnect.web3.modal.data
+package com.reown.appkit.data
 
 import com.reown.android.internal.common.model.ProjectId
-import com.walletconnect.web3.modal.data.model.IdentityDTO
-import com.walletconnect.web3.modal.data.network.BlockchainService
-import com.walletconnect.web3.modal.domain.model.Identity
+import com.reown.appkit.data.model.IdentityDTO
+import com.reown.appkit.data.network.BlockchainService
+import com.reown.appkit.domain.model.Identity
 
 internal class BlockchainRepository(
     private val blockchainService: BlockchainService,

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/JsonRpcMethod.kt → product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/JsonRpcMethod.kt

@@ -1,4 +1,4 @@
-package com.walletconnect.web3.modal.data.json_rpc
+package com.reown.appkit.data.json_rpc
 
 internal object JsonRpcMethod {
     @get:JvmSynthetic

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpc.kt → product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt

@@ -1,9 +1,9 @@
-package com.walletconnect.web3.modal.data.json_rpc.balance
+package com.reown.appkit.data.json_rpc.balance
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.walletconnect.util.generateId
-import com.walletconnect.web3.modal.data.json_rpc.JsonRpcMethod
+import com.reown.appkit.data.json_rpc.JsonRpcMethod
 
 @JsonClass(generateAdapter = true)
 internal data class BalanceRequest(

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpcResponse.kt → product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpcResponse.kt

@@ -1,4 +1,4 @@
-package com.walletconnect.web3.modal.data.json_rpc.balance
+package com.reown.appkit.data.json_rpc.balance
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/model/IdentityDTO.kt → product/appkit/src/main/kotlin/com/reown/appkit/data/model/IdentityDTO.kt

@@ -1,4 +1,4 @@
-package com.walletconnect.web3.modal.data.model
+package com.reown.appkit.data.model
 
 import com.squareup.moshi.Json
 

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BalanceService.kt → product/appkit/src/main/kotlin/com/reown/appkit/data/network/BalanceService.kt

@@ -1,7 +1,7 @@
-package com.walletconnect.web3.modal.data.network
+package com.reown.appkit.data.network
 
-import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRequest
-import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRpcResponse
+import com.reown.appkit.data.json_rpc.balance.BalanceRequest
+import com.reown.appkit.data.json_rpc.balance.BalanceRpcResponse
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BlockchainService.kt → product/appkit/src/main/kotlin/com/reown/appkit/data/network/BlockchainService.kt

@@ -1,6 +1,6 @@
-package com.walletconnect.web3.modal.data.network
+package com.reown.appkit.data.network
 
-import com.walletconnect.web3.modal.data.model.IdentityDTO
+import com.reown.appkit.data.model.IdentityDTO
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Path

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt → product/appkit/src/main/kotlin/com/reown/appkit/di/AppKitDITags.kt

@@ -1,4 +1,4 @@
-package com.walletconnect.web3.modal.di
+package com.reown.appkit.di
 
 internal enum class AppKitDITags {
     BALANCE_RPC_RETROFIT,

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt → product/appkit/src/main/kotlin/com/reown/appkit/di/BalanceRpcModule.kt

@@ -1,9 +1,9 @@
-package com.walletconnect.web3.modal.di
+package com.reown.appkit.di
 
 import com.reown.android.internal.common.di.AndroidCommonDITags
-import com.walletconnect.web3.modal.data.BalanceRpcRepository
-import com.walletconnect.web3.modal.data.network.BalanceService
-import com.walletconnect.web3.modal.domain.usecase.GetEthBalanceUseCase
+import com.reown.appkit.data.BalanceRpcRepository
+import com.reown.appkit.data.network.BalanceService
+import com.reown.appkit.domain.usecase.GetEthBalanceUseCase
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import retrofit2.Retrofit

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt → product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt

@@ -1,9 +1,9 @@
-package com.walletconnect.web3.modal.di
+package com.reown.appkit.di
 
 import com.reown.android.internal.common.di.AndroidCommonDITags
-import com.walletconnect.web3.modal.data.BlockchainRepository
-import com.walletconnect.web3.modal.data.network.BlockchainService
-import com.walletconnect.web3.modal.domain.usecase.GetIdentityUseCase
+import com.reown.appkit.data.BlockchainRepository
+import com.reown.appkit.data.network.BlockchainService
+import com.reown.appkit.domain.usecase.GetIdentityUseCase
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import retrofit2.Retrofit

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt → product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt

@@ -1,10 +1,10 @@
-package com.walletconnect.web3.modal.di
+package com.reown.appkit.di
 
 import android.content.Context
 import com.reown.android.internal.common.di.AndroidCommonDITags
-import com.walletconnect.web3.modal.domain.usecase.ConnectionEventRepository
-import com.walletconnect.web3.modal.engine.AppKitEngine
-import com.walletconnect.web3.modal.engine.coinbase.CoinbaseClient
+import com.reown.appkit.domain.usecase.ConnectionEventRepository
+import com.reown.appkit.engine.AppKitEngine
+import com.reown.appkit.engine.coinbase.CoinbaseClient
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.module