Migrate WalletConnect to Reown on Android

android/app/build.gradle

@@ -260,12 +260,12 @@ dependencies {
 
 
     //
-    // https://github.com/WalletConnect/WalletConnectKotlinV2
+    // https://github.com/reown-com/reown-kotlin
     //
 
-    implementation platform("com.walletconnect:android-bom:$walletConnectVersion")
-    implementation('com.walletconnect:android-core')
-    implementation("com.walletconnect:walletconnect-modal")
+    implementation(platform("com.reown:android-bom:$walletConnectVersion"))
+    implementation("com.reown:android-core")
+    implementation("com.reown:appkit")
 
     //
     // https://docs.cloud.coinbase.com/wallet-sdk/docs/android-install

android/build.gradle

@@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
     ext.ktlintVersion = '0.48.0'
-    ext.kotlinVersion = '2.0.21'
+    ext.kotlinVersion = '2.2.0'
     ext.androidApplicationVersion = '8.13.0'
 
-    ext.navigationVersion = '2.9.1'
+    ext.navigationVersion = '2.8.4'
     ext.hiltVersion = '2.57.1'
     ext.googleServicesVersion = '4.3.12'
 
@@ -17,7 +17,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$androidApplicationVersion"
         classpath "com.squareup:javapoet:1.13.0"
-        classpath 'com.google.gms:google-services:4.4.3'
+        classpath 'com.google.gms:google-services:4.4.4'
 
         classpath 'com.facebook.react:react-native-gradle-plugin'
 
@@ -181,7 +181,7 @@ ext {
     flowExtVersion = '0.7.1'
     material3Version = '1.2.0-rc01'
     web3jVersion = '4.8.8-android'
-    walletConnectVersion = '1.35.2'
+    walletConnectVersion = '1.4.11'
     amplitudeVersion = '1.21.4'
 }
 

android/v4/core/build.gradle

@@ -139,9 +139,9 @@ dependencies {
 
     implementation "androidx.biometric:biometric-ktx:$biometricVersion"
 
-    implementation platform("com.walletconnect:android-bom:$walletConnectVersion")
-    implementation('com.walletconnect:android-core')
-    implementation("com.walletconnect:walletconnect-modal")
+    implementation(platform("com.reown:android-bom:$walletConnectVersion"))
+    implementation("com.reown:android-core")
+    implementation("com.reown:appkit")
     implementation 'com.google.accompanist:accompanist-navigation-material:0.36.0'  // need for modal
 
     implementation("tz.co.asoft:kollections-interoperable:$kollectionsVersion")

android/v4/core/src/main/java/exchange/dydx/trading/core/DydxNavGraph.kt

@@ -12,7 +12,7 @@ import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.navigation.material.BottomSheetNavigator
 import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.google.accompanist.navigation.material.ModalBottomSheetLayout
-import com.walletconnect.wcmodal.ui.walletConnectModalGraph
+import com.reown.appkit.ui.appKitGraph
 import exchange.dydx.feature.onboarding.loginGraph
 import exchange.dydx.newsalerts.newsAlertsGraph
 import exchange.dydx.trading.common.navigation.DydxRouter
@@ -60,7 +60,9 @@ fun DydxNavGraph(
 
     InitializeManagers()
 
-    ModalBottomSheetLayout(bottomSheetNavigator = bottomSheetNavigator) {
+    ModalBottomSheetLayout(
+        bottomSheetNavigator = bottomSheetNavigator,
+    ) {
         NavHost(
             navController = navController,
             startDestination = DEFAULT_START_DESTINATION,
@@ -106,7 +108,7 @@ fun DydxNavGraph(
                 logger = logger,
             )
 
-            walletConnectModalGraph(navController)
+            appKitGraph(navController)
         }
     }
 }

android/v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/components/pendingpositions/DydxPortfolioPendingPositionItemView.kt

@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -142,7 +142,7 @@ object DydxPortfolioPendingPositionItemView {
                             vertical = 12.dp,
                         )
                         .clickable(
-                            indication = rememberRipple(color = ThemeColor.SemanticColor.layer_3.color),
+                            indication = ripple(color = ThemeColor.SemanticColor.layer_3.color),
                             interactionSource = remember { MutableInteractionSource() },
                             onClick = { state.viewOrderAction() },
                         ),
@@ -161,7 +161,7 @@ object DydxPortfolioPendingPositionItemView {
                             vertical = 12.dp,
                         )
                         .clickable(
-                            indication = rememberRipple(color = ThemeColor.SemanticColor.layer_3.color),
+                            indication = ripple(color = ThemeColor.SemanticColor.layer_3.color),
                             interactionSource = remember { MutableInteractionSource() },
                             onClick = { state.cancelOrderAction() },
                         ),

android/v4/integration/dydxCartera/build.gradle

@@ -51,14 +51,12 @@ dependencies {
     implementation 'com.solanamobile:rpc-core:0.2.8'
 
     //
-    // https://github.com/WalletConnect/WalletConnectKotlinV2
+    // https://github.com/reown-com/reown-kotlin
     //
 
-    implementation platform('com.walletconnect:android-bom:1.35.2')
-    implementation("com.walletconnect:android-core")
-    implementation("com.walletconnect:walletconnect-modal")
-    implementation 'com.walletconnect:sign'
-    //implementation 'com.walletconnect:push'
+    implementation(platform("com.reown:android-bom:$walletConnectVersion"))
+    implementation("com.reown:android-core")
+    implementation("com.reown:appkit")
 
     //
     // https://docs.cloud.coinbase.com/wallet-sdk/docs/android-install

android/v4/integration/dydxCartera/src/main/java/exchange/dydx/cartera/CarteraConfig.kt

@@ -71,14 +71,7 @@ class CarteraConfig(
         registration[WalletConnectionType.WalletConnect] = RegistrationConfig(
             provider = WalletConnectV1Provider(),
         )
-        if (walletProvidersConfig.walletConnectV2 != null) {
-            registration[WalletConnectionType.WalletConnectV2] = RegistrationConfig(
-                provider = WalletConnectV2Provider(
-                    walletConnectV2Config = walletProvidersConfig.walletConnectV2,
-                    application = application,
-                ),
-            )
-        }
+
         if (walletProvidersConfig.walletSegue != null) {
             registration[WalletConnectionType.WalletSegue] = RegistrationConfig(
                 provider = WalletSegueProvider(
@@ -102,10 +95,18 @@ class CarteraConfig(
     }
 
     fun updateModalConfig(walletConnectModal: WalletConnectModalConfig) {
+        if (walletProvidersConfig.walletConnectV2 != null) {
+            registration[WalletConnectionType.WalletConnectV2] = RegistrationConfig(
+                provider = WalletConnectV2Provider(
+                    walletConnectV2Config = walletProvidersConfig.walletConnectV2,
+                    modalConfig = walletConnectModal,
+                    application = application,
+                ),
+            )
+        }
         registration[WalletConnectionType.WalletConnectModal] = RegistrationConfig(
             provider = WalletConnectModalProvider(
                 application = application,
-                config = walletConnectModal,
             ),
         )
     }

android/v4/integration/dydxCartera/src/main/java/exchange/dydx/cartera/entities/ModelExtensions.kt

@@ -9,7 +9,6 @@ import exchange.dydx.dydxCartera.Utils
 import exchange.dydx.dydxCartera.WalletConnectionType
 import exchange.dydx.dydxCartera.toHexString
 import exchange.dydx.dydxCartera.walletprovider.EthereumTransactionRequest
-import okhttp3.internal.toHexString
 import org.json.JSONException
 import org.json.JSONObject