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

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
@@ -59,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)
@@ -133,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) {
@@ -185,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
+                        )
+                    }
                 }
             }
 
@@ -533,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)
+                }
             }
         }
 
@@ -554,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()
@@ -686,12 +824,20 @@ 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")
 
     }

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

@@ -246,7 +246,11 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/transmitterImages">
 
-            <!-- Searching State -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/clPermission"
                 android:layout_width="match_parent"
@@ -289,7 +293,6 @@
                     app:layout_constraintTop_toBottomOf="@+id/tvDesc"
                     app:layout_constraintVertical_chainStyle="packed" />
 
-
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/ivProceedArrow"
                     android:layout_width="18dp"
@@ -303,9 +306,121 @@
                     app:layout_constraintTop_toTopOf="@+id/tvPermission"
                     app:tint="@color/color_green" />
 
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/clManualInput"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:background="@drawable/bg_dark_black"
+                android:paddingHorizontal="20dp"
+                android:paddingVertical="20dp"
+                android:visibility="gone">
+
+                <EditText
+                    android:id="@+id/etSensorId"
+                    android:layout_width="0dp"
+                    android:layout_height="52dp"
+                    android:background="@drawable/bg_white_corner_10"
+                    android:fontFamily="@font/roboto_regular"
+                    android:hint="Enter Sensor ID"
+                    android:importantForAutofill="no"
+                    android:inputType="textCapCharacters"
+                    android:paddingHorizontal="14dp"
+                    android:textColor="#101828"
+                    android:textColorHint="#98A2B3"
+                    android:textSize="14sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/btnConnectManual"
+                    android:layout_width="0dp"
+                    android:layout_height="54dp"
+                    android:layout_marginTop="12dp"
+                    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">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/bg_green_border_20">
+
+                        <TextView
+                            android:id="@+id/tvConnectManual"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/roboto_semibold"
+                            android:text="Connect"
+                            android:textColor="#FFFFFF"
+                            android:textSize="16sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </androidx.cardview.widget.CardView>
+
+                <TextView
+                    android:id="@+id/tvManualEntryHint"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:fontFamily="@font/roboto_regular"
+                    android:gravity="center"
+                    android:text="Scan the QR with mobile camera to get a sensor ID."
+                    android:textAlignment="center"
+                    android:textColor="#98A2B3"
+                    android:textSize="12sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/btnConnectManual" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <LinearLayout
+                android:id="@+id/clManualEntry"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:background="@drawable/bg_manual_entry_bar"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="14dp">
+
+                <TextView
+                    android:id="@+id/tvCantScanQr"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/roboto_regular"
+                    android:text="@string/txt_cant_scan_sensor_qr"
+                    android:textColor="#2D3282"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tvEnterIdManually"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:fontFamily="@font/roboto_bold"
+                    android:text="@string/txt_enter_id_manually"
+                    android:textColor="@color/color_green"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            </LinearLayout>
+
         </FrameLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

package/ios/Database/KLTBluetoothManager.m

@@ -1,4 +1,4 @@
-//
+​//
 //  KLTBluetoothManager.m
 //  KaiLiTe
 //
@@ -28,6 +28,8 @@
 // 蓝牙管理状态
 @property (nonatomic, assign) CBManagerState centralManagerState;
 
+- (BOOL)klt_safeWriteData:(NSData *)data withType:(CBCharacteristicWriteType)type;
+
 @end
 
 @implementation KLTBluetoothManager
@@ -71,6 +73,19 @@
     return self;
 }
 
+/// NSTimer must not be invalidated synchronously from its own fired callback — that
+/// can block the main thread for seconds (Sentry AppHang in -[KLTBluetoothManager endScan]).
+- (void)invalidateConnectTimerSafely {
+    NSTimer *timer = _connectTimer;
+    _connectTimer = nil;
+    if (!timer) {
+        return;
+    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [timer invalidate];
+    });
+}
+
 + (KLTBluetoothManager *)sharedManager {
     static KLTBluetoothManager *bluetooth;
     static dispatch_once_t onceToken;
@@ -81,6 +96,21 @@
     return bluetooth;
 }
 
+- (BOOL)klt_safeWriteData:(NSData *)data withType:(CBCharacteristicWriteType)type {
+    if (!data || data.length == 0) {
+        return NO;
+    }
+
+    CBPeripheral *peripheral = self.connectedPeripheral;
+    CBCharacteristic *characteristic = self.writeReadCharacteristic;
+    if (!peripheral || peripheral.state != CBPeripheralStateConnected || !characteristic) {
+        KLTLog(@"BLE write skipped - peripheral or write characteristic unavailable");
+        return NO;
+    }
+
+    [peripheral writeValue:data forCharacteristic:characteristic type:type];
+    return YES;
+}
 
 #pragma mark - cbcenteralmanager delegate
 
@@ -476,7 +506,8 @@
     Device *currentDevice = self.currentDevice;
     if (KLTLocalSettingManager.shareInstance.canConnectOtherDevice) {
         // 直接开始自检协议
-        [self.connectedPeripheral writeValue:[ProtocalTools check_request:self.eDevice] forCharacteristic:self.writeReadCharacteristic type:CBCharacteristicWriteWithoutResponse];
+        [self klt_safeWriteData:[ProtocalTools check_request:self.eDevice]
+                       withType:CBCharacteristicWriteWithoutResponse];
     } else {
         // 二次重连 0x22快传批量数据
         NSInteger maxGlucoseId = [[KLTDatabaseHandler shared] getLatestAndMaxGlucoseIdOfDevice:currentDevice];
@@ -515,7 +546,9 @@
         }
         
         NSData *data = [ProtocalTools pullGlucose_series_request:glucoseId + 1 andNumber:pullNums andEDevice:self.eDevice];
-        [self.connectedPeripheral writeValue:data forCharacteristic:self.writeReadCharacteristic type:CBCharacteristicWriteWithoutResponse];
+        if (![self klt_safeWriteData:data withType:CBCharacteristicWriteWithoutResponse]) {
+            return;
+        }
         self.status = BluetoothManagerStatusResendStart;
         self.isInResend = YES;
     }
@@ -532,7 +565,8 @@
         [Notification_Center postNotificationName:@"DidHandleResendData" object:nil];
         
         // CT3/CT4发送重置协议这条命令0x11，结束重传状态
-        [self.connectedPeripheral writeValue:[ProtocalTools reset_request:self.eDevice] forCharacteristic:self.writeReadCharacteristic type:CBCharacteristicWriteWithoutResponse];
+        [self klt_safeWriteData:[ProtocalTools reset_request:self.eDevice]
+                       withType:CBCharacteristicWriteWithoutResponse];
     } else {
         for (Glucose *glucose in glucoseList) {
             ReceiveData *receive = [self handleCommonReceiveGluData:glucose commandText:@"22"];
@@ -553,7 +587,7 @@
                 pullNums = remain_points;
             }
             NSData *data = [ProtocalTools pullGlucose_series_request:maxGlucoseId + 1 andNumber:pullNums andEDevice:self.eDevice];
-            [self.connectedPeripheral writeValue:data forCharacteristic:self.writeReadCharacteristic type:CBCharacteristicWriteWithoutResponse];
+            [self klt_safeWriteData:data withType:CBCharacteristicWriteWithoutResponse];
         }
     }
 }
@@ -595,8 +629,7 @@
     [self.peripherals removeAllObjects];
     self.connectedPeripheral = nil;
     
-    [_connectTimer invalidate];
-    _connectTimer = nil;
+    [self invalidateConnectTimerSafely];
     [_rescanTimer invalidate];
     _rescanTimer = nil;
 
@@ -610,6 +643,14 @@
 #pragma mark - other method
 
 - (void)endScan {
+    // endScan is the _connectTimer target. Defer to the next run-loop turn so we never
+    // invalidate the firing timer or run stopScan/KVO inside the timer callback.
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self performEndScanAfterTimer];
+    });
+}
+
+- (void)performEndScanAfterTimer {
     // 20s后扫描设备超时未连上再次尝试连接
     if (self.currentDevice && BluetoothManagerStatusScanStart == self.status) {
         for (CBPeripheral *per in self.peripherals) {
@@ -620,7 +661,7 @@
             }
         }
     }
-    
+
     [self stopScan];
     self.status = BluetoothManagerStatusTimeOut;
 }
@@ -630,8 +671,7 @@
     self.status = BluetoothManagerStatusScanStop;
     [self.centralManager stopScan];
 
-    [_connectTimer invalidate];
-    _connectTimer = nil;
+    [self invalidateConnectTimerSafely];
 }
 
 // 开始扫描
@@ -678,23 +718,38 @@
 //}
 
 - (void)startScan {
+    // Defer to the next main-queue run-loop turn so scanForPeripheralsWithServices is
+    // never invoked synchronously from an NSTimer callback (Sentry AppHang on iOS).
+    // CBCentralManager is bound to the main queue — this does not move BLE off main.
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self performStartScan];
+    });
+}
+
+- (void)performStartScan {
+    if (self.status == BluetoothManagerStatusScanStart) {
+        KLTLog(@"startScan skipped — scan already in progress");
+        return;
+    }
+
     self.connectedPeripheral = nil;
     [self.peripherals removeAllObjects];
- 
+
     if (self.centralManager.state != CBManagerStatePoweredOn) {
         NSLog(@"Bluetooth is not powered on. Aborting scan.");
         // Do not change status here – just wait for BluetoothEnable notification
         // The UI layer listens for BluetoothEnable and will start scan once BLE is ready.
         return;
     }
- 
+
     NSLog(@"Allen manager start scan %d", __LINE__);
     self.status = BluetoothManagerStatusScanStart;
     self.isBgForceConnectDevice = NO;
- 
+
     NSDictionary *scanOptions = @{ CBCentralManagerScanOptionAllowDuplicatesKey: @(YES) };
     [self.centralManager scanForPeripheralsWithServices:nil options:scanOptions];
- 
+
+    [self invalidateConnectTimerSafely];
     _connectTimer = [NSTimer scheduledTimerWithTimeInterval:20.0
                                                      target:self
                                                    selector:@selector(endScan)

package/ios/TableViewCell/ImageTVC/ImageTVC.swift

@@ -7,58 +7,191 @@
 
 import UIKit
 import AVFoundation
+
 class ImageTVC: UITableViewCell {
 
     @IBOutlet weak var bottomConstraint: NSLayoutConstraint!
     @IBOutlet weak var displayImageView: UIImageView!
     @IBOutlet weak var topConstraint: NSLayoutConstraint!
-    
+
     @IBOutlet var gifView: UIImageView!
     @IBOutlet weak var cameraView: CustomView!
     @IBOutlet weak var cameraTitleLabel: UILabel!
     @IBOutlet weak var cameraDescLabel: UILabel!
-    
+
     @IBOutlet var ic_green_arrow: UIImageView!
     var scannerView: QRScannerView!
+
+    var onConnectTapped: ((String) -> Void)?
+    var onTextFieldDidBeginEditing: (() -> Void)?
+
+    private var manualEntryView: UIView?
+    private var sensorIdTextField: UITextField?
+    private var isManualEntryVisible = false
+
+    var activeSensorIdTextField: UITextField? {
+        isManualEntryVisible ? sensorIdTextField : nil
+    }
+
     override func awakeFromNib() {
         super.awakeFromNib()
         gifView.isHidden = true
         ic_green_arrow.image = loadImage(named: "ic_green_arrow")
-        // Initialization code
         cameraTitleLabel.text = "GoodFlip requires camera permission to scan the QR and connect with the sensor"
-        
         cameraTitleLabel.font = FontManager.font(ofSize: 14, weight: .medium)
-        
         cameraTitleLabel.textColor = .white
-        
-        let first = "Provide Camera Permissions"
 
+        let first = "Provide Camera Permissions"
         let attributedString = NSMutableAttributedString(string: first, attributes: [
             .font: FontManager.font(ofSize: 16, weight: .semibold),
             .foregroundColor: CustomColor.shared.lightGreen,
             .underlineStyle: NSUnderlineStyle.single.rawValue,
         ])
-
         cameraDescLabel.attributedText = attributedString
+
+        setupManualEntryView()
     }
 
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
+    }
 
-        // Configure the view for the selected state
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        onConnectTapped = nil
+        onTextFieldDidBeginEditing = nil
+        scannerView?.stopScanning()
+        scannerView?.removeFromSuperview()
+        scannerView = nil
+        manualEntryView?.isHidden = true
+        sensorIdTextField?.text = nil
+        isManualEntryVisible = false
     }
-    
+
+    // MARK: - Manual Entry UI Setup
+
+    private func setupManualEntryView() {
+        let container = UIView()
+        container.translatesAutoresizingMaskIntoConstraints = false
+        container.backgroundColor = UIColor(red: 16/255, green: 24/255, blue: 40/255, alpha: 1)
+        container.layer.cornerRadius = 12
+        container.isHidden = true
+        contentView.addSubview(container)
+
+        let textField = UITextField()
+        textField.translatesAutoresizingMaskIntoConstraints = false
+        textField.placeholder = "Enter Sensor ID"
+        textField.autocapitalizationType = .allCharacters
+        textField.autocorrectionType = .no
+        textField.returnKeyType = .done
+        textField.font = FontManager.font(ofSize: 14, weight: .regular)
+        textField.textColor = UIColor(red: 16/255, green: 24/255, blue: 40/255, alpha: 1)
+        textField.backgroundColor = .white
+        textField.layer.cornerRadius = 8
+        textField.layer.masksToBounds = true
+        textField.delegate = self
+        let leftPad = UIView(frame: CGRect(x: 0, y: 0, width: 14, height: 1))
+        textField.leftView = leftPad
+        textField.leftViewMode = .always
+        textField.rightView = UIView(frame: CGRect(x: 0, y: 0, width: 14, height: 1))
+        textField.rightViewMode = .always
+        container.addSubview(textField)
+
+        let connectButton = UIButton(type: .custom)
+        connectButton.translatesAutoresizingMaskIntoConstraints = false
+        connectButton.setTitle("Connect", for: .normal)
+        connectButton.setTitleColor(.white, for: .normal)
+        connectButton.titleLabel?.font = FontManager.font(ofSize: 16, weight: .semibold)
+        connectButton.backgroundColor = CustomColor.shared.lightGreen
+        connectButton.layer.cornerRadius = 12
+        connectButton.addTarget(self, action: #selector(connectButtonTapped), for: .touchUpInside)
+        container.addSubview(connectButton)
+
+        let hintLabel = UILabel()
+        hintLabel.translatesAutoresizingMaskIntoConstraints = false
+        hintLabel.text = "Scan the QR with mobile camera to get a sensor ID."
+        hintLabel.font = FontManager.font(ofSize: 12, weight: .regular)
+        hintLabel.textColor = UIColor(white: 1, alpha: 0.55)
+        hintLabel.textAlignment = .center
+        hintLabel.numberOfLines = 0
+        container.addSubview(hintLabel)
+
+        NSLayoutConstraint.activate([
+            textField.topAnchor.constraint(equalTo: container.topAnchor, constant: 16),
+            textField.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 16),
+            textField.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant: -16),
+            textField.heightAnchor.constraint(equalToConstant: 48),
+
+            connectButton.topAnchor.constraint(equalTo: textField.bottomAnchor, constant: 12),
+            connectButton.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 16),
+            connectButton.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant: -16),
+            connectButton.heightAnchor.constraint(equalToConstant: 52),
+
+            hintLabel.topAnchor.constraint(equalTo: connectButton.bottomAnchor, constant: 10),
+            hintLabel.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 16),
+            hintLabel.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant: -16),
+            hintLabel.bottomAnchor.constraint(equalTo: container.bottomAnchor, constant: -16),
+
+            container.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: 16),
+            container.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -16),
+            container.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 8),
+            container.bottomAnchor.constraint(lessThanOrEqualTo: contentView.bottomAnchor, constant: -8),
+        ])
+
+        manualEntryView = container
+        sensorIdTextField = textField
+    }
+
+    // MARK: - Public API
+
+    func configureAsStaticImage() {
+        isManualEntryVisible = false
+        manualEntryView?.isHidden = true
+        cameraView.isHidden = true
+        scannerView?.stopScanning()
+    }
+
+    func configure(isManualEntry: Bool) {
+        isManualEntryVisible = isManualEntry
+        if isManualEntry {
+            cameraView.isHidden = true
+            manualEntryView?.isHidden = false
+            scannerView?.stopScanning()
+        } else {
+            cameraView.isHidden = false
+            manualEntryView?.isHidden = true
+            sensorIdTextField?.text = nil
+            sensorIdTextField?.resignFirstResponder()
+        }
+    }
+
     func setupQRView() {
         scannerView = QRScannerView(frame: cameraView.bounds)
         scannerView.onCodeDetected = { code in
             print("Detected QR Code: \(code)")
-            // You can stop scanning or navigate
             self.scannerView.stopScanning()
         }
-        
         cameraView.addSubview(scannerView)
     }
-    
+
+    // MARK: - Actions
+
+    @objc private func connectButtonTapped() {
+        sensorIdTextField?.resignFirstResponder()
+        let sensorId = (sensorIdTextField?.text ?? "").trimmingCharacters(in: .whitespaces).uppercased()
+        onConnectTapped?(sensorId)
+    }
+}
+
+extension ImageTVC: UITextFieldDelegate {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        textField.resignFirstResponder()
+        return true
+    }
+
+    func textFieldDidBeginEditing(_ textField: UITextField) {
+        onTextFieldDidBeginEditing?()
+    }
 }
 
 class QRScannerView: UIView {
@@ -90,7 +223,6 @@ class QRScannerView: UIView {
         let metadataOutput = AVCaptureMetadataOutput()
         if captureSession.canAddOutput(metadataOutput) {
             captureSession.addOutput(metadataOutput)
-
             metadataOutput.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
             metadataOutput.metadataObjectTypes = [.qr]
         }
@@ -100,7 +232,7 @@ class QRScannerView: UIView {
         previewLayer.videoGravity = .resizeAspectFill
         layer.addSublayer(previewLayer)
 
-        self.captureSession.startRunning()
+        captureSession.startRunning()
     }
 
     func stopScanning() {

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -26,6 +26,7 @@ class ConnectToSensorViewController: UIViewController {
         case verticalLabel
         case image
         case camera
+        case manualEntryBar
     }
     
     enum enumSuccessTableRow: Int, CaseIterable {
@@ -52,19 +53,33 @@ class ConnectToSensorViewController: UIViewController {
     var screenType: enumScreenType = .camera
     var isCodeDetected = false
     var isPermissionGiven: Bool = false
+    var isManualEntryMode: Bool = false
+    private var keyboardInset: CGFloat = 0
+    private var keyboardObserversRegistered = false
     let manager = KLTBluetoothManager.shared()
     let debouncer = EnumDebouncer<CGMConnectionStatus>()
     var deviceVerificationErrorMessage: String? = nil
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Do any additional setup after loading the view.
         setupLayout()
     }
 
-    override func viewWillAppear(_ animated: Bool) {
+  override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+        registerKeyboardObserversIfNeeded()
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        removeKeyboardObservers()
+        resetKeyboardInsets()
+        view.endEditing(true)
+    }
+
+    deinit {
+        removeKeyboardObservers()
     }
     
     func setupLayout() {
@@ -73,6 +88,7 @@ class ConnectToSensorViewController: UIViewController {
         
         tableView.delegate = self
         tableView.dataSource = self
+        tableView.keyboardDismissMode = .interactive
         tableView.registerNibs([VerticalLabelsTVC.self,
                                 SeparatorTVC.self,
                                 ImageTVC.self,
@@ -82,6 +98,7 @@ class ConnectToSensorViewController: UIViewController {
                                 NoteTVC.self,
                                 PodDetailsTVC.self,
                                 WatchVideoTVC.self])
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "ManualEntryBarCell")
         tableView.reloadData()
         contactSupport.isHidden = screenType != .error
         contactSupport.labelText = "Contact Support"
@@ -242,7 +259,7 @@ class ConnectToSensorViewController: UIViewController {
             let data = AlgorithmTools.decodeCT(value)
             
             if data.k > 0 || data.r > 0 {
-                //KLTLocalSettingManager.shareInstance.deviceInfoSensor = value
+                KLTLocalSettingManager.shareInstance().deviceInfoSensor = value
                 UserDefaults.standard.set(data.k, forKey: "algo_k")
                 UserDefaults.standard.set(data.r, forKey: "algo_r")
                 UserDefaults.standard.synchronize()
@@ -250,18 +267,22 @@ class ConnectToSensorViewController: UIViewController {
                 let lastConnectCgm = UserDefaults.standard.string(forKey: "lastConnectCgm") ?? ""
                 
                 if lastConnectCgm.lowercased() == "diasens" {
-                    // Diasens user - validate sensor via API before connecting
                     validateDiasensSensor(sensorId: value)
                 } else {
-                    // Non-Diasens user - proceed directly
                     viewModel.debouncer.update(with: .connected)
                     self.showConfirmInsulinUser()
                 }
                 return
             }
+            
+            // decodeCT returned k=0 and r=0 — sensor QR is not effective for this transmitter
+            showSensorInvalidAlert(message: "This sensor is not compatible with your transmitter. Please verify the sensor QR.")
+            isCodeDetected = false
+            return
         }
         
-        //controller.resumeScanning()
+        // Sensor ID format is invalid
+        showSensorInvalidAlert(message: "The scanned sensor ID is not valid. Please try again or enter the sensor ID manually.")
     }
     
     func validateDiasensSensor(sensorId: String) {
@@ -319,7 +340,99 @@ class ConnectToSensorViewController: UIViewController {
         // Connect the transmitter
         manager?.connectPeripheral(manager?.readyToConnectedPeripheral)
     }
+
+    @objc func toggleManualEntry() {
+        isManualEntryMode.toggle()
+        if !isManualEntryMode {
+            resetKeyboardInsets()
+            view.endEditing(true)
+        }
+        tableView.reloadData()
+    }
+
+    private var manualEntryIndexPath: IndexPath {
+        IndexPath(row: enumTableRow.camera.rawValue, section: enumTableSection.details.rawValue)
+    }
+
+    private func registerKeyboardObserversIfNeeded() {
+        guard !keyboardObserversRegistered else { return }
+        keyboardObserversRegistered = true
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(keyboardWillShow(_:)),
+            name: UIResponder.keyboardWillShowNotification,
+            object: nil
+        )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(keyboardWillHide(_:)),
+            name: UIResponder.keyboardWillHideNotification,
+            object: nil
+        )
+    }
+
+    private func removeKeyboardObservers() {
+        guard keyboardObserversRegistered else { return }
+        keyboardObserversRegistered = false
+        NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+
+    private func resetKeyboardInsets() {
+        keyboardInset = 0
+        tableView.contentInset.bottom = 0
+        tableView.verticalScrollIndicatorInsets.bottom = 0
+    }
+
+    @objc private func keyboardWillShow(_ notification: Notification) {
+        guard isManualEntryMode,
+              let userInfo = notification.userInfo,
+              let keyboardFrame = userInfo[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect else {
+            return
+        }
+
+        let convertedFrame = view.convert(keyboardFrame, from: nil)
+        let inset = max(0, view.bounds.maxY - convertedFrame.minY - view.safeAreaInsets.bottom)
+        keyboardInset = inset
+        tableView.contentInset.bottom = inset
+        tableView.verticalScrollIndicatorInsets.bottom = inset
+
+        let duration = (userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber)?.doubleValue ?? 0.25
+        UIView.animate(withDuration: duration) {
+            self.scrollManualEntryTextFieldAboveKeyboard(animated: false)
+        }
+    }
+
+    @objc private func keyboardWillHide(_ notification: Notification) {
+        guard let userInfo = notification.userInfo else {
+            resetKeyboardInsets()
+            return
+        }
+        let duration = (userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber)?.doubleValue ?? 0.25
+        UIView.animate(withDuration: duration) {
+            self.resetKeyboardInsets()
+        }
+    }
+
+    private func scrollManualEntryTextFieldAboveKeyboard(animated: Bool) {
+        guard isManualEntryMode,
+              let cell = tableView.cellForRow(at: manualEntryIndexPath) as? ImageTVC,
+              let textField = cell.activeSensorIdTextField else {
+            return
+        }
+
+        let fieldRect = textField.convert(textField.bounds, to: tableView)
+        tableView.scrollRectToVisible(fieldRect.insetBy(dx: 0, dy: -12), animated: animated)
+    }
     
+    private func showSensorInvalidAlert(message: String) {
+        DispatchQueue.main.async {
+            let alert = UIAlertController(title: "Invalid Sensor", message: message, preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default))
+            self.present(alert, animated: true)
+        }
+    }
+
     func showConfirmInsulinUser() {
         let typeOfDiabetes = UserDefaults.standard.object(forKey: "profilePatientType") as? NSNumber
         
@@ -457,7 +570,9 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
             case .image:
                 return (UIScreen.main.bounds.width * 120 / 390) + 40
             case .camera:
-                return 220
+                return isManualEntryMode ? 200 : 220
+            case .manualEntryBar:
+                return 60
             default:
                 return UITableView.automaticDimension
             }
@@ -491,17 +606,35 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 return cell
             case .image:
                 let cell: ImageTVC = tableView.dequeueReusableCell(for: indexPath)
+                cell.configureAsStaticImage()
                 cell.displayImageView.image = loadImage(named: "flip_the_reference")
                 cell.displayImageView.contentMode = .scaleAspectFill
                 cell.displayImageView.isHidden = false
-                cell.cameraView.isHidden = true
                 return cell
             case .camera:
                 let cell: ImageTVC = tableView.dequeueReusableCell(for: indexPath)
                 cell.displayImageView.contentMode = .scaleAspectFill
                 cell.displayImageView.isHidden = true
-                cell.cameraView.isHidden = false
-                if isPermissionGiven {
+                cell.configure(isManualEntry: isManualEntryMode)
+                if isManualEntryMode {
+                    cell.onTextFieldDidBeginEditing = { [weak self] in
+                        self?.scrollManualEntryTextFieldAboveKeyboard(animated: true)
+                    }
+                    cell.onConnectTapped = { [weak self] sensorId in
+                        guard let self = self else { return }
+                        guard !sensorId.isEmpty else {
+                            let alert = UIAlertController(
+                                title: nil,
+                                message: "Please enter a Sensor ID",
+                                preferredStyle: .alert
+                            )
+                            alert.addAction(UIAlertAction(title: "OK", style: .default))
+                            self.present(alert, animated: true)
+                            return
+                        }
+                        self.connectSensor(value: sensorId, controller: self)
+                    }
+                } else if isPermissionGiven {
                     DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
                         cell.setupQRView()
                         cell.scannerView?.onCodeDetected = { data in
@@ -513,6 +646,59 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                     }
                 }
                 return cell
+            case .manualEntryBar:
+                let cell = tableView.dequeueReusableCell(withIdentifier: "ManualEntryBarCell")!
+                cell.selectionStyle = .none
+                cell.backgroundColor = .clear
+                cell.contentView.subviews.forEach { $0.removeFromSuperview() }
+
+                let bar = UIView()
+                bar.translatesAutoresizingMaskIntoConstraints = false
+                bar.backgroundColor = UIColor(red: 240/255, green: 244/255, blue: 255/255, alpha: 1)
+                bar.layer.cornerRadius = 10
+                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 linkLabel = UILabel()
+                let attr = NSMutableAttributedString(string: linkText, attributes: [
+                    .font: FontManager.font(ofSize: 14, weight: .bold),
+                    .foregroundColor: CustomColor.shared.lightGreen,
+                    .underlineStyle: NSUnderlineStyle.single.rawValue,
+                ])
+                linkLabel.attributedText = attr
+
+                let stack = UIStackView(arrangedSubviews: [prefixLabel, linkLabel])
+                stack.translatesAutoresizingMaskIntoConstraints = false
+                stack.axis = .horizontal
+                stack.alignment = .center
+                stack.spacing = 4
+                bar.addSubview(stack)
+
+                // Tap the entire bar so the hit area is large and reliable
+                bar.isUserInteractionEnabled = true
+                let tap = UITapGestureRecognizer(target: self, action: #selector(toggleManualEntry))
+                bar.addGestureRecognizer(tap)
+
+                cell.contentView.addSubview(bar)
+                NSLayoutConstraint.activate([
+                    stack.centerXAnchor.constraint(equalTo: bar.centerXAnchor),
+                    stack.centerYAnchor.constraint(equalTo: bar.centerYAnchor),
+                    stack.leadingAnchor.constraint(greaterThanOrEqualTo: bar.leadingAnchor, constant: 12),
+                    stack.trailingAnchor.constraint(lessThanOrEqualTo: bar.trailingAnchor, constant: -12),
+                    bar.leadingAnchor.constraint(equalTo: cell.contentView.leadingAnchor, constant: 24),
+                    bar.trailingAnchor.constraint(equalTo: cell.contentView.trailingAnchor, constant: -24),
+                    bar.topAnchor.constraint(equalTo: cell.contentView.topAnchor, constant: 4),
+                    bar.bottomAnchor.constraint(equalTo: cell.contentView.bottomAnchor, constant: -4),
+                ])
+                return cell
             }
         case .success:
             switch enumSuccessTableRow(rawValue: indexPath.row)! {
@@ -542,10 +728,9 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
             switch enumFailureTableRow(rawValue: indexPath.row)! {
             case .failAnimation:
                 let cell: ImageTVC = tableView.dequeueReusableCell(for: indexPath)
+                cell.configureAsStaticImage()
                 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 {
@@ -577,11 +762,10 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 return cell
             case .image:
                 let cell: ImageTVC = tableView.dequeueReusableCell(for: indexPath)
+                cell.configureAsStaticImage()
                 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:

package/package.json

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