react-native-mytatva-rn-sdk 1.2.82 → 1.2.84

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

@@ -9,6 +9,7 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
+import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -144,6 +145,11 @@ class ConnectSensorActivity : BaseBleActivity() {
 
             Glide.with(this).asGif().load(R.drawable.warning).into(binding.ivGif)
 
+            // Restore original text size (24sp) for non-validation API errors
+            binding.tvFailTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 24f)
+            binding.tvFailTitle.text = "Unable to detect sensor"
+            binding.tvFailTitle.setTextColor(Color.parseColor("#101828"))
+
             binding.btnSupport.tvProceed.text = "Contact Support"
             binding.btnRetry.tvProceed.text = "Retry"
 
@@ -301,7 +307,7 @@ class ConnectSensorActivity : BaseBleActivity() {
                     validateDiasensSensor(device)
                 } else {
                     // Non-Diasens user - proceed directly
-                    bind(device)
+                bind(device)
                 }
             }
         }
@@ -357,9 +363,10 @@ class ConnectSensorActivity : BaseBleActivity() {
                                     Log.d("ConnectSensor", "Device verification successful for sensor: $scannedSensorId")
                                     bind(device)
                                 } else if (code == 1 && data == false) {
-                                    // Device verification failed - show fixed message in red
+                                    // Device verification failed - show API msg in red (with fallback)
                                     Log.e("ConnectSensor", "Device verification failed: $msg")
-                                    manageDeviceVerificationError("Please connect with Diasens sensor")
+                                    val errorMessage = if (msg.isNotEmpty()) msg else "This is not a Diasens CGM sensor. Please connect a Diasens sensor to continue."
+                                    manageDeviceVerificationError(errorMessage)
                                 } else {
                                     // code 0 or unexpected - show Try Again
                                     Log.e("ConnectSensor", "Device verification error, code: $code")
@@ -424,10 +431,13 @@ class ConnectSensorActivity : BaseBleActivity() {
             }
         }
 
-        // Show the API message in RED
-        binding.tvReason.visibility = View.VISIBLE
-        binding.tvReason.text = message
-        binding.tvReason.setTextColor(Color.RED)
+        // Replace "Unable to detect sensor" title with the error message in RED
+        binding.tvFailTitle.text = message
+        binding.tvFailTitle.setTextColor(Color.RED)
+        // Set text size to 16sp (same as iOS) for validation API error message
+        binding.tvFailTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
+        binding.tvFailInstructions.visibility = View.GONE
+        binding.tvReason.visibility = View.GONE
 
         val jsonObject = JSONObject()
         jsonObject.put("error_description", message)

package/android/src/main/java/com/mytatvarnsdk/network/AuthenticateSDKService.kt

@@ -253,7 +253,7 @@ class AuthenticateSDKService(val scope: CoroutineScope) {
                 )
 
                 val baseUrl = if (environment == TATVA_ENVIRONMENT.PROD) PROD_BASE_URL else STAGE_BASE_URL
-                val url = "$baseUrl/device-verification?deviceId=$sensorId&deviceType=CGM"
+                val url = "$baseUrl/helper/device-verification?deviceId=$sensorId&deviceType=CGM&vendor=diasens"
 
                 Log.d("API Response", "Device Verification URL: $url")
 

package/ios/Support/API.swift

@@ -322,7 +322,7 @@ class API {
         onSuccess: @escaping (Int, Bool, String) -> Void,
         onFailure: @escaping () -> Void
     ) {
-        let urlString = (envType.lowercased() == "uat" ? STAGE_BASE_URL : PROD_BASE_URL) + "/device-verification?deviceId=\(sensorId)&deviceType=CGM"
+        let urlString = (envType.lowercased() == "uat" ? STAGE_BASE_URL : PROD_BASE_URL) + "/helper/device-verification?deviceId=\(sensorId)&deviceType=CGM&vendor=diasens"
         
         guard let url = URL(string: urlString) else {
             print("===>verifyDevice: Invalid URL")

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -281,9 +281,10 @@ class ConnectToSensorViewController: UIViewController {
                     self.viewModel.debouncer.update(with: .connected)
                     self.showConfirmInsulinUser()
                 } else if code == 1 && dataValue == false {
-                    // Device verification failed - show fixed message in red
+                    // Device verification failed - show API msg in red (with fallback)
                     print("Device verification failed: \(msg)")
-                    self.showDeviceVerificationError(message: "Please connect with Diasens sensor")
+                    let errorMessage = msg.isEmpty ? "This is not a Diasens CGM sensor. Please connect a Diasens sensor to continue." : msg
+                    self.showDeviceVerificationError(message: errorMessage)
                 } else {
                     // code 0 or unexpected - show Try Again
                     print("Device verification error, code: \(code)")
@@ -468,7 +469,8 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
         case .error:
             switch enumFailureTableRow(rawValue: indexPath.row) {
             case .failAnimation:
-                return 120
+                // Reduced height for validation API error, normal for other errors
+                return (deviceVerificationErrorMessage != nil) ? 80 : 120
             case .image:
                 return (UIScreen.main.bounds.width * 120 / 390) + 20
             default:
@@ -547,6 +549,17 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 let cell: ImageTVC = tableView.dequeueReusableCell(for: indexPath)
                 cell.displayImageView.loadGif(named: "failure")
                 cell.bottomConstraint.constant = 11
+                // Hide camera view to prevent it from overlapping error content (cell reuse)
+                cell.cameraView.isHidden = true
+                cell.displayImageView.isHidden = false
+                // Scale down only for validation API error (65% of original size)
+                if deviceVerificationErrorMessage != nil {
+                    cell.displayImageView.contentMode = .scaleAspectFit
+                    cell.displayImageView.clipsToBounds = true
+                    cell.displayImageView.transform = CGAffineTransform(scaleX: 0.65, y: 0.65)
+                } else {
+                    cell.displayImageView.transform = .identity
+                }
                 return cell
             case .details:
                 let cell: VerticalLabelsTVC = tableView.dequeueReusableCell(for: indexPath)
@@ -555,9 +568,15 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 if let verificationError = deviceVerificationErrorMessage {
                     cell.label2.text = verificationError
                     cell.label2.textColor = .red
+                    // Use smaller font for validation API error message (default title is 32pt)
+                    cell.label2.font = FontManager.font(ofSize: 16, weight: .medium)
+                    cell.label2.numberOfLines = 0
                     cell.label3.text = ""
                 } else {
                     cell.label2.text = "Unable to detect sensor"
+                    // Restore default title font for normal error
+                    cell.label2.font = FontManager.title
+                    cell.label2.textColor = CustomColor.shared.primaryBlack
                     cell.label3.text = "Make sure there is proper lighting in the room"
                 }
                 return cell
@@ -566,6 +585,9 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 cell.topConstraint.constant = 0
                 cell.displayImageView.image = loadImage(named: "flip_the_reference")
                 cell.displayImageView.contentMode = .scaleAspectFill
+                // Hide camera view to prevent it from overlapping error content (cell reuse)
+                cell.cameraView.isHidden = true
+                cell.displayImageView.isHidden = false
                 return cell
             case .watchVideo:
                 let cell: WatchVideoTVC = tableView.dequeueReusableCell(for: indexPath)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mytatva-rn-sdk",
-  "version": "1.2.82",
+  "version": "1.2.84",
   "description": "a package to inject data into visit health pwa",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",