@solana-mobile/mobile-wallet-adapter-protocol 2.2.3 → 2.2.4

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.12.0'
+    classpath 'com.android.tools.build:gradle:8.13.0'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -144,7 +144,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"  // From node_modules
-  implementation "com.solanamobile:mobile-wallet-adapter-clientlib:2.0.8"
+  implementation "com.solanamobile:mobile-wallet-adapter-clientlib:2.1.0"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
 }

package/android/src/main/java/com/solanamobile/mobilewalletadapter/reactnative/SolanaMobileWalletAdapterModule.kt

@@ -49,7 +49,7 @@ class SolanaMobileWalletAdapterModule(reactContext: ReactApplicationContext) :
     private val mActivityEventListener: ActivityEventListener =
         object : BaseActivityEventListener() {
             override fun onActivityResult(
-                activity: Activity?,
+                activity: Activity,
                 requestCode: Int,
                 resultCode: Int,
                 data: Intent?
@@ -61,10 +61,10 @@ class SolanaMobileWalletAdapterModule(reactContext: ReactApplicationContext) :
 
     private val sessionBackgroundTaskConfig
         get() = HeadlessJsTaskConfig(
-            taskKey = "SolanaMobileWalletAdapterSessionBackgroundTask",
-            timeout = 0,
-            data = Arguments.createMap(),
-            isAllowedInForeground = true
+            "SolanaMobileWalletAdapterSessionBackgroundTask",
+            Arguments.createMap(),
+            0,
+            true
         )
 
     init {
@@ -87,6 +87,10 @@ class SolanaMobileWalletAdapterModule(reactContext: ReactApplicationContext) :
                     if (taskId != null && headlessJsTaskContext.isTaskRunning(taskId)) {
                         headlessJsTaskContext.finishTask(taskId)
                     }
+                    // fix for Expo 52/RN 0.72/0.73 where the older kotlin/gradle toolchain complains 
+                    // about the above if statement being used as an expression. Explicitly returning 
+                    // Unit here tells the compiler that the above if is not an expression
+                    Unit
                 } catch (e: Exception) {
                     Log.w(TAG, "Failed to finish headless JS task", e)
                 }
@@ -121,10 +125,11 @@ class SolanaMobileWalletAdapterModule(reactContext: ReactApplicationContext) :
                     // stop the headless js task, regardless if the association was successful or not
                     finishHeadlessTask(sessionTaskId)
                 }
-                currentActivity?.startActivityForResult(intent, REQUEST_LOCAL_ASSOCIATION)
-                    ?: throw NullPointerException(
-                        "Could not find a current activity from which to launch a local association"
-                    )
+                reactApplicationContext.currentActivity?.apply {
+                    startActivityForResult(intent, REQUEST_LOCAL_ASSOCIATION)
+                } ?: throw NullPointerException(
+                    "Could not find a current activity from which to launch a local association"
+                )
                 val client = localAssociation.start()
                     .get(ASSOCIATION_TIMEOUT_MS.toLong(), TimeUnit.MILLISECONDS)
                 sessionState = SessionState(client, localAssociation)

package/lib/types/index.browser.d.ts

@@ -247,7 +247,7 @@ type SignInPayloadWithRequiredFields = Partial<SignInPayload> & Required<Pick<Si
 type SignInResult = Readonly<{
     address: Base64EncodedAddress;
     signed_message: Base64EncodedSignedMessage;
-    signature: Base64EncodedAddress;
+    signature: Base64EncodedSignature;
     signature_type?: string;
 }>;
 type Scenario = Readonly<{

package/lib/types/index.d.ts

@@ -247,7 +247,7 @@ type SignInPayloadWithRequiredFields = Partial<SignInPayload> & Required<Pick<Si
 type SignInResult = Readonly<{
     address: Base64EncodedAddress;
     signed_message: Base64EncodedSignedMessage;
-    signature: Base64EncodedAddress;
+    signature: Base64EncodedSignature;
     signature_type?: string;
 }>;
 type Scenario = Readonly<{

package/lib/types/index.native.d.ts

@@ -247,7 +247,7 @@ type SignInPayloadWithRequiredFields = Partial<SignInPayload> & Required<Pick<Si
 type SignInResult = Readonly<{
     address: Base64EncodedAddress;
     signed_message: Base64EncodedSignedMessage;
-    signature: Base64EncodedAddress;
+    signature: Base64EncodedSignature;
     signature_type?: string;
 }>;
 type Scenario = Readonly<{

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@solana-mobile/mobile-wallet-adapter-protocol",
     "description": "An implementation of the Solana Mobile Mobile Wallet Adapter protocol. Use this to open a session with a mobile wallet app, and to issue API calls to it.",
-    "version": "2.2.3",
+    "version": "2.2.4",
     "author": "Steven Luscher <steven.luscher@solanamobile.com>",
     "repository": {
         "type": "git",
@@ -18,8 +18,8 @@
             "require": "./lib/cjs/index.js"
         },
         "browser": {
-            "import": "./lib/cjs/index.browser.js",
-            "require": "./lib/esm/index.browser.js"
+            "import": "./lib/esm/index.browser.js",
+            "require": "./lib/cjs/index.browser.js"
         },
         "node": {
             "import": "./lib/esm/index.js",