react-native-mytatva-rn-sdk 1.2.44 → 1.2.46

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

@@ -48,6 +48,8 @@ class PlaceSensorActivity : AppCompatActivity() {
     }
 
     private fun init() {
+        sendDataToRN("", "cgm_place_sensor_landing")
+
         Glide.with(this)
             .load(R.drawable.img_male)
             .transform(RoundedCorners(50))
@@ -59,7 +61,10 @@ class PlaceSensorActivity : AppCompatActivity() {
             .into(binding.ivPlay)
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Attach Sensor Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
@@ -101,7 +106,7 @@ class PlaceSensorActivity : AppCompatActivity() {
                 val module = catalystInstance.getNativeModule(CgmTrackyLibModule::class.java)
 
                 if (module == null) {
-                    sendDataToRNDirectly("", status)
+                    sendDataToRNDirectly(data, status)
                     Log.d("sendDataToRN: ", "Module null")
                 } else {
                     module.sendDataToReact(data, status, "cgmDeviceEvent")

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

@@ -48,6 +48,8 @@ class PlaceTransmitterActivity : AppCompatActivity() {
     }
 
     private fun init() {
+        sendDataToRN("", "cgm_place_transmitter_landing")
+
         Glide.with(this)
             .load(R.drawable.img_female)
             .transform(RoundedCorners(50))
@@ -61,16 +63,20 @@ class PlaceTransmitterActivity : AppCompatActivity() {
         binding.commonButton.tvProceed.text = "Complete"
 
         binding.commonButton.btnProceed.setOnClickListener {
-            sendDataToRN("","WARM_PERIOD_STARTED")
+            sendDataToRN("", "cgm_connection_complete_clicked")
+            sendDataToRN("", "WARM_PERIOD_STARTED")
             finish()
         }
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Attach Transmitter Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("","cgm_watch_demo_clicked")
+            sendDataToRN("", "cgm_watch_demo_clicked")
 
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
@@ -133,7 +139,7 @@ class PlaceTransmitterActivity : AppCompatActivity() {
                 val module = catalystInstance.getNativeModule(CgmTrackyLibModule::class.java)
 
                 if (module == null) {
-                    sendDataToRNDirectly("", status)
+                    sendDataToRNDirectly(data, status)
                     Log.d("sendDataToRN: ", "Module null")
                 } else {
                     module.sendDataToReact(data, status, "cgmDeviceEvent")

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

@@ -55,6 +55,7 @@ import com.mytatvarnsdk.network.AuthenticateSDKService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -107,6 +108,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
     }
 
     private fun setupInitialState() {
+        sendDataToRN("", "cgm_connect_transmitter_landing")
+
         isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
 
         // Set initial states
@@ -146,16 +149,27 @@ class SearchTransmitterActivity : BaseBleActivity() {
             }
 
             binding.btnSupport.btnProceed.setOnClickListener {
-                startActivity(Intent(this, HelpActivity::class.java))
+                startActivity(
+                    Intent(this, HelpActivity::class.java)
+                        .putExtra("ScreenName", "Transmitter Screen")
+                )
             }
 
             binding.btnRetry.btnProceed.setOnClickListener {
-                val intent = intent
-                finish()
-                startActivity(intent)
+                sendDataToRN("", "cgm_retry_connect_transmitter_clicked")
+
+                Handler().postDelayed({
+                    val intent = intent
+                    finish()
+                    startActivity(intent)
+                }, 500)
             }
 
             if (errorStatus.isNotEmpty()) {
+                val jsonObject = JSONObject()
+                jsonObject.put("error_description", errorStatus)
+                sendDataToRN(jsonObject.toString(), "cgm_transmitter_connection_failed")
+
                 binding.tvReason.visibility = View.VISIBLE
                 binding.tvReason.text = "Reason - ${errorStatus}"
             } else {
@@ -219,6 +233,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
         if (transmitterDeviceInfo != null && !binding.tvReason.isVisible) {
             manageErrorState(false, "")
         } else {
+            sendDataToRN("", "cgm_transmitter_detection_failed")
+
             manageErrorState(true, "")
         }
         Log.d("Search Transmitter Error--> ", "Search Transmitter Error--> scanEnd")
@@ -226,6 +242,7 @@ class SearchTransmitterActivity : BaseBleActivity() {
 
     override fun bluetoothStateOFF() {
         super.bluetoothStateOFF()
+
         manageErrorState(true, "Bluetooth Off")
         Log.d("Search Transmitter Error--> ", "Search Transmitter Error--> bluetoothStateOFF")
     }
@@ -246,6 +263,7 @@ class SearchTransmitterActivity : BaseBleActivity() {
         ProgressManagement.getInstance().dismissWait(this)
         manageErrorState(true, "Bind Failure")
         Log.d("Search Transmitter Error--> ", "Search Transmitter Error--> bindFail")
+        sendDataToRN("", "cgm_transmitter_connection_failed")
     }
 
     public override fun bindSuccess() {
@@ -260,54 +278,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
         binding.commonButton.btnProceed.alpha = 1.0f
         binding.view2.background = ContextCompat.getDrawable(this, R.drawable.bg_green_progress)
         binding.tvDivide2.setTextColor("#299D6B".toColorInt())
-    }
 
-    fun mapToDto(glucose: PocGlucose): GlucoseLog {
-        val dto: GlucoseLog = GlucoseLog()
-        dto.timeInMillis = glucose.getTimeInMillis()
-        dto.countdownMinutes = glucose.getCountdownMinutes()
-        dto.countdownHours = glucose.getCountdownHours()
-        dto.countdownDays = glucose.getCountdownDays()
-        dto.hypoglycemiaEarlyWarnMinutes = glucose.getHypoglycemiaEarlyWarnMinutes()
-        dto.showGlucoseMG = glucose.getShowGlucoseMG()
-        dto.glucoseId = glucose.getGlucoseId()
-        dto.name = glucose.getName()
-        dto.showGlucose = glucose.getShowGlucose()
-        dto.Ib = glucose.getIb()
-        dto.Iw = glucose.getIw()
-        dto.T = glucose.getT()
-        dto.year = glucose.getYear()
-        dto.month = glucose.getMonth()
-        dto.day = glucose.getDay()
-        dto.hour = glucose.getHour()
-        dto.minute = glucose.getMinute()
-
-        // Convert byte[] to List<Integer>
-        dto.bytes = ArrayList()
-        for (b in glucose.getBytes()) {
-            dto.bytes?.add(b.toInt() and 0xFF) // Prevent negative values
-        }
-
-        // Trend
-        val trendObj: TrendObject = TrendObject()
-        trendObj.trendId = glucose.getTrend().getTrendId()
-        trendObj.drawableId = glucose.getTrend().getDrawableId()
-        trendObj.widgetImg = glucose.getTrend().getWidgetImg()
-        trendObj.apsChangeRate = glucose.getTrend().getApsChangeRate()
-        dto.trendObject = trendObj
-
-        // Status
-        val statusObj: GlucoseStatusObject = GlucoseStatusObject()
-        statusObj.statusId = glucose.getGlucoseStatus().getStatusId()
-        dto.glucoseStatusObject = statusObj
-
-        // Error
-        val errorObj: ErrorObject = ErrorObject()
-        errorObj.errorId = glucose.getErrorCode().getErrorId()
-        errorObj.sound = glucose.getErrorCode().getSound().toString()
-        dto.errorObject = errorObj
-
-        return dto
+        sendDataToRN("", "cgm_transmitter_connection_successful")
     }
 
 
@@ -352,7 +324,10 @@ class SearchTransmitterActivity : BaseBleActivity() {
 
     private fun setupClickListeners() {
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Transmitter Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
@@ -472,7 +447,7 @@ class SearchTransmitterActivity : BaseBleActivity() {
                 val module = catalystInstance.getNativeModule(CgmTrackyLibModule::class.java)
 
                 if (module == null) {
-                    sendDataToRNDirectly("", status)
+                    sendDataToRNDirectly(data, status)
                     Log.d("sendDataToRN: ", "Module null")
                 } else {
                     module.sendDataToReact(data, status, "cgmDeviceEvent")
@@ -562,6 +537,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
         })
 
         binding.searchingLayout.startAnimation(fadeOut)
+
+        sendDataToRN("", "cgm_transmitter_detected")
     }
 
     private fun connectToTransmitter() {

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

@@ -65,6 +65,8 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
     private fun init() {
         isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
 
+        sendDataToRN("", "cgm_sensor_connection_successful")
+
         val formatter = SimpleDateFormat("hh:mm a", Locale.getDefault())
         binding.tvDateTime.text = "Connected on ${formatter.format(Date()).uppercase()}"
 
@@ -76,7 +78,10 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
         authenticateSDKService = AuthenticateSDKService(scope = scope)
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Sensor Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
@@ -88,6 +93,8 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
         }
 
         binding.commonButton.btnProceed.setOnClickListener {
+            sendDataToRN("", "cgm_connect_sensor_proceed_clicked")
+
             if (isForReconnect) {
                 startActivity(Intent(this, PlaceTransmitterActivity::class.java))
             } else {
@@ -117,7 +124,7 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
                 val module = catalystInstance.getNativeModule(CgmTrackyLibModule::class.java)
 
                 if (module == null) {
-                    sendDataToRNDirectly("", status)
+                    sendDataToRNDirectly(data, status)
                     Log.d("sendDataToRN: ", "Module null")
                 } else {
                     module.sendDataToReact(data, status, "cgmDeviceEvent")

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

@@ -27,6 +27,7 @@ import com.mytatvarnsdk.CgmTrackyLibModule.Companion.mReactContext
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityStartCgmactivityBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
+import org.json.JSONObject
 
 
 class StartCGMActivity : AppCompatActivity() {
@@ -51,6 +52,8 @@ class StartCGMActivity : AppCompatActivity() {
     private fun init() {
         isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
 
+        sendDataToRN("", "cgm_start_connection_landing")
+
         if (isForReconnect) {
             binding.commonButton.tvProceed.text = "Start Reconnection Journey"
         } else {
@@ -58,6 +61,8 @@ class StartCGMActivity : AppCompatActivity() {
         }
 
         binding.commonButton.btnProceed.setOnClickListener {
+            sendDataToRN("", "cgm_start_connection_journey_clicked")
+
             if (isForReconnect) {
                 val intent = if (areAllPermissionsGranted()) {
                     Intent(this, SearchTransmitterActivity::class.java).putExtra(
@@ -82,11 +87,14 @@ class StartCGMActivity : AppCompatActivity() {
         }
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Start CGM Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("","cgm_watch_demo_clicked")
+            sendDataToRN("", "cgm_watch_demo_clicked")
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
             )
@@ -157,7 +165,7 @@ class StartCGMActivity : AppCompatActivity() {
                 val module = catalystInstance.getNativeModule(CgmTrackyLibModule::class.java)
 
                 if (module == null) {
-                    sendDataToRNDirectly("", status)
+                    sendDataToRNDirectly(data, status)
                     Log.d("sendDataToRN: ", "Module null")
                 } else {
                     module.sendDataToReact(data, status, "cgmDeviceEvent")

package/android/src/main/java/com/mytatvarnsdk/model/BaseViewModel.java

@@ -99,7 +99,7 @@ public class BaseViewModel extends AndroidViewModel {
   }
 
   public List<PocGlucose> getGlucoseBetweenTime(long startTime) {
-    return mRepositoryGlucose.getGlucoseByTimeMillis(startTime, new Date().getTime());
+    return mRepositoryGlucose.getGlucoseByTimeMillis(startTime, System.currentTimeMillis());
   }
 
   public PocDevice getDeviceInfo(int deviceId) {

package/ios/MyReactNativeBridge.m

@@ -20,7 +20,7 @@ RCT_EXPORT_MODULE();
 
 // Define the supported events
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"cgmDeviceEvent"]; // Event names to listen to in JS
+    return @[@"cgmDeviceEvent", @"cgmwatchdemoclicked", @"cgmWAsupportclicked"]; // Event names to listen to in JS
 }
 
 // Example method to emit an event from native to JS
@@ -39,7 +39,7 @@ RCT_EXPORT_MODULE();
 // This method returns the list of events the module supports
 - (NSArray<NSString *> *)supportedEvents
 {
-    return @[@"cgmDeviceEvent"];
+    return @[@"cgmDeviceEvent", @"cgmwatchdemoclicked", @"cgmWAsupportclicked"];
 }
 
 // Start listening for notifications
@@ -51,6 +51,17 @@ RCT_EXPORT_MODULE();
                                                  selector:@selector(handleNotification:)
                                                      name:@"cgmDeviceEvent"
                                                    object:nil];
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                      selector:@selector(handleNotification:)
+                                                          name:@"cgmwatchdemoclicked"
+                                                        object:nil];
+        
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                      selector:@selector(handleNotification:)
+                                                          name:@"cgmWAsupportclicked"
+                                                        object:nil];
     }
     return self;
 }
@@ -64,6 +75,9 @@ RCT_EXPORT_MODULE();
     
     // Send the data to React Native via event emitter
     [self sendEventWithName:@"cgmDeviceEvent" body:@{@"status": @"WARM_PERIOD_STARTED"}];
+    [self sendEventWithName:@"cgmwatchdemoclicked" body:@{@"status": @"cgm_watch_demo_clicked"}];
+    [self sendEventWithName:@"cgmWAsupportclicked" body:@{@"status": @"cgm_WA_support_clicked"}];
+    
 }
 
 // Private helper
@@ -259,68 +273,59 @@ RCT_EXPORT_METHOD(observeAllGlucoseData:(NSString *)token)
     });
 }
 
-// Internal method — can be kept private using a class extension
-- (void)observeTransmitterUnbindStatus:(NSString *)token
-                                       response:(NSDictionary *)responseDict
-                                     completion:(void (^)(NSDictionary *response, NSError *error))completion
+//--------------OLD FUNCTION-----------------
+//RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token)
+//{
+//    NSLog(@"Received token: %@", token);
+//    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
+//    [[NSUserDefaults standardUserDefaults] synchronize];
+//    FinalViewModelManager *manager = [FinalViewModelManager shared];
+//    [manager callForObserveTransmitterUnbindStatus];
+//}
+
+
+
+RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token
+                  response:(NSString *)responseJsonString
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
+    if (responseJsonString == nil || ![responseJsonString isKindOfClass:[NSString class]]) {
+        NSError *error = [NSError errorWithDomain:@"CgmTrackyLib"
+                                             code:1001
+                                         userInfo:@{NSLocalizedDescriptionKey: @"Invalid or nil JSON string passed from JS"}];
+        reject(@"invalid_params", @"Response JSON string is nil or invalid", error);
+        return;
+    }
+
+    // Parse JSON string to NSDictionary
+    NSData *data = [responseJsonString dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *parseError = nil;
+    NSDictionary *responseDict = [NSJSONSerialization JSONObjectWithData:data options:0 error:&parseError];
+
+    if (parseError || ![responseDict isKindOfClass:[NSDictionary class]]) {
+        reject(@"json_parse_error", @"Failed to parse JSON string to dictionary", parseError);
+        return;
+    }
+
     // Save token
     [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
 
-    // Save CGM status item to UserDefaults (if needed by Swift)
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:responseDict options:0 error:nil];
-    if (jsonData) {
-        [[NSUserDefaults standardUserDefaults] setObject:jsonData forKey:@"CGMStatusItem"];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-    }
+    // Save response data
+    [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"CGMStatusItem"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
 
-    // Call Swift method which reads CGMStatusItem from UserDefaults
+    // Call manager logic
     FinalViewModelManager *manager = [FinalViewModelManager shared];
     [manager callForObserveTransmitterUnbindStatusWithCompletion:^(NSDictionary *response, NSError *error) {
-        if (completion) {
-            completion(response, error);
+        if (error) {
+            reject([NSString stringWithFormat:@"%ld", (long)error.code], error.localizedDescription, error);
+        } else {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                resolve(response ?: @{});
+            });
         }
     }];
 }
 
-//RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token response:(NSString *)responseJsonString)
-//{
-//    // Optional: Parse the JSON string if needed
-//    NSData *jsonData = [responseJsonString dataUsingEncoding:NSUTF8StringEncoding];
-//    NSError *jsonError;
-//    NSDictionary *responseDict = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&jsonError];
-//
-//    if (jsonError) {
-//        NSLog(@"Failed to parse JSON: %@", jsonError.localizedDescription);
-//        [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:@{
-//            @"token": token ?: @"",
-//            @"success": @NO,
-//            @"error": @"Invalid JSON response from JS"
-//        }];
-//        return;
-//    }
-//
-//    // Now you have responseDict, you can use it
-//    [self observeTransmitterUnbindStatusInternal:token response:responseDict completion:^(NSDictionary *response, NSError *error) {
-//        if (error) {
-//            NSDictionary *errorPayload = @{
-//                @"token": token ?: @"",
-//                @"success": @NO,
-//                @"error": error.localizedDescription ?: @"Unknown error"
-//            };
-//            [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:errorPayload];
-//        } else {
-//            NSDictionary *successPayload = @{
-//                @"token": token ?: @"",
-//                @"responseFromBackend": response ?: @{},
-//                @"responseFromJS": responseDict ?: @{},
-//                @"success": @YES
-//            };
-//            [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:successPayload];
-//        }
-//    }];
-//
-//}
-
 @end

package/ios/Support/API.swift

@@ -188,7 +188,7 @@ class API {
         // Set request body
         let json: [String: Any] = [
             "sensorId": sensorId,
-            "sensorName": sensorId,
+           // "sensorName": sensorId,
             "status": status.rawValue,
             "rawData": [
                 "transmitterName": transmitterName,

package/ios/ViewControllers/AttachTransmitterViewController.swift

@@ -72,6 +72,7 @@ class AttachTransmitterViewController: UIViewController {
         }
 
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)

package/ios/ViewControllers/ChatWithExpertViewController.swift

@@ -27,6 +27,7 @@ class ChatWithExpertViewController: UIViewController {
         super.viewDidLoad()
         // Do any additional setup after loading the view.
         setupLayout()
+        
     }
     
     func setupLayout() {
@@ -43,6 +44,9 @@ class ChatWithExpertViewController: UIViewController {
         buttonBack.titleLabel?.font = FontManager.font(ofSize: 16, weight: .medium)
         bottomButton.labelText = "Proceed"
         bottomButton.showLeftWhatsappImage()
+        
+        NotificationCenter.default.post(name: Notification.Name("cgmWAsupportclicked"), object: nil, userInfo: ["a":"a"])
+        
         bottomButton.buttonTapCallback = {
         
             if let url = URL(string: "https://wa.aisensy.com/aaa1qv") {

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -99,6 +99,7 @@ class ConnectToSensorViewController: UIViewController {
         }
         
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)

package/ios/ViewControllers/ConnectToTransmitterViewController.swift

@@ -96,12 +96,21 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
         }
         bottomButton.buttonTapCallback = {
             if self.isForReconnect {
-                let vc = ConnectToSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-                vc.connected = {
-                    //self.showConfirmInsulinUser()
+                if  self.bottomButton.labelText == "Retry" {
+                    self.manager?.bluetoothDelegate = self
+                    self.manager?.startScan()
+                    self.screenType = .searching
+                    self.tableView.reloadData()
+                    self.bottomButton.hideRightArrow()
+                } else {
+                    let vc = ConnectToSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+                    vc.connected = {
+                        //self.showConfirmInsulinUser()
+                    }
+                    vc.isFromReconnect = true
+                    self.navigationController?.pushViewController(vc, animated: false)
                 }
-                vc.isFromReconnect = true
-                self.navigationController?.pushViewController(vc, animated: false)
+               
 //                NotificationCenter.default.post(name: Notification.Name("cgmDeviceEvent"), object: nil, userInfo: ["a":"a"])
 //                if let rootVC = UIApplication.shared.connectedScenes
 //                    .compactMap({ ($0 as? UIWindowScene)?.windows.first?.rootViewController })
@@ -112,6 +121,8 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
 //                }
             } else {
                 if self.screenType == .error {
+                    self.manager?.bluetoothDelegate = self
+                    self.manager?.startScan()
                     self.bottomButton.disable()
                     self.screenType = .searching
                     self.tableView.reloadData()
@@ -126,6 +137,7 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
         }
 
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)
@@ -297,6 +309,7 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
             
             //cell.labelDesc.text = "Sno:\(devices[indexPath.row].name)"
             cell.button.buttonTapCallback = {
+                
                 if self.isForReconnect {
                     self.sensorForceEnd()
                 }
@@ -304,7 +317,7 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
                 if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
                     return
                 }
-
+                
                 self.manager?.stopScan()
                 if self.foundDevices.count > indexPath.row {
                     let peripheral = self.foundDevices[indexPath.row] as! CBPeripheral

package/ios/ViewControllers/ProvidePermissionViewController.swift

@@ -45,11 +45,14 @@ class ProvidePermissionViewController: UIViewController {
         
         bottomButton.labelText = "Proceed"
         bottomButton.buttonTapCallback = {
+            let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
             let vc = ConnectToTransmitterViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+            vc.isForReconnect = isForReconnect
             self.navigationController?.pushViewController(vc, animated: false)
         }
         
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)

package/ios/ViewControllers/PutOnTheSensorViewController.swift

@@ -42,6 +42,7 @@ class PutOnTheSensorViewController: UIViewController {
         }
 
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)

package/ios/ViewControllers/StartConnectionViewController.swift

@@ -51,8 +51,7 @@ class StartConnectionViewController: UIViewController {
                                 ImageTVC.self,
                                 ChargingIndicatorTVC.self])
         tableView.reloadData()
-       // UserDefaults.standard.set(isLocationEnabled, forKey: "isForReconnect")
-
+     
         let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
         if isForReconnect{
             checkLocationPermission()
@@ -74,6 +73,7 @@ class StartConnectionViewController: UIViewController {
         }
 
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet // or .pageSheet, .fullScreen
             webVC.videoURL = URL(string: watchCGMVideo)
@@ -95,7 +95,9 @@ class StartConnectionViewController: UIViewController {
     
     private func updateBottomButtonState() {
         if isBluetoothEnabled && isLocationEnabled {
+            let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
             let vc = ConnectToTransmitterViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+            vc.isForReconnect = isForReconnect
             self.navigationController?.pushViewController(vc, animated: false)
         } else {
             let vc = ProvidePermissionViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)