@walletconnect/react-native-compat 2.21.5-canary-native-fix.2 → 2.21.5-canary-1

package/android/build.gradle

@@ -113,8 +113,8 @@ dependencies {
 
 if (isNewArchitectureEnabled()) {
   react {
-    jsRootDir = file("../module/")
-    libraryName = "RNWalletConnectModuleSpec"
+    jsRootDir = file("../src/")
+    libraryName = "RNWalletConnectModule"
     codegenJavaPackageName = "com.walletconnect.reactnativemodule"
   }
 }

package/android/src/main/java/com/walletconnect/reactnativemodule/RNWalletConnectModuleModule.kt

@@ -12,19 +12,19 @@ class RNWalletConnectModuleModule internal constructor(context: ReactApplication
     return NAME
   }
 
-  override fun getTypedExportedConstants(): Map<String, String> {
+  override protected fun getTypedExportedConstants(): Map<String, String> {
     var appName: String
 
     try {
-      appName = reactApplicationContext.applicationInfo
-        .loadLabel(reactApplicationContext.packageManager).toString()
+      appName = getReactApplicationContext().getApplicationInfo()
+        .loadLabel(getReactApplicationContext().getPackageManager()).toString()
     } catch (e: Exception) {
       appName = "unknown"
     }
 
     val constants: MutableMap<String, String> = HashMap()
-    constants["applicationId"] = reactApplicationContext.packageName
-    constants["applicationName"] = appName
+    constants.put("applicationId", getReactApplicationContext().getPackageName());
+    constants.put("applicationName", appName);
     return constants
   }
 
@@ -39,7 +39,7 @@ class RNWalletConnectModuleModule internal constructor(context: ReactApplication
   }
 
   private fun isPackageInstalled(packageName: String): Boolean {
-    val manager: PackageManager = reactApplicationContext.packageManager
+    val manager: PackageManager = getReactApplicationContext().getPackageManager()
     return try {
       @Suppress("DEPRECATION")
       manager.getPackageInfo(packageName, 0)

package/android/src/main/java/com/walletconnect/reactnativemodule/RNWalletConnectModulePackage.kt

@@ -26,7 +26,7 @@ class RNWalletConnectModulePackage : TurboReactPackage() {
         false,  // canOverrideExistingModule
         false,  // needsEagerInit
         true,  // hasConstants
-        false,   // isCxxModule,
+        false,  // isCxxModule
         isTurboModule // isTurboModule
       )
       moduleInfos

package/android/src/newarch/RNWalletConnectModuleSpec.kt

@@ -1,16 +1,7 @@
 package com.walletconnect.reactnativemodule
 
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.Promise
 
 abstract class RNWalletConnectModuleSpec internal constructor(context: ReactApplicationContext) :
-  ReactContextBaseJavaModule(context) {
-
-  abstract fun isAppInstalled(packageName: String?, promise: Promise)
-  protected abstract fun getTypedExportedConstants(): Map<String, String>
-
-  override fun getConstants(): Map<String, String> {
-    return getTypedExportedConstants()
-  }
+  NativeRNWalletConnectModuleSpec(context) {
 }

package/android/src/oldarch/RNWalletConnectModuleSpec.kt

@@ -7,10 +7,11 @@ import com.facebook.react.bridge.Promise
 abstract class RNWalletConnectModuleSpec internal constructor(context: ReactApplicationContext) :
   ReactContextBaseJavaModule(context) {
 
-  abstract fun isAppInstalled(packageName: String?, promise: Promise)
+  abstract fun isAppInstalled(packageName: String?, promise: Promise);
   protected abstract fun getTypedExportedConstants(): Map<String, String>
 
   override fun getConstants(): Map<String, String> {
-    return getTypedExportedConstants()
+    val constants: Map<String, String> = getTypedExportedConstants()
+    return constants
   }
 }

package/ios/RNWalletConnectModule.h

@@ -1,5 +1,6 @@
+
 #ifdef RCT_NEW_ARCH_ENABLED
-#import "RNWalletConnectModuleSpec.h"
+#import "RNRNWalletConnectModuleSpec.h"
 
 @interface RNWalletConnectModule : NSObject <NativeRNWalletConnectModuleSpec>
 #else

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@walletconnect/react-native-compat",
   "description": "Shims for WalletConnect Protocol in React Native Projects",
-  "version": "2.21.5-canary-native-fix.2",
+  "version": "2.21.5-canary-1",
   "author": "WalletConnect, Inc. <walletconnect.com>",
   "homepage": "https://github.com/walletconnect/walletconnect-monorepo/",
   "license": "Apache-2.0",
@@ -53,8 +53,8 @@
     }
   },
   "codegenConfig": {
-    "name": "RNWalletConnectModuleSpec",
+    "name": "RNRNWalletConnectModuleSpec",
     "type": "modules",
-    "jsSrcsDir": "module"
+    "jsSrcsDir": "."
   }
 }