react-native-mytatva-rn-sdk 1.2.97 → 1.2.99

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
@@ -379,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 {
@@ -700,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)
@@ -728,6 +752,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             updateUserData(userData)
             userToken = token
             env = envType.lowercase()
+            fetchCustomerSupportDetails()
             currentActivity?.startActivity(
                 Intent(currentActivity, StartCGMActivity::class.java).putExtra(
                     "IsForReconnect",

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

@@ -14,6 +14,8 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
+import android.widget.Toast
+import ist.com.sdk.AlgorithmTools
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
 import androidx.core.app.ActivityCompat
@@ -21,10 +23,13 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import cgmblelib.Enum.enumUnBind
+import cgmblelib.ble.gattcallback.GattTool
 import cgmblelib.ble.gattcallback.ManageGattCallback
 import cgmblelib.ble.scancallback.ManageScanCallback
 import cgmblelib.custom.livedata.scan.PocDeviceAndRssi
 import cgmblelib.database.entity.PocDevice
+import cgmblelib.database.repository.RepositoryDevice
 import cgmblelib.utils.SharedPreferencesLibraryUtil
 import com.bumptech.glide.Glide
 import com.facebook.react.bridge.Arguments
@@ -42,6 +47,7 @@ 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
@@ -58,6 +64,8 @@ class ConnectSensorActivity : BaseBleActivity() {
     var transmitterDeviceInfo: PocDeviceAndRssi? = null
     private var isForReconnect: Boolean = false
     private val reactContext = CgmTrackyLibModule.mReactContext
+    private var isManualInputVisible: Boolean = false
+    private var suppressUnbindErrorForSensorRebind = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -102,19 +110,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() {
@@ -137,6 +140,128 @@ class ConnectSensorActivity : BaseBleActivity() {
             binding.commonButton.btnProceed.alpha = 0.5f
             binding.clPermission.visibility = View.VISIBLE
         }
+
+        binding.tvEnterIdManually.setOnClickListener {
+            toggleManualInput()
+        }
+
+        binding.btnConnectManual.setOnClickListener {
+            connectSensorManually()
+        }
+    }
+
+    private fun toggleManualInput() {
+        isManualInputVisible = !isManualInputVisible
+        if (isManualInputVisible) {
+            binding.clPermission.visibility = View.GONE
+            binding.clManualInput.visibility = View.VISIBLE
+            binding.commonButton.root.visibility = View.GONE
+            binding.tvCantScanQr.text = "Scan the QR."
+            binding.tvEnterIdManually.text = "Scan QR"
+        } else {
+            binding.clManualInput.visibility = View.GONE
+            binding.clPermission.visibility = View.VISIBLE
+            binding.commonButton.root.visibility = View.VISIBLE
+            binding.tvCantScanQr.setText(R.string.txt_cant_scan_sensor_qr)
+            binding.tvEnterIdManually.setText(R.string.txt_enter_id_manually)
+        }
+    }
+
+    private fun connectSensorManually() {
+        val sensorId = binding.etSensorId.text.toString().trim().uppercase()
+        if (sensorId.isEmpty()) {
+            Toast.makeText(this, "Please enter Sensor ID", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        val device = transmitterDeviceInfo?.pocDevice
+        if (device == null) {
+            Toast.makeText(this, "Transmitter not found. Please restart.", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        val transmitterName = device.name
+        if (transmitterName.isNullOrEmpty()) {
+            Toast.makeText(this, "Transmitter not found. Please restart.", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        val decoded = try {
+            AlgorithmTools.getInstance().decodeCT(sensorId.toCharArray())
+        } catch (e: Exception) {
+            Log.e("ConnectSensor", "Manual entry decode failed: ${e.message}")
+            Toast.makeText(this, "Invalid Sensor ID format", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        // Match iOS manual entry: decoded CT code must yield usable algorithm coefficients.
+        if (decoded.k <= 0f && decoded.r <= 0f) {
+            Toast.makeText(this, getString(R.string.verification_fail), Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        val prefsHelper = SharedPreferencesLibraryUtil(this)
+        prefsHelper.setQRInformation(
+            transmitterName,
+            sensorId,
+            decoded.k,
+            decoded.r,
+            sensorId
+        )
+
+        // Match QRActivity.showMessage: verify sensor/transmitter pairing before BLE bind.
+        val qrInformation = prefsHelper.qrInformation
+        val isEffective = qrInformation?.isEffective(transmitterName, decoded.r, decoded.k) ?: false
+        safeLogModuleEvent {
+            logModuleEvent(
+                where = "cgmJourney.cgm_manual_sensor_is_effective",
+                message = "CGM journey | screen=${javaClass.simpleName} | manualEntry isEffective=$isEffective",
+                level = SentryLogLevel.INFO,
+                jsonPayload = sensorId,
+                attributes = mapOf(
+                    "journey_step" to "cgm_manual_sensor_is_effective",
+                    "screen" to javaClass.simpleName,
+                    "is_effective" to isEffective.toString(),
+                    "transmitter_name" to transmitterName,
+                    "sensor_id" to sensorId,
+                ),
+                logsOnly = true,
+            )
+        }
+        if (!isEffective || qrInformation == null) {
+            Toast.makeText(this, getString(R.string.verification_fail), Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        proceedToSensorBind(device)
+    }
+
+    private fun proceedToSensorBind(device: PocDevice) {
+        val lastConnectCgm = CgmTrackyLibModule.lastConnectCgm
+        if (lastConnectCgm.equals("Diasens", ignoreCase = true)) {
+            validateDiasensSensor(device)
+        } else {
+            bind(device)
+        }
+    }
+
+    /**
+     * If the transmitter is already bound (e.g. from a prior failed manual attempt), the BLE stack
+     * takes the reset shortcut and skips check/init that programs K/R for the new sensor code.
+     * Force-clear the DB bind so the next connection runs the full sensor pairing flow.
+     */
+    private fun clearExistingBindIfNeeded() {
+        try {
+            val existing = RepositoryDevice.getInstance(this).getLatestDeviceIoThread() ?: return
+            if (!existing.isBound) {
+                return
+            }
+            suppressUnbindErrorForSensorRebind = true
+            GattTool.unBindInDatabaseIoThread(this, existing, enumUnBind.UNBIND_FORCE)
+        } catch (e: Exception) {
+            suppressUnbindErrorForSensorRebind = false
+            Log.w("ConnectSensor", "clearExistingBindIfNeeded: ${e.message}")
+        }
     }
 
     fun manageErrorState(showError: Boolean, errorStatus: String) {
@@ -189,10 +314,14 @@ class ConnectSensorActivity : BaseBleActivity() {
             binding.btnRetry.btnProceed.setOnClickListener {
                 sendDataToRN("", "cgm_retry_connect_sensor_clicked")
 
-                transmitterDeviceInfo?.let {
-                    QRActivity.startQR(
-                        this, it.pocDevice
-                    )
+                if (isManualInputVisible) {
+                    manageErrorState(false, "")
+                } else {
+                    transmitterDeviceInfo?.let {
+                        QRActivity.startQR(
+                            this, it.pocDevice
+                        )
+                    }
                 }
             }
 
@@ -537,8 +666,12 @@ class ConnectSensorActivity : BaseBleActivity() {
         binding.btnRetry.btnProceed.setOnClickListener {
             sendDataToRN("", "cgm_retry_connect_sensor_clicked")
 
-            transmitterDeviceInfo?.let {
-                QRActivity.startQR(this, it.pocDevice)
+            if (isManualInputVisible) {
+                manageErrorState(false, "")
+            } else {
+                transmitterDeviceInfo?.let {
+                    QRActivity.startQR(this, it.pocDevice)
+                }
             }
         }
 
@@ -558,6 +691,7 @@ class ConnectSensorActivity : BaseBleActivity() {
     private fun bind(device: PocDevice) {
         try {
             if (device.address != null) {
+                clearExistingBindIfNeeded()
                 ManageGattCallback.getInstance().ConnectViaAddress(device.address)
                 ManageScanCallback.getInstance().stopLeScan()
                 ProgressManagement.getInstance()
@@ -690,14 +824,26 @@ class ConnectSensorActivity : BaseBleActivity() {
 
     override fun unbindReset() {
         super.unbindReset()
+        if (suppressUnbindErrorForSensorRebind) {
+            suppressUnbindErrorForSensorRebind = false
+            return
+        }
         manageErrorState(true, "Unbinded")
 
     }
 
     override fun unbindCommand() {
         super.unbindCommand()
+        if (suppressUnbindErrorForSensorRebind) {
+            suppressUnbindErrorForSensorRebind = false
+            return
+        }
         manageErrorState(true, "Unbinded")
 
     }
 
+    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,6 +36,7 @@ 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
@@ -170,23 +171,14 @@ class PermissionActivity : BasePermissionActivity() {
             finish()
         }
 
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "connection journey 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.tvKnowMore.setOnClickListener {
             openBluetoothDialog()

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

@@ -27,6 +27,7 @@ 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() {
@@ -62,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 {
@@ -181,5 +176,9 @@ class PlaceSensorActivity : AppCompatActivity() {
         dialog.show()
     }
 
+    override fun onResume() {
+        super.onResume()
+    }
+
 
 }

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

@@ -27,6 +27,7 @@ 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() {
@@ -74,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()
@@ -187,4 +182,8 @@ class PlaceTransmitterActivity : AppCompatActivity() {
             Log.e("sendDataToRNDirectly", "Error sending data to React", e)
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+    }
 }

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

@@ -53,6 +53,7 @@ import com.mytatvarnsdk.myView.progress.ProgressManagement
 import com.mytatvarnsdk.myView.progress.ProgressType
 import com.mytatvarnsdk.network.AuthenticateSDKService
 import com.mytatvarnsdk.utils.CgmModuleSentryLog.logModuleEvent
+import com.mytatvarnsdk.utils.ToolbarSupportHelper
 import com.mytatvarnsdk.utils.CgmModuleSentryLog.safeLogModuleEvent
 import io.sentry.SentryLogLevel
 import kotlinx.coroutines.CoroutineScope
@@ -381,20 +382,14 @@ class SearchTransmitterActivity : BaseBleActivity() {
     }
 
     private fun setupClickListeners() {
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "Transmitter page")
-            )
-        }
-
-        binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("", "cgm_watch_demo_clicked")
-
-            startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", if (isForReconnect) "n_pUrFoZ1wQ" else "r5Zemc4R044")
-            )
-        }
+        ToolbarSupportHelper.bindWhatsappButton(this, binding.toolbar.btnWhatsapp)
+
+        ToolbarSupportHelper.configureWatchDemoButton(
+            context = this,
+            btnWatchDemo = binding.toolbar.btnWatchDemo,
+            isForReconnect = isForReconnect,
+            onClickAnalytics = { sendDataToRN("", "cgm_watch_demo_clicked") }
+        )
 
         binding.toolbar.btnClose.setOnClickListener {
             openExitDialog()

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

@@ -31,6 +31,7 @@ import com.mytatvarnsdk.network.AuthenticateSDKService
 import com.mytatvarnsdk.network.AuthenticateSDKService.LoaderListener
 import com.mytatvarnsdk.utils.DeviceStatus
 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
@@ -80,23 +81,14 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
 
         authenticateSDKService = AuthenticateSDKService(scope = scope)
 
-        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.btnProceed.setOnClickListener {
             sendDataToRN("", "cgm_connect_sensor_proceed_clicked")
@@ -255,4 +247,8 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
         dialog.show()
     }
 
+    override fun onResume() {
+        super.onResume()
+    }
+
 }

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

@@ -30,6 +30,7 @@ import com.mytatvarnsdk.databinding.ActivityStartCgmactivityBinding
 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
 
 
@@ -95,22 +96,15 @@ class StartCGMActivity : AppCompatActivity() {
             openExitDialog()
         }
 
-        binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(
-                Intent(this, HelpActivity::class.java)
-                    .putExtra("ScreenName", "connection journey 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"
-                )
-            )
-        }
+        binding.toolbar.btnWatchDemo.setOnClickListener(null)
+        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() {