react-native-mytatva-rn-sdk 1.3.1 → 1.3.2

package/android/src/main/AndroidManifest.xml

@@ -34,7 +34,8 @@
             android:exported="false" />
         <activity
             android:name=".activity.ConnectSensorActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".activity.HelpActivity"
             android:exported="false" />

package/android/src/main/AndroidManifestNew.xml

@@ -120,7 +120,8 @@
         <activity
             android:name=".activity.ConnectSensorActivity"
             android:exported="false"
-            android:theme="@style/MyTheme" />
+            android:theme="@style/MyTheme"
+            android:windowSoftInputMode="adjustResize" />
 
         <activity
             android:name=".activity.VideoActivity"

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

@@ -8,6 +8,8 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.util.Log
 import android.util.TypedValue
 import android.view.Gravity
@@ -55,6 +57,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import org.json.JSONObject
+import kotlin.math.max
 
 
 class ConnectSensorActivity : BaseBleActivity() {
@@ -65,6 +68,10 @@ class ConnectSensorActivity : BaseBleActivity() {
     private var isForReconnect: Boolean = false
     private val reactContext = CgmTrackyLibModule.mReactContext
     private var isManualInputVisible: Boolean = false
+
+    private companion object {
+        const val MIN_SENSOR_ID_LENGTH = 5
+    }
     private var suppressUnbindErrorForSensorRebind = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -75,7 +82,16 @@ class ConnectSensorActivity : BaseBleActivity() {
         enableEdgeToEdge()
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
             val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
+            v.setPadding(
+                systemBars.left,
+                systemBars.top,
+                systemBars.right,
+                max(systemBars.bottom, ime.bottom)
+            )
+            if (isManualInputVisible && ime.bottom > 0) {
+                binding.scrollMain.post { scrollToManualConnectButton() }
+            }
             insets
         }
         initialize()
@@ -141,13 +157,74 @@ class ConnectSensorActivity : BaseBleActivity() {
             binding.clPermission.visibility = View.VISIBLE
         }
 
-        binding.tvEnterIdManually.setOnClickListener {
+        binding.clManualEntry.setOnClickListener {
             toggleManualInput()
         }
 
         binding.btnConnectManual.setOnClickListener {
             connectSensorManually()
         }
+
+        binding.etSensorId.setOnClickListener {
+            binding.scrollMain.postDelayed({ scrollToManualConnectButton() }, 100)
+        }
+
+        binding.etSensorId.setOnFocusChangeListener { _, hasFocus ->
+            if (hasFocus) {
+                binding.scrollMain.postDelayed({ scrollToManualConnectButton() }, 300)
+            }
+        }
+
+        binding.etSensorId.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit
+            override fun afterTextChanged(s: Editable?) {
+                updateManualConnectButtonState()
+            }
+        })
+        updateManualConnectButtonState()
+    }
+
+    private fun updateManualConnectButtonState() {
+        val sensorId = binding.etSensorId.text.toString().trim()
+        val isValid = sensorId.length >= MIN_SENSOR_ID_LENGTH
+        binding.btnConnectManual.isClickable = isValid
+        binding.btnConnectManual.isFocusable = isValid
+        binding.btnConnectManual.alpha = if (isValid) 1f else 0.5f
+        binding.tvManualConnectValidation.visibility = if (isValid) View.GONE else View.VISIBLE
+    }
+
+    private fun dpToPx(dp: Int): Int {
+        return TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            dp.toFloat(),
+            resources.displayMetrics
+        ).toInt()
+    }
+
+    private fun scrollToManualConnectButton() {
+        if (!isManualInputVisible) {
+            return
+        }
+
+        binding.scrollMain.post {
+            val scrollView = binding.scrollMain
+            val connectButton = binding.btnConnectManual
+
+            val buttonLocation = IntArray(2)
+            connectButton.getLocationOnScreen(buttonLocation)
+            val scrollLocation = IntArray(2)
+            scrollView.getLocationOnScreen(scrollLocation)
+
+            val buttonBottom = buttonLocation[1] + connectButton.height
+            val scrollVisibleBottom = scrollLocation[1] + scrollView.height
+            val extraPadding = dpToPx(24)
+
+            if (buttonBottom + extraPadding > scrollVisibleBottom) {
+                val delta = buttonBottom + extraPadding - scrollVisibleBottom
+                scrollView.smoothScrollBy(0, delta)
+            }
+        }
     }
 
     private fun toggleManualInput() {
@@ -156,12 +233,20 @@ class ConnectSensorActivity : BaseBleActivity() {
             binding.clPermission.visibility = View.GONE
             binding.clManualInput.visibility = View.VISIBLE
             binding.commonButton.root.visibility = View.GONE
-            binding.tvCantScanQr.text = "Scan the QR."
+            binding.tvCantScanQr.visibility = View.GONE
+            binding.tvEnterIdManually.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            binding.tvEnterIdManually.gravity = Gravity.CENTER
             binding.tvEnterIdManually.text = "Scan QR"
+            binding.etSensorId.text?.clear()
+            updateManualConnectButtonState()
+            binding.scrollMain.post { scrollToManualConnectButton() }
         } else {
             binding.clManualInput.visibility = View.GONE
             binding.clPermission.visibility = View.VISIBLE
             binding.commonButton.root.visibility = View.VISIBLE
+            binding.tvCantScanQr.visibility = View.VISIBLE
+            binding.tvEnterIdManually.layoutParams.width = ViewGroup.LayoutParams.WRAP_CONTENT
+            binding.tvEnterIdManually.gravity = Gravity.NO_GRAVITY
             binding.tvCantScanQr.setText(R.string.txt_cant_scan_sensor_qr)
             binding.tvEnterIdManually.setText(R.string.txt_enter_id_manually)
         }
@@ -169,8 +254,8 @@ class ConnectSensorActivity : BaseBleActivity() {
 
     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()
+        if (sensorId.length < MIN_SENSOR_ID_LENGTH) {
+            Toast.makeText(this, getString(R.string.txt_manual_sensor_id_min_length), Toast.LENGTH_SHORT).show()
             return
         }
 

package/android/src/main/res/layout/activity_connect_sensor.xml

@@ -118,17 +118,25 @@
         app:layout_constraintTop_toBottomOf="@+id/llProgress" />
 
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/clMain"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/connectSensorScroll"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginTop="16dp"
-        android:orientation="vertical"
+        android:clipToPadding="false"
+        android:fillViewport="true"
         app:layout_constraintBottom_toTopOf="@+id/commonButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/divider">
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/clMain"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="16dp">
+
         <TextView
             android:id="@+id/tvStep"
             android:layout_width="wrap_content"
@@ -335,17 +343,31 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
+                <TextView
+                    android:id="@+id/tvManualConnectValidation"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:fontFamily="@font/roboto_regular"
+                    android:text="@string/txt_manual_sensor_id_min_length"
+                    android:textColor="#F5C26B"
+                    android:textSize="12sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/etSensorId" />
+
                 <androidx.cardview.widget.CardView
                     android:id="@+id/btnConnectManual"
                     android:layout_width="0dp"
                     android:layout_height="54dp"
-                    android:layout_marginTop="12dp"
+                    android:layout_marginTop="8dp"
+                    android:alpha="0.5"
                     app:cardBackgroundColor="#2A805A"
                     app:cardCornerRadius="12dp"
                     app:cardElevation="0dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/etSensorId">
+                    app:layout_constraintTop_toBottomOf="@+id/tvManualConnectValidation">
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
@@ -393,6 +415,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
                 android:background="@drawable/bg_manual_entry_bar"
+                android:clickable="true"
+                android:focusable="true"
                 android:gravity="center"
                 android:orientation="horizontal"
                 android:paddingHorizontal="16dp"
@@ -402,6 +426,8 @@
                     android:id="@+id/tvCantScanQr"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:clickable="false"
+                    android:focusable="false"
                     android:fontFamily="@font/roboto_regular"
                     android:text="@string/txt_cant_scan_sensor_qr"
                     android:textColor="#2D3282"
@@ -412,6 +438,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
+                    android:clickable="false"
+                    android:focusable="false"
                     android:fontFamily="@font/roboto_bold"
                     android:text="@string/txt_enter_id_manually"
                     android:textColor="@color/color_green"
@@ -423,7 +451,9 @@
 
         </FrameLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clFail"

package/android/src/main/res/values/strings.xml

@@ -199,6 +199,7 @@
     <string name="verification_fail">verification failed</string>
     <string name="txt_provide_camera_permisison"><u>Provide Camera Permissions</u></string>
     <string name="txt_cant_scan_sensor_qr">Can\'t scan the sensor QR?</string>
+    <string name="txt_manual_sensor_id_min_length">Enter at least 5 characters to enable Connect.</string>
     <string name="txt_enter_id_manually"><u>Enter ID Manually</u></string>
     <string name="txt_know_more"><u>Know More</u></string>
     <string name="txt_open_setting"><u>Open System Settings</u></string>

package/ios/Custom/CustomOverlayButton.swift

@@ -22,6 +22,8 @@ class CustomOverlayButton: UIView {
 
     private var textLabelCenterXConstraint: NSLayoutConstraint!
     private var rightImageWidthConstraint: NSLayoutConstraint!
+    private var foregroundBottomConstraint: NSLayoutConstraint!
+    private let pressDepth: CGFloat = 12
     
     // MARK: - Button Callback
     var buttonTapCallback: (() -> Void)?
@@ -103,6 +105,12 @@ class CustomOverlayButton: UIView {
         overlayButton.translatesAutoresizingMaskIntoConstraints = false
         overlayButton.setTitle("", for: .normal)
         overlayButton.addTarget(self, action: #selector(buttonTapped), for: .touchUpInside)
+        overlayButton.addTarget(self, action: #selector(buttonTouchDown), for: .touchDown)
+        overlayButton.addTarget(
+            self,
+            action: #selector(buttonTouchUp),
+            for: [.touchUpInside, .touchUpOutside, .touchCancel]
+        )
         addSubview(overlayButton)
 
         // Disable View
@@ -118,6 +126,10 @@ class CustomOverlayButton: UIView {
     private func setupConstraints() {
         textLabelCenterXConstraint = textLabel.centerXAnchor.constraint(equalTo: centerXAnchor, constant: -12)
         rightImageWidthConstraint = rightImageView.widthAnchor.constraint(equalToConstant: 24)
+        foregroundBottomConstraint = foregroundView.bottomAnchor.constraint(
+            equalTo: bottomAnchor,
+            constant: -pressDepth
+        )
         
         NSLayoutConstraint.activate([
             // disableView
@@ -136,7 +148,7 @@ class CustomOverlayButton: UIView {
             foregroundView.topAnchor.constraint(equalTo: topAnchor, constant: 0),
             foregroundView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 0),
             foregroundView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: 0),
-            foregroundView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -12),
+            foregroundBottomConstraint,
 
             // Label on the left
             textLabelCenterXConstraint,
@@ -203,10 +215,40 @@ class CustomOverlayButton: UIView {
     
     func disable() {
         disableView.isHidden = false
+        overlayButton.isEnabled = false
+        setPressed(false, animated: false)
     }
     
     func enable() {
         disableView.isHidden = true
+        overlayButton.isEnabled = true
+    }
+
+    private var isInteractionEnabled: Bool {
+        disableView.isHidden && overlayButton.isEnabled
+    }
+
+    private func setPressed(_ pressed: Bool, animated: Bool) {
+        foregroundBottomConstraint.constant = pressed ? 0 : -pressDepth
+        let animations = {
+            self.foregroundView.alpha = pressed ? 0.9 : 1.0
+            self.layoutIfNeeded()
+        }
+        if animated {
+            UIView.animate(withDuration: 0.12, delay: 0, options: [.curveEaseOut, .allowUserInteraction], animations: animations)
+        } else {
+            animations()
+        }
+    }
+
+    @objc private func buttonTouchDown() {
+        guard isInteractionEnabled else { return }
+        setPressed(true, animated: true)
+    }
+
+    @objc private func buttonTouchUp() {
+        guard isInteractionEnabled else { return }
+        setPressed(false, animated: true)
     }
     
     func setBorderOnly() {
@@ -232,6 +274,8 @@ class CustomOverlayButton: UIView {
     }
     
     @objc private func buttonTapped() {
+        guard isInteractionEnabled else { return }
+        UIImpactFeedbackGenerator(style: .light).impactOccurred()
         buttonTapCallback?()
     }
 }

package/ios/TableViewCell/ConnectDeviceTVC/ConnectDeviceTVC.swift

@@ -17,12 +17,13 @@ class ConnectDeviceTVC: UITableViewCell {
     
     override func awakeFromNib() {
         super.awakeFromNib()
-        // Initialization code
+        selectionStyle = .none
         
         transmitterImageView.image = loadImage(named: "transmitter_image")
         
         button.labelText = "Connect"
         button.hideRightArrow()
+        button.enable()
         
         labelTitle.textColor = CustomColor.shared.darkTextGreen
         labelDesc.textColor = CustomColor.shared.darkTextGreen
@@ -39,5 +40,11 @@ class ConnectDeviceTVC: UITableViewCell {
 
         // Configure the view for the selected state
     }
+
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        button.buttonTapCallback = nil
+        button.enable()
+    }
     
 }

package/ios/TableViewCell/ImageTVC/ImageTVC.swift

@@ -10,6 +10,8 @@ import AVFoundation
 
 class ImageTVC: UITableViewCell {
 
+    private static let minSensorIdLength = 5
+
     @IBOutlet weak var bottomConstraint: NSLayoutConstraint!
     @IBOutlet weak var displayImageView: UIImageView!
     @IBOutlet weak var topConstraint: NSLayoutConstraint!
@@ -27,6 +29,8 @@ class ImageTVC: UITableViewCell {
 
     private var manualEntryView: UIView?
     private var sensorIdTextField: UITextField?
+    private var connectButton: UIButton?
+    private var validationHintLabel: UILabel?
     private var isManualEntryVisible = false
 
     var activeSensorIdTextField: UITextField? {
@@ -66,6 +70,7 @@ class ImageTVC: UITableViewCell {
         manualEntryView?.isHidden = true
         sensorIdTextField?.text = nil
         isManualEntryVisible = false
+        updateConnectButtonState()
     }
 
     // MARK: - Manual Entry UI Setup
@@ -95,8 +100,17 @@ class ImageTVC: UITableViewCell {
         textField.leftViewMode = .always
         textField.rightView = UIView(frame: CGRect(x: 0, y: 0, width: 14, height: 1))
         textField.rightViewMode = .always
+        textField.addTarget(self, action: #selector(sensorIdTextChanged), for: .editingChanged)
         container.addSubview(textField)
 
+        let validationLabel = UILabel()
+        validationLabel.translatesAutoresizingMaskIntoConstraints = false
+        validationLabel.text = "Enter at least 5 characters to enable Connect."
+        validationLabel.font = FontManager.font(ofSize: 12, weight: .regular)
+        validationLabel.textColor = UIColor(red: 255/255, green: 200/255, blue: 120/255, alpha: 1)
+        validationLabel.numberOfLines = 0
+        container.addSubview(validationLabel)
+
         let connectButton = UIButton(type: .custom)
         connectButton.translatesAutoresizingMaskIntoConstraints = false
         connectButton.setTitle("Connect", for: .normal)
@@ -122,7 +136,11 @@ class ImageTVC: UITableViewCell {
             textField.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant: -16),
             textField.heightAnchor.constraint(equalToConstant: 48),
 
-            connectButton.topAnchor.constraint(equalTo: textField.bottomAnchor, constant: 12),
+            validationLabel.topAnchor.constraint(equalTo: textField.bottomAnchor, constant: 8),
+            validationLabel.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 16),
+            validationLabel.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant: -16),
+
+            connectButton.topAnchor.constraint(equalTo: validationLabel.bottomAnchor, constant: 8),
             connectButton.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 16),
             connectButton.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant: -16),
             connectButton.heightAnchor.constraint(equalToConstant: 52),
@@ -140,6 +158,21 @@ class ImageTVC: UITableViewCell {
 
         manualEntryView = container
         sensorIdTextField = textField
+        self.connectButton = connectButton
+        validationHintLabel = validationLabel
+        updateConnectButtonState()
+    }
+
+    private func updateConnectButtonState() {
+        let text = (sensorIdTextField?.text ?? "").trimmingCharacters(in: .whitespaces)
+        let isValid = text.count >= Self.minSensorIdLength
+        connectButton?.isEnabled = isValid
+        connectButton?.alpha = isValid ? 1.0 : 0.5
+        validationHintLabel?.isHidden = isValid
+    }
+
+    @objc private func sensorIdTextChanged() {
+        updateConnectButtonState()
     }
 
     // MARK: - Public API
@@ -157,11 +190,13 @@ class ImageTVC: UITableViewCell {
             cameraView.isHidden = true
             manualEntryView?.isHidden = false
             scannerView?.stopScanning()
+            updateConnectButtonState()
         } else {
             cameraView.isHidden = false
             manualEntryView?.isHidden = true
             sensorIdTextField?.text = nil
             sensorIdTextField?.resignFirstResponder()
+            updateConnectButtonState()
         }
     }
 
@@ -179,6 +214,7 @@ class ImageTVC: UITableViewCell {
     @objc private func connectButtonTapped() {
         sensorIdTextField?.resignFirstResponder()
         let sensorId = (sensorIdTextField?.text ?? "").trimmingCharacters(in: .whitespaces).uppercased()
+        guard sensorId.count >= Self.minSensorIdLength else { return }
         onConnectTapped?(sensorId)
     }
 }

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -88,7 +88,8 @@ class ConnectToSensorViewController: UIViewController {
         
         tableView.delegate = self
         tableView.dataSource = self
-        tableView.keyboardDismissMode = .interactive
+        tableView.keyboardDismissMode = .onDrag
+        setupDismissKeyboardGesture()
         tableView.registerNibs([VerticalLabelsTVC.self,
                                 SeparatorTVC.self,
                                 ImageTVC.self,
@@ -424,6 +425,36 @@ class ConnectToSensorViewController: UIViewController {
         let fieldRect = textField.convert(textField.bounds, to: tableView)
         tableView.scrollRectToVisible(fieldRect.insetBy(dx: 0, dy: -12), animated: animated)
     }
+
+    private func setupDismissKeyboardGesture() {
+        let tap = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboardOnTap))
+        tap.cancelsTouchesInView = false
+        tap.delegate = self
+        view.addGestureRecognizer(tap)
+    }
+
+    @objc private func dismissKeyboardOnTap() {
+        guard isManualEntryMode else { return }
+        view.endEditing(true)
+    }
+
+    private func isTouchInsideSensorIdTextField(_ touch: UITouch) -> Bool {
+        guard isManualEntryMode,
+              let cell = tableView.cellForRow(at: manualEntryIndexPath) as? ImageTVC,
+              let textField = cell.activeSensorIdTextField,
+              let touchedView = touch.view else {
+            return false
+        }
+
+        var view: UIView? = touchedView
+        while let current = view {
+            if current === textField {
+                return true
+            }
+            view = current.superview
+        }
+        return false
+    }
     
     private func showSensorInvalidAlert(message: String) {
         DispatchQueue.main.async {
@@ -546,6 +577,13 @@ class ConnectToSensorViewController: UIViewController {
     
 }
 
+extension ConnectToSensorViewController: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+        guard isManualEntryMode else { return false }
+        return !isTouchInsideSensorIdTextField(touch)
+    }
+}
+
 extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
@@ -622,10 +660,10 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                     }
                     cell.onConnectTapped = { [weak self] sensorId in
                         guard let self = self else { return }
-                        guard !sensorId.isEmpty else {
+                        guard sensorId.count >= 5 else {
                             let alert = UIAlertController(
                                 title: nil,
-                                message: "Please enter a Sensor ID",
+                                message: "Enter at least 5 characters to connect.",
                                 preferredStyle: .alert
                             )
                             alert.addAction(UIAlertAction(title: "OK", style: .default))
@@ -659,13 +697,7 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 bar.layer.borderWidth = 1
                 bar.layer.borderColor = UIColor(red: 220/255, green: 225/255, blue: 245/255, alpha: 1).cgColor
 
-                let prefixText = isManualEntryMode ? "Scan the QR." : "Can't scan the sensor QR?"
-                let linkText = isManualEntryMode ? " Scan QR" : " Enter ID Manually"
-
-                let prefixLabel = UILabel()
-                prefixLabel.text = prefixText
-                prefixLabel.font = FontManager.font(ofSize: 14, weight: .regular)
-                prefixLabel.textColor = UIColor(red: 45/255, green: 50/255, blue: 130/255, alpha: 1)
+                let linkText = isManualEntryMode ? "Scan QR" : " Enter ID Manually"
 
                 let linkLabel = UILabel()
                 let attr = NSMutableAttributedString(string: linkText, attributes: [
@@ -675,7 +707,16 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 ])
                 linkLabel.attributedText = attr
 
-                let stack = UIStackView(arrangedSubviews: [prefixLabel, linkLabel])
+                let stack: UIStackView
+                if isManualEntryMode {
+                    stack = UIStackView(arrangedSubviews: [linkLabel])
+                } else {
+                    let prefixLabel = UILabel()
+                    prefixLabel.text = "Can't scan the sensor QR?"
+                    prefixLabel.font = FontManager.font(ofSize: 14, weight: .regular)
+                    prefixLabel.textColor = UIColor(red: 45/255, green: 50/255, blue: 130/255, alpha: 1)
+                    stack = UIStackView(arrangedSubviews: [prefixLabel, linkLabel])
+                }
                 stack.translatesAutoresizingMaskIntoConstraints = false
                 stack.axis = .horizontal
                 stack.alignment = .center

package/ios/ViewControllers/ConnectToTransmitterViewController.swift

@@ -57,6 +57,7 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
     var foundDevices: NSMutableArray = []
     let manager = KLTBluetoothManager.shared()
     private var bluetoothEnableObserver: NSObjectProtocol?
+    private var isConnectingTransmitter = false
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -328,6 +329,88 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
             }
         }
     }
+
+    private func showTransmitterConnectError(message: String, errorCode: String? = nil) {
+        DispatchQueue.main.async {
+            let alert = UIAlertController(title: nil, message: message, preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default))
+            self.present(alert, animated: true)
+        }
+
+        if let errorCode {
+            let errorPayload: [String: String] = [
+                "status": "cgm_transmitter_detection_failed",
+                "error_description": message,
+                "error_code": errorCode,
+            ]
+            NotificationCenter.default.post(
+                name: Notification.Name("cgmtransmitterdetectionfailed"),
+                object: nil,
+                userInfo: errorPayload
+            )
+        }
+    }
+
+    private func connectToTransmitter(at row: Int) {
+        guard !isConnectingTransmitter else { return }
+        guard row >= 0, row < foundDevices.count else {
+            showTransmitterConnectError(
+                message: "Transmitter not found. Please remove it from the charging pod and try again.",
+                errorCode: "BT_DEVICE_INDEX_INVALID"
+            )
+            return
+        }
+
+        guard let peripheral = foundDevices[row] as? CBPeripheral else {
+            showTransmitterConnectError(
+                message: "Unable to read transmitter details. Please try again.",
+                errorCode: "BT_DEVICE_INVALID"
+            )
+            return
+        }
+
+        if isForReconnect {
+            sensorForceEnd()
+        }
+
+        if !isForReconnect && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
+            showTransmitterConnectError(
+                message: "A transmitter is already connected. Please finish or disconnect the current session before connecting another transmitter.",
+                errorCode: "BT_ALREADY_CONNECTED"
+            )
+            return
+        }
+
+        isConnectingTransmitter = true
+        manager?.stopScan()
+
+        guard let device = KLTDatabaseHandler.shared().queryDevice(withId: peripheral.identifier.uuidString) else {
+            isConnectingTransmitter = false
+            showTransmitterConnectError(
+                message: "Unable to read transmitter details. Please remove it from the charging pod and try again.",
+                errorCode: "BT_DEVICE_NOT_IN_DB"
+            )
+            return
+        }
+
+        let payload = [
+            "status": "cgm_transmitter_connection_successful",
+        ]
+
+        NotificationCenter.default.post(
+            name: Notification.Name("cgmtransmitterconnectionsuccessful"),
+            object: nil,
+            userInfo: payload
+        )
+
+        connectedTime = Date()
+        print("Connected device", device)
+        manager?.readyToConnectedPeripheral = peripheral
+        screenType = .success
+        bottomButton.enable()
+        isConnectingTransmitter = false
+        tableView.reloadData()
+    }
 }
 
 extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDataSource {
@@ -413,6 +496,7 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
         case .listOfDevice:
             let cell: ConnectDeviceTVC = tableView.dequeueReusableCell(for: indexPath)
             cell.button.hideRightArrow()
+            cell.button.enable()
             
         
             let peripheral = foundDevices[indexPath.row] as! CBPeripheral
@@ -420,52 +504,9 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
             let name = device?.advertise?.localName?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
             cell.labelDesc.text = name.isEmpty ? "Unknown" : name
             
-            //cell.labelDesc.text = "Sno:\(devices[indexPath.row].name)"
-            cell.button.buttonTapCallback = {
-                
-                if self.isForReconnect {
-                    self.sensorForceEnd()
-                }
-                
-                if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
-                    return
-                }
-                
-                self.manager?.stopScan()
-                if self.foundDevices.count > indexPath.row {
-                    let peripheral = self.foundDevices[indexPath.row] as! CBPeripheral
-                    if let device = KLTDatabaseHandler.shared().queryDevice(withId: peripheral.identifier.uuidString) {
-                        let payload = [
-                            "status": "cgm_transmitter_connection_successful",
-                        ]
-
-                        NotificationCenter.default.post(
-                            name: Notification.Name("cgmtransmitterconnectionsuccessful"),
-                            object: nil,
-                            userInfo: payload
-                        )
-                        
-                        //let snLocalName = device.advertise?.localName?.trimmingCharacters(in: .whitespacesAndNewlines)
-                        self.connectedTime = Date()
-                        print("Connected device", device)
-                        self.manager?.readyToConnectedPeripheral = peripheral
-                        self.screenType = .success
-                        //API.shared.sendStatus(status: .connected)
-                        self.bottomButton.enable()
-                        tableView.reloadData()
-                    } else {
-                        let errorPayload = [
-                               "status": "cgm_transmitter_detection_failed",
-                               "error_description": "Device not found in database",
-                               "error_code": "BT_DEVICE_NOT_IN_DB"
-                           ]
-                           NotificationCenter.default.post(
-                               name: Notification.Name("cgmtransmitterdetectionfailed"),
-                               object: nil,
-                               userInfo: errorPayload
-                           )
-                    }
-                }
+            let row = indexPath.row
+            cell.button.buttonTapCallback = { [weak self] in
+                self?.connectToTransmitter(at: row)
             }
             return cell
         case .success:

package/package.json

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