react-native-mytatva-rn-sdk 1.2.96 → 1.2.98

package/android/src/main/java/com/mytatvarnsdk/CgmTrackyLibModule.kt

@@ -44,6 +44,7 @@ import com.mytatvarnsdk.model.GlucoseLogRequest
 import com.mytatvarnsdk.model.MainActivityModel
 import com.mytatvarnsdk.network.AuthenticateSDKService
 import com.mytatvarnsdk.network.AuthenticateSDKService.LoaderListener
+import com.mytatvarnsdk.utils.CustomerSupportConfig
 import com.mytatvarnsdk.utils.DeviceStatus
 import com.mytatvarnsdk.utils.TATVA_ENVIRONMENT
 import io.sentry.ScopeCallback
@@ -282,6 +283,63 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    /** SDK `latestGlucose` observer telemetry — must never throw or block queue/upload. */
+    private fun logSdkGlucoseReceivedSafely(pocGlucose: PocGlucose) {
+        try {
+            safeLogModuleEvent {
+                val activeSensorId = try {
+                    prefsHelper?.qrInformation?.sensor ?: lastConnectCgm ?: ""
+                } catch (_: Throwable) {
+                    ""
+                }
+                val pocJson = try {
+                    Gson().toJson(pocGlucose)
+                } catch (_: Throwable) {
+                    try {
+                        pocGlucose.toString()
+                    } catch (_: Throwable) {
+                        ""
+                    }
+                }
+                val attributes = try {
+                    mapOf(
+                        "glucoseId" to safePocField { pocGlucose.glucoseId?.toString() ?: "" },
+                        "activeSensorId" to activeSensorId,
+                        "timeInMillis" to safePocField { pocGlucose.timeInMillis.toString() },
+                        "showGlucoseMG" to safePocField { pocGlucose.showGlucoseMG.toString() },
+                        "showGlucose" to safePocField { pocGlucose.showGlucose.toString() },
+                        "deviceId" to safePocField { pocGlucose.deviceId?.toString() ?: "" },
+                        "errorCode" to safePocField { pocGlucose.errorCode?.toString() ?: "" },
+                        "name" to safePocField { pocGlucose.name ?: "" }
+                    )
+                } catch (_: Throwable) {
+                    emptyMap()
+                }
+                val message = try {
+                    "SDK latestGlucose received | glucoseId=${pocGlucose.glucoseId ?: ""} | showGlucoseMG=${pocGlucose.showGlucoseMG} | activeSensorId=$activeSensorId"
+                } catch (_: Throwable) {
+                    "SDK latestGlucose received"
+                }
+                logModuleEvent(
+                    where = "observeGlucoseData.sdkGlucoseReceived",
+                    message = message,
+                    level = SentryLogLevel.INFO,
+                    jsonPayload = pocJson,
+                    attributes = attributes
+                )
+            }
+        } catch (_: Throwable) {
+            // Observer callback must always continue to queue/upload.
+        }
+    }
+
+    private inline fun safePocField(block: () -> String): String =
+        try {
+            block()
+        } catch (_: Throwable) {
+            ""
+        }
+
     private fun cgmStatusDeviceAttributes(
         status: String,
         device: PocDevice?,
@@ -322,6 +380,28 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    private fun fetchCustomerSupportDetails() {
+        if (userToken.isEmpty()) {
+            CustomerSupportConfig.applyFailureDefaults()
+            return
+        }
+
+        val environment =
+            if (env.lowercase() == "uat") TATVA_ENVIRONMENT.STAGE else TATVA_ENVIRONMENT.PROD
+
+        authenticateSDKService.fetchCustomerSupportDetails(
+            environment = environment,
+            token = userToken,
+            onSuccess = { response ->
+                CustomerSupportConfig.updateFromResponse(response)
+            },
+            onFailure = {
+                Log.w("fetchCustomerSupportDetails", "Failed to fetch customer support details, using failure defaults")
+                CustomerSupportConfig.applyFailureDefaults()
+            }
+        )
+    }
+
     @ReactMethod
     fun observeDeviceStatus(token: String, envType: String) {
         try {
@@ -643,6 +723,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             updateUserData(userData)
             userToken = token
             env = envType.lowercase()
+            fetchCustomerSupportDetails()
             val intent = Intent(currentActivity, StartCGMActivity::class.java)
             intent.putExtra("envType", env)
             currentActivity?.startActivity(intent)
@@ -671,6 +752,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             updateUserData(userData)
             userToken = token
             env = envType.lowercase()
+            fetchCustomerSupportDetails()
             currentActivity?.startActivity(
                 Intent(currentActivity, StartCGMActivity::class.java).putExtra(
                     "IsForReconnect",
@@ -743,6 +825,8 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                         return@Observer
                     }
 
+                    logSdkGlucoseReceivedSafely(pocGlucose)
+
                     // Check for duplicate using glucoseId instead of timestamp
                     val glucoseId = pocGlucose.glucoseId ?: run {
                         Log.w("observeGlucoseData", "Glucose ID is null, skipping")

package/android/src/main/java/com/mytatvarnsdk/activity/ConnectSensorActivity.kt

@@ -42,6 +42,10 @@ import com.mytatvarnsdk.myView.progress.ProgressManagement
 import com.mytatvarnsdk.myView.progress.ProgressType
 import com.mytatvarnsdk.network.AuthenticateSDKService
 import com.mytatvarnsdk.utils.TATVA_ENVIRONMENT
+import com.mytatvarnsdk.utils.ToolbarSupportHelper
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.logModuleEvent
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.safeLogModuleEvent
+import io.sentry.SentryLogLevel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -99,19 +103,14 @@ class ConnectSensorActivity : BaseBleActivity() {
             openExitDialog()
         }
 
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java).putExtra("ScreenName", "Sensor page")
-            )
-        }
+        ToolbarSupportHelper.bindWhatsappButton(this, binding.toolbar.btnWhatsapp)
 
-        binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("", "cgm_watch_demo_clicked")
-
-            startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
-            )
-        }
+        ToolbarSupportHelper.configureWatchDemoButton(
+            context = this,
+            btnWatchDemo = binding.toolbar.btnWatchDemo,
+            isForReconnect = isForReconnect,
+            onClickAnalytics = { sendDataToRN("", "cgm_watch_demo_clicked") }
+        )
 
         val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
@@ -139,6 +138,21 @@ class ConnectSensorActivity : BaseBleActivity() {
     fun manageErrorState(showError: Boolean, errorStatus: String) {
         ProgressManagement.getInstance().dismissWait(this)
         if (showError) {
+            if (errorStatus.isNotEmpty()) {
+                safeLogModuleEvent {
+                    logModuleEvent(
+                        where = "ConnectSensorActivity.error",
+                        message = "CGM journey error | screen=${javaClass.simpleName} | $errorStatus",
+                        level = SentryLogLevel.WARN,
+                        attributes = mapOf(
+                            "error_message" to errorStatus,
+                            "screen" to javaClass.simpleName,
+                            "is_reconnect" to isForReconnect.toString(),
+                        ),
+                        logsOnly = true,
+                    )
+                }
+            }
             binding.clFail.visibility = View.VISIBLE
             binding.clMain.visibility = View.GONE
             binding.commonButton.root.visibility = View.GONE
@@ -299,6 +313,20 @@ class ConnectSensorActivity : BaseBleActivity() {
         if (requestCode == REQUEST_QR && resultCode == RESULT_OK && data != null) {
             val device: PocDevice? = data.getParcelableExtra("device")
             if (device != null) {
+                safeLogModuleEvent {
+                    logModuleEvent(
+                        where = "cgmJourney.cgm_qr_activity_result_ok",
+                        message = "CGM journey | screen=${javaClass.simpleName} | step=cgm_qr_activity_result_ok",
+                        level = SentryLogLevel.INFO,
+                        attributes = mapOf(
+                            "journey_step" to "cgm_qr_activity_result_ok",
+                            "screen" to javaClass.simpleName,
+                            "is_reconnect" to isForReconnect.toString(),
+                            "transmitter_name" to (device.name ?: ""),
+                        ),
+                        logsOnly = true,
+                    )
+                }
                 val lastConnectCgm = CgmTrackyLibModule.lastConnectCgm
                 Log.d("ConnectSensor", "lastConnectCgm: $lastConnectCgm")
 
@@ -337,6 +365,17 @@ class ConnectSensorActivity : BaseBleActivity() {
             val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
             val authenticateSDKService = AuthenticateSDKService(scope = scope)
 
+            safeLogModuleEvent {
+                logModuleEvent(
+                    where = "ConnectSensorActivity.verifyDevice.request",
+                    message = "Diasens device verification request | sensorId=$scannedSensorId",
+                    level = SentryLogLevel.INFO,
+                    jsonPayload = """{"sensorId":"$scannedSensorId","deviceType":"CGM","vendor":"diasens"}""",
+                    attributes = mapOf("sensor_id" to scannedSensorId),
+                    logsOnly = true,
+                )
+            }
+
             authenticateSDKService.verifyDevice(
                 environment = if (envType.lowercase() == "uat") TATVA_ENVIRONMENT.STAGE else TATVA_ENVIRONMENT.PROD,
                 token = token,
@@ -345,6 +384,16 @@ class ConnectSensorActivity : BaseBleActivity() {
                     override fun onResponseSuccess(response: String) {
                         try {
                             Log.d("ConnectSensor", "Device verification API response: $response")
+                            safeLogModuleEvent {
+                                logModuleEvent(
+                                    where = "ConnectSensorActivity.verifyDevice.success",
+                                    message = "Diasens device verification response",
+                                    level = SentryLogLevel.INFO,
+                                    jsonPayload = "response=$response",
+                                    attributes = mapOf("sensor_id" to scannedSensorId),
+                                    logsOnly = true,
+                                )
+                            }
 
                             val verificationResponse = Gson().fromJson(response, DeviceVerificationResponse::class.java)
                             val code = when (val rawCode = verificationResponse.code) {
@@ -375,6 +424,21 @@ class ConnectSensorActivity : BaseBleActivity() {
                             }
                         } catch (e: Exception) {
                             Log.e("ConnectSensor", "Error parsing device verification response: ${e.message}")
+                            safeLogModuleEvent {
+                                val errorMessage = e.message ?: "Failed to parse verification response"
+                                logModuleEvent(
+                                    where = "ConnectSensorActivity.verifyDevice.parseError",
+                                    message = "CGM journey error | screen=${javaClass.simpleName} | $errorMessage",
+                                    level = SentryLogLevel.WARN,
+                                    throwable = e,
+                                    attributes = mapOf(
+                                        "error_message" to errorMessage,
+                                        "screen" to javaClass.simpleName,
+                                        "is_reconnect" to isForReconnect.toString(),
+                                    ),
+                                    logsOnly = true,
+                                )
+                            }
                             runOnUiThread {
                                 ProgressManagement.getInstance().dismissWait(this@ConnectSensorActivity)
                                 manageErrorState(true, "Try Again")
@@ -382,23 +446,66 @@ class ConnectSensorActivity : BaseBleActivity() {
                         }
                     }
 
-                    override fun onResponseFail() {
-                        Log.e("ConnectSensor", "Device verification API call failed")
-                        runOnUiThread {
-                            ProgressManagement.getInstance().dismissWait(this@ConnectSensorActivity)
-                            manageErrorState(true, "Try Again")
+                        override fun onResponseFail() {
+                            Log.e("ConnectSensor", "Device verification API call failed")
+                            safeLogModuleEvent {
+                                val errorMessage =
+                                    "Diasens device verification API failed | sensorId=$scannedSensorId"
+                                logModuleEvent(
+                                    where = "ConnectSensorActivity.verifyDevice.fail",
+                                    message = "CGM journey error | screen=${javaClass.simpleName} | $errorMessage",
+                                    level = SentryLogLevel.WARN,
+                                    attributes = mapOf(
+                                        "error_message" to errorMessage,
+                                        "screen" to javaClass.simpleName,
+                                        "is_reconnect" to isForReconnect.toString(),
+                                    ),
+                                    logsOnly = true,
+                                )
+                            }
+                            runOnUiThread {
+                                ProgressManagement.getInstance().dismissWait(this@ConnectSensorActivity)
+                                manageErrorState(true, "Try Again")
+                            }
                         }
                     }
-                }
             )
         } catch (e: Exception) {
             Log.e("ConnectSensor", "Error validating diasens sensor: ${e.message}")
+            safeLogModuleEvent {
+                val errorMessage = e.message ?: "Diasens validation exception"
+                logModuleEvent(
+                    where = "ConnectSensorActivity.validateDiasensSensor",
+                    message = "CGM journey error | screen=${javaClass.simpleName} | $errorMessage",
+                    level = SentryLogLevel.WARN,
+                    throwable = e,
+                    attributes = mapOf(
+                        "error_message" to errorMessage,
+                        "screen" to javaClass.simpleName,
+                        "is_reconnect" to isForReconnect.toString(),
+                    ),
+                    logsOnly = true,
+                )
+            }
             ProgressManagement.getInstance().dismissWait(this)
             manageErrorState(true, "Try Again")
         }
     }
 
     private fun manageDeviceVerificationError(message: String) {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "ConnectSensorActivity.deviceVerificationError",
+                message = "CGM journey error | screen=${javaClass.simpleName} | $message",
+                level = SentryLogLevel.WARN,
+                attributes = mapOf(
+                    "error_message" to message,
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         ProgressManagement.getInstance().dismissWait(this)
         binding.clFail.visibility = View.VISIBLE
         binding.clMain.visibility = View.GONE
@@ -454,6 +561,21 @@ class ConnectSensorActivity : BaseBleActivity() {
             }
         } catch (e: Exception) {
             Log.d("bind::-> ", "bind: ${e.message}")
+            safeLogModuleEvent {
+                val errorMessage = e.message ?: "Sensor bind exception"
+                logModuleEvent(
+                    where = "ConnectSensorActivity.bind",
+                    message = "CGM journey error | screen=${javaClass.simpleName} | $errorMessage",
+                    level = SentryLogLevel.WARN,
+                    throwable = e,
+                    attributes = mapOf(
+                        "error_message" to errorMessage,
+                        "screen" to javaClass.simpleName,
+                        "is_reconnect" to isForReconnect.toString(),
+                    ),
+                    logsOnly = true,
+                )
+            }
         }
     }
 
@@ -482,6 +604,20 @@ class ConnectSensorActivity : BaseBleActivity() {
     }
 
     private fun sendDataToRN(data: String, status: String) {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.$status",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=$status",
+                level = SentryLogLevel.INFO,
+                jsonPayload = data.takeIf { it.isNotEmpty() },
+                attributes = mapOf(
+                    "journey_step" to status,
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         if (reactContext != null) {
             try {
                 val catalystInstance: CatalystInstance = reactContext.catalystInstance
@@ -560,4 +696,8 @@ class ConnectSensorActivity : BaseBleActivity() {
 
     }
 
+    override fun onResume() {
+        super.onResume()
+    }
+
 }

package/android/src/main/java/com/mytatvarnsdk/activity/HelpActivity.kt

@@ -17,6 +17,8 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.mytatvarnsdk.CgmTrackyLibModule
 import com.mytatvarnsdk.R
+import com.mytatvarnsdk.utils.CustomerSupportConfig
+import com.mytatvarnsdk.utils.ToolbarSupportHelper
 import com.mytatvarnsdk.databinding.ActivityHelpBinding
 import org.json.JSONObject
 
@@ -109,15 +111,7 @@ class HelpActivity : AppCompatActivity() {
     }
 
     private fun openWhatsApp() {
-        val waBotUrl = "https://wa.aisensy.com/aaa1qv"
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(waBotUrl))
-        try {
-            // You don't need to set the package for browser-based WhatsApp bots
-            startActivity(intent)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            Toast.makeText(this, "Error opening WhatsApp Bot", Toast.LENGTH_SHORT).show()
-        }
+        ToolbarSupportHelper.openWhatsApp(this, CustomerSupportConfig.effectiveWhatsAppNumber())
     }
 
     private fun sendDataToRN(data: String, status: String) {

package/android/src/main/java/com/mytatvarnsdk/activity/PermissionActivity.kt

@@ -36,9 +36,13 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.mytatvarnsdk.CgmTrackyLibModule
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.base.BasePermissionActivity
+import com.mytatvarnsdk.utils.ToolbarSupportHelper
 import com.mytatvarnsdk.databinding.ActivityPermissionBinding
 import com.mytatvarnsdk.databinding.BluetoothDialogBottomsheetBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.logModuleEvent
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.safeLogModuleEvent
+import io.sentry.SentryLogLevel
 import org.json.JSONObject
 
 class PermissionActivity : BasePermissionActivity() {
@@ -167,23 +171,14 @@ class PermissionActivity : BasePermissionActivity() {
             finish()
         }
 
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "connection journey page")
-            )
-        }
-
-        binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("", "cgm_watch_demo_clicked")
+        ToolbarSupportHelper.bindWhatsappButton(this, binding.toolbar.btnWhatsapp)
 
-            startActivity(
-                Intent(this, VideoActivity::class.java).putExtra(
-                    "VideoId",
-                    if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044"
-                )
-            )
-        }
+        ToolbarSupportHelper.configureWatchDemoButton(
+            context = this,
+            btnWatchDemo = binding.toolbar.btnWatchDemo,
+            isForReconnect = isForReconnect,
+            onClickAnalytics = { sendDataToRN("", "cgm_watch_demo_clicked") }
+        )
 
         binding.tvKnowMore.setOnClickListener {
             openBluetoothDialog()
@@ -202,6 +197,20 @@ class PermissionActivity : BasePermissionActivity() {
     }
 
     private fun sendDataToRN(data: String, status: String) {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.$status",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=$status",
+                level = SentryLogLevel.INFO,
+                jsonPayload = data.takeIf { it.isNotEmpty() },
+                attributes = mapOf(
+                    "journey_step" to status,
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         if (reactContext != null) {
             try {
                 val catalystInstance: CatalystInstance = reactContext.catalystInstance
@@ -643,12 +652,38 @@ class PermissionActivity : BasePermissionActivity() {
     }
 
     private fun onLocationPermissionGranted() {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.cgm_location_permission_granted",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=cgm_location_permission_granted",
+                level = SentryLogLevel.INFO,
+                attributes = mapOf(
+                    "journey_step" to "cgm_location_permission_granted",
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         setSwitchChecked(binding.switchLocation, true)
         updateProceedButtonState()
     }
 
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     private fun onBluetoothPermissionGranted() {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.cgm_bluetooth_permission_granted",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=cgm_bluetooth_permission_granted",
+                level = SentryLogLevel.INFO,
+                attributes = mapOf(
+                    "journey_step" to "cgm_bluetooth_permission_granted",
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         if (bluetoothAdapter == null) {
             Toast.makeText(this, "Bluetooth not supported", Toast.LENGTH_SHORT).show()
         } else {

package/android/src/main/java/com/mytatvarnsdk/activity/PlaceSensorActivity.kt

@@ -25,6 +25,10 @@ import com.mytatvarnsdk.CgmTrackyLibModule
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityPlaceSensorBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.logModuleEvent
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.safeLogModuleEvent
+import com.mytatvarnsdk.utils.ToolbarSupportHelper
+import io.sentry.SentryLogLevel
 
 class PlaceSensorActivity : AppCompatActivity() {
     private lateinit var binding: ActivityPlaceSensorBinding
@@ -59,20 +63,14 @@ class PlaceSensorActivity : AppCompatActivity() {
             .load(R.drawable.ic_play_gif)
             .into(binding.ivPlay)
 
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "Sensor page")
-            )
-        }
+        ToolbarSupportHelper.bindWhatsappButton(this, binding.toolbar.btnWhatsapp)
 
-        binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("", "cgm_watch_demo_clicked")
-
-            startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
-            )
-        }
+        ToolbarSupportHelper.configureWatchDemoButton(
+            context = this,
+            btnWatchDemo = binding.toolbar.btnWatchDemo,
+            isForReconnect = isForReconnect,
+            onClickAnalytics = { sendDataToRN("", "cgm_watch_demo_clicked") }
+        )
 
         binding.commonButton.tvProceed.text = "I Have Placed The Sensor"
         binding.commonButton.btnProceed.setOnClickListener {
@@ -99,6 +97,20 @@ class PlaceSensorActivity : AppCompatActivity() {
     }
 
     private fun sendDataToRN(data: String, status: String) {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.$status",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=$status",
+                level = SentryLogLevel.INFO,
+                jsonPayload = data.takeIf { it.isNotEmpty() },
+                attributes = mapOf(
+                    "journey_step" to status,
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         if (reactContext != null) {
             try {
                 val catalystInstance: CatalystInstance = reactContext.catalystInstance
@@ -164,5 +176,9 @@ class PlaceSensorActivity : AppCompatActivity() {
         dialog.show()
     }
 
+    override fun onResume() {
+        super.onResume()
+    }
+
 
 }

package/android/src/main/java/com/mytatvarnsdk/activity/PlaceTransmitterActivity.kt

@@ -25,6 +25,10 @@ import com.mytatvarnsdk.CgmTrackyLibModule
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityPlaceTransmitterBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.logModuleEvent
+import com.mytatvarnsdk.utils.CgmModuleSentryLog.safeLogModuleEvent
+import com.mytatvarnsdk.utils.ToolbarSupportHelper
+import io.sentry.SentryLogLevel
 
 class PlaceTransmitterActivity : AppCompatActivity() {
     private lateinit var binding: ActivityPlaceTransmitterBinding
@@ -71,20 +75,14 @@ class PlaceTransmitterActivity : AppCompatActivity() {
             finish()
         }
 
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "Transmitter page")
-            )
-        }
+        ToolbarSupportHelper.bindWhatsappButton(this, binding.toolbar.btnWhatsapp)
 
-        binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("", "cgm_watch_demo_clicked")
-
-            startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
-            )
-        }
+        ToolbarSupportHelper.configureWatchDemoButton(
+            context = this,
+            btnWatchDemo = binding.toolbar.btnWatchDemo,
+            isForReconnect = isForReconnect,
+            onClickAnalytics = { sendDataToRN("", "cgm_watch_demo_clicked") }
+        )
 
         binding.toolbar.btnClose.setOnClickListener {
             openExitDialog()
@@ -136,6 +134,20 @@ class PlaceTransmitterActivity : AppCompatActivity() {
     }
 
     private fun sendDataToRN(data: String, status: String) {
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.$status",
+                message = "CGM journey | screen=${javaClass.simpleName} | step=$status",
+                level = SentryLogLevel.INFO,
+                jsonPayload = data.takeIf { it.isNotEmpty() },
+                attributes = mapOf(
+                    "journey_step" to status,
+                    "screen" to javaClass.simpleName,
+                    "is_reconnect" to isForReconnect.toString(),
+                ),
+                logsOnly = true,
+            )
+        }
         if (reactContext != null) {
             try {
                 val catalystInstance: CatalystInstance = reactContext.catalystInstance
@@ -170,4 +182,8 @@ class PlaceTransmitterActivity : AppCompatActivity() {
             Log.e("sendDataToRNDirectly", "Error sending data to React", e)
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+    }
 }