@dashx/react-native 1.4.1 → 1.5.0

package/.claude/worktrees/autocapture-conventions-review-78f665/android/build.gradle

@@ -0,0 +1,121 @@
+import groovy.json.JsonSlurper
+
+// Standalone build path (used by CI via `./gradlew :testDebugUnitTest` from
+// this `android/` directory). When consumer apps autolink the bridge, this
+// buildscript block is evaluated as a subproject too but is a no-op since
+// the consumer's root already provides identical or newer classpath
+// entries — AGP/Kotlin plugin classes are loaded once and shared.
+buildscript {
+  repositories {
+    google()
+    mavenCentral()
+    gradlePluginPortal()
+  }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:8.7.2'
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0'
+  }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
+
+def getVersionFromNpm() {
+    def inputFile = new File("../package.json")
+    def packageJson = new JsonSlurper().parseText(inputFile.text)
+
+    return packageJson["version"]
+}
+
+android {
+    namespace 'com.dashx.rn.sdk'
+    compileSdkVersion 34
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    defaultConfig {
+        minSdkVersion 26
+        targetSdkVersion 34
+        versionCode 1
+        versionName getVersionFromNpm()
+
+        buildConfigField 'String', 'VERSION_NAME', "\"$versionName\""
+    }
+    // Align Java + Kotlin target so the standalone CI build (which doesn't
+    // inherit RN's defaults) doesn't trip "Inconsistent JVM-target
+    // compatibility". Consumers autolinking the bridge already set these
+    // at root scope; redeclaring here is a no-op when versions match.
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+    lint {
+        abortOnError false
+    }
+
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/newarch/java']
+            } else {
+                java.srcDirs += ['src/oldarch/java']
+            }
+        }
+    }
+
+    packaging {
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libfbjni.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libfbjni.so'
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86/libfbjni.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/x86_64/libfbjni.so'
+   }
+}
+
+if (isNewArchitectureEnabled()) {
+    react {
+        jsRootDir = file("../src/")
+        libraryName = "RNDashXReactNativeSpec"
+        codegenJavaPackageName = "com.dashx.rn.sdk"
+    }
+}
+
+repositories {
+    mavenCentral()
+    google()
+}
+
+dependencies {
+    compileOnly 'com.facebook.react:react-android:+'
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
+
+    // Ensure Firebase Messaging types are available for FCM service subclass
+    implementation 'com.google.firebase:firebase-messaging-ktx:23.1.2'
+
+    implementation "com.dashx:dashx-android:1.5.0"
+
+    // Unit tests for `util/Utils.kt` — JVM-only, no Robolectric. The RN
+    // `react-android` artifact is pulled in at test runtime (not as a
+    // runtime dep) so tests can reach `JavaOnlyMap` / `JavaOnlyArray` —
+    // pure-Java `ReadableMap` / `WritableMap` impls that stand in for the
+    // JNI-backed `WritableNativeMap` / `WritableNativeArray` in JVM tests.
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'com.facebook.react:react-android:+'
+}

package/.claude/worktrees/autocapture-conventions-review-78f665/android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Oct 30 16:24:27 IST 2023
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/.claude/worktrees/autocapture-conventions-review-78f665/android/gradle.properties

@@ -0,0 +1 @@
+android.useAndroidX=true

package/.claude/worktrees/autocapture-conventions-review-78f665/android/gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

package/.claude/worktrees/autocapture-conventions-review-78f665/android/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/.claude/worktrees/autocapture-conventions-review-78f665/android/settings.gradle

@@ -0,0 +1,27 @@
+// Minimal standalone Gradle config so CI can run the bridge's unit tests
+// (`./gradlew :testDebugUnitTest`) without checking out a consumer app.
+//
+// Consumer apps don't read this file — when the bridge is autolinked by a
+// React Native app, the consumer's own `settings.gradle` drives the build
+// and this one is ignored. Both paths coexist.
+
+pluginManagement {
+  repositories {
+    gradlePluginPortal()
+    google()
+    mavenCentral()
+  }
+}
+
+dependencyResolutionManagement {
+  // CI may run without autolinking providing repositories — declare them
+  // here so `testImplementation 'com.facebook.react:react-android:+'` and
+  // the `com.dashx:dashx-android:x.y.z` runtime dep resolve.
+  repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+  repositories {
+    google()
+    mavenCentral()
+  }
+}
+
+rootProject.name = 'dashx-react-native'

package/{android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt → .claude/worktrees/autocapture-conventions-review-78f665/android/src/main}/AndroidManifest.xml

@@ -1,25 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.dashx.rn.sdk" >
-
-    <uses-sdk android:minSdkVersion="26" />
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application>
-
         <!-- Replace dashx-android's FCM service with our subclass that also emits to JS. -->
         <service
             android:name="com.dashx.android.DashXFirebaseMessagingService"
             tools:node="remove" />
         <service
             android:name="com.dashx.rn.sdk.DashXReactNativeFirebaseMessagingService"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
     </application>
-
-</manifest>
+</manifest>

package/.claude/worktrees/autocapture-conventions-review-78f665/android/src/main/java/com/dashx/rn/sdk/DashXNotificationClickedListener.kt

@@ -0,0 +1,113 @@
+package com.dashx.rn.sdk
+
+import com.dashx.android.DashXNotificationListener
+import com.dashx.android.DashXPayload
+import com.dashx.android.NavigationAction
+import com.dashx.rn.sdk.util.convertJsonToMap
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.jsonObject
+
+/**
+ * Bridges the dashx-android SDK's [DashXNotificationListener.onNotificationClicked]
+ * hook to the JS-side `DashX.onNotificationClicked(...)` listener registered via
+ * `NativeEventEmitter`. Mirrors the iOS emit shape from
+ * `ios/DashXNotificationHandler.swift` → `handleNotificationResponse`:
+ *
+ * ```json
+ * {
+ *   "notification":      { ...DashX payload keys... },
+ *   "action":            { "type": "deepLink" | "screen" | ..., ... } | null,
+ *   "actionIdentifier":  "<string, or empty>"
+ * }
+ * ```
+ *
+ * Registered from [DashXReactNativeModuleImpl.initialize] via
+ * [DashX.registerNotificationListener], and unregistered in [invalidate].
+ *
+ * Returns `false` from [onNotificationClicked] so the SDK proceeds with its
+ * default navigation (deep-link intent, rich-landing browser, click-action
+ * intent). Consumers who want to override need to do so in JS — the
+ * JS-side listener has no way to suppress the native default via a return
+ * value, which matches iOS behavior.
+ *
+ * `actionIdentifier` is `null` when the notification body was tapped, or the
+ * tapped action button's identifier (matches `ActionButton.identifier`) for
+ * button taps. We emit an empty string in the body-tap case so the JS event
+ * always carries a String — matches the iOS event shape, where the field is
+ * always present.
+ */
+class DashXNotificationClickedListener(
+    private val reactContext: ReactApplicationContext
+) : DashXNotificationListener {
+
+    override fun onNotificationClicked(
+        payload: DashXPayload,
+        action: NavigationAction?,
+        actionIdentifier: String?
+    ): Boolean {
+        if (!reactContext.hasActiveReactInstance()) {
+            // RN is still booting (common on cold-start from a killed-app
+            // notification tap). The JS emit would be dropped anyway; skip.
+            return false
+        }
+
+        val body: WritableMap = Arguments.createMap().apply {
+            putMap("notification", payloadToMap(payload))
+            if (action != null) {
+                putMap("action", actionToMap(action))
+            } else {
+                putNull("action")
+            }
+            putString("actionIdentifier", actionIdentifier ?: "")
+        }
+
+        reactContext
+            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+            .emit("notificationClicked", body)
+
+        return false
+    }
+
+    private fun payloadToMap(payload: DashXPayload): WritableMap {
+        // DashXPayload is `@Serializable` — go straight to a JsonObject tree
+        // and hand it to the shared `convertJsonToMap` helper for a
+        // RN-bridge-safe `WritableMap`. No Gson / no string round-trip.
+        val jsonObject = Json.encodeToJsonElement(DashXPayload.serializer(), payload).jsonObject
+        return convertJsonToMap(jsonObject) ?: Arguments.createMap()
+    }
+
+    private fun actionToMap(action: NavigationAction): WritableMap {
+        val map = Arguments.createMap()
+        when (action) {
+            is NavigationAction.DeepLink -> {
+                map.putString("type", "deepLink")
+                map.putString("url", action.url)
+            }
+            is NavigationAction.Screen -> {
+                map.putString("type", "screen")
+                map.putString("name", action.name)
+                action.data?.let { data ->
+                    val dataMap = Arguments.createMap()
+                    for ((key, value) in data) {
+                        dataMap.putString(key, value)
+                    }
+                    map.putMap("data", dataMap)
+                }
+            }
+            is NavigationAction.RichLanding -> {
+                map.putString("type", "richLanding")
+                map.putString("url", action.url)
+            }
+            is NavigationAction.ClickAction -> {
+                map.putString("type", "clickAction")
+                map.putString("action", action.action)
+            }
+        }
+        return map
+    }
+}

package/.claude/worktrees/autocapture-conventions-review-78f665/android/src/main/java/com/dashx/rn/sdk/DashXReactNativeFirebaseMessagingService.kt

@@ -0,0 +1,72 @@
+package com.dashx.rn.sdk
+
+import com.dashx.android.DashXFirebaseMessagingService
+import com.dashx.android.DashXLog
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.google.firebase.messaging.RemoteMessage
+
+/**
+ * Extends dashx-android's FCM service to also emit "messageReceived" to the React Native JS layer
+ * so that DashX.onMessageReceived() callbacks receive push notifications.
+ */
+class DashXReactNativeFirebaseMessagingService : DashXFirebaseMessagingService() {
+
+    private val tag = DashXReactNativeFirebaseMessagingService::class.java.simpleName
+
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        // Preserve dashx-android behavior (notification display + tracking)
+        super.onMessageReceived(remoteMessage)
+
+        val context = MessageReceivedEventHolder.reactContext ?: run {
+            DashXLog.d(tag, "React context not available, skipping JS emit")
+            return
+        }
+
+        if (!context.hasActiveReactInstance()) {
+            DashXLog.d(tag, "No active React instance, skipping JS emit")
+            return
+        }
+
+        val payload = remoteMessageToWritableMap(remoteMessage)
+        context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+            .emit("messageReceived", payload)
+    }
+
+    private fun remoteMessageToWritableMap(remoteMessage: RemoteMessage): WritableMap {
+        val map = Arguments.createMap()
+
+        // Data payload (always present as Map<String, String>)
+        remoteMessage.data.let { data ->
+            if (!data.isNullOrEmpty()) {
+                val dataMap = Arguments.createMap()
+                for ((key, value) in data) {
+                    dataMap.putString(key, value)
+                }
+                map.putMap("data", dataMap)
+            }
+        }
+
+        // Notification payload (if present)
+        remoteMessage.notification?.let { notification ->
+            val notifMap = Arguments.createMap()
+            notification.title?.let { notifMap.putString("title", it) }
+            notification.body?.let { notifMap.putString("body", it) }
+            notification.bodyLocalizationKey?.let { notifMap.putString("bodyLocalizationKey", it) }
+            notification.titleLocalizationKey?.let { notifMap.putString("titleLocalizationKey", it) }
+            notification.channelId?.let { notifMap.putString("channelId", it) }
+            notification.clickAction?.let { notifMap.putString("clickAction", it) }
+            notification.tag?.let { notifMap.putString("tag", it) }
+            notification.imageUrl?.toString()?.let { notifMap.putString("imageUrl", it) }
+            map.putMap("notification", notifMap)
+        }
+
+        remoteMessage.messageId?.let { map.putString("messageId", it) }
+        remoteMessage.senderId?.let { map.putString("senderId", it) }
+        remoteMessage.from?.let { map.putString("from", it) }
+
+        return map
+    }
+}