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

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,15 +53,34 @@ 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) {
+        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() {
         manager?.addObserver(self, forKeyPath: "status", options: [.new], context: nil)
@@ -68,6 +88,7 @@ class ConnectToSensorViewController: UIViewController {
         
         tableView.delegate = self
         tableView.dataSource = self
+        tableView.keyboardDismissMode = .interactive
         tableView.registerNibs([VerticalLabelsTVC.self,
                                 SeparatorTVC.self,
                                 ImageTVC.self,
@@ -77,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"
@@ -144,32 +166,22 @@ class ConnectToSensorViewController: UIViewController {
          
         }
         
-        customTopView.onDemoTapped = {
-            let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
-            let payload = [
-                "status": "cgm_watch_demo_clicked"
-            ]
-            
-            NotificationCenter.default.post(
-                name: Notification.Name("cgmwatchdemoclicked"),
-                object: nil,
-                userInfo: payload
-            )
-            let webVC = WebViewController()
-            webVC.modalPresentationStyle = .formSheet
-            webVC.videoURL = URL(string: isForReconnect == true ? reconnectionwatchCGMVideo : watchCGMVideo)
-            self.present(webVC, animated: true, completion: nil)
-        }
-        
+        CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+        CustomTopViewSupportHelper.bindDemoAction(
+            customTopView: customTopView,
+            isForReconnect: UserDefaults.standard.bool(forKey: "isForReconnect"),
+            presenter: self
+        )
+        CustomTopViewSupportHelper.bindWhatsappAction(
+            customTopView: customTopView,
+            navigationController: navigationController
+        )
+
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
             self.present(vc, animated: true, completion: nil)
         }
-        customTopView.onWhatsAppTapped = {
-            let vc = ChatWithExpertViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-            self.navigationController?.pushViewController(vc, animated: false)
-        }
         checkCameraPermission()
         bottomButton.disable()
     }
@@ -247,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()
@@ -255,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) {
@@ -324,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
         
@@ -462,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
             }
@@ -496,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
@@ -518,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)! {
@@ -547,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 {
@@ -582,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/ios/ViewControllers/ConnectToTransmitterViewController.swift

@@ -63,6 +63,11 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
         setupLayout()
     }
 
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+    }
+
     deinit {
         if let observer = bluetoothEnableObserver {
             NotificationCenter.default.removeObserver(observer)
@@ -181,32 +186,22 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
             }
         }
 
-        customTopView.onDemoTapped = {
-            let payload = [
-                "status": "cgm_watch_demo_clicked"
-            ]
-            
-            NotificationCenter.default.post(
-                name: Notification.Name("cgmwatchdemoclicked"),
-                object: nil,
-                userInfo: payload
-            )
-            
-            let webVC = WebViewController()
-            webVC.modalPresentationStyle = .formSheet
-            webVC.videoURL = URL(string: self.isForReconnect == true ? reconnectionwatchCGMVideo : watchCGMVideo)
-            self.present(webVC, animated: true, completion: nil)
-        }
-        
+        CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+        CustomTopViewSupportHelper.bindDemoAction(
+            customTopView: customTopView,
+            isForReconnect: self.isForReconnect,
+            presenter: self
+        )
+        CustomTopViewSupportHelper.bindWhatsappAction(
+            customTopView: customTopView,
+            navigationController: navigationController
+        )
+
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
             self.present(vc, animated: true, completion: nil)
         }
-        customTopView.onWhatsAppTapped = {
-            let vc = ChatWithExpertViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-            self.navigationController?.pushViewController(vc, animated: false)
-        }
         
         if isForReconnect {
             //customTopView.showOnlyClose()

package/ios/ViewControllers/ProvidePermissionViewController.swift

@@ -35,6 +35,11 @@ class ProvidePermissionViewController: UIViewController {
         setupLayout()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+    }
+
     func setupLayout() {
         tableView.delegate = self
         tableView.dataSource = self
@@ -74,32 +79,22 @@ class ProvidePermissionViewController: UIViewController {
             userInfo: payload
         )
         
-        customTopView.onDemoTapped = {
-            
-            let payload = [
-                "status": "cgm_permissions_page_landing"
-            ]
-            
-            NotificationCenter.default.post(
-                name: Notification.Name("cgmwatchdemoclicked"),
-                object: nil,
-                userInfo: payload
-            )
-            let webVC = WebViewController()
-            webVC.modalPresentationStyle = .formSheet
-            webVC.videoURL = URL(string: self.isForReconnect == true ? reconnectionwatchCGMVideo : watchCGMVideo)
-            self.present(webVC, animated: true, completion: nil)
-        }
-        
+        CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+        CustomTopViewSupportHelper.bindDemoAction(
+            customTopView: customTopView,
+            isForReconnect: isForReconnect,
+            presenter: self
+        )
+        CustomTopViewSupportHelper.bindWhatsappAction(
+            customTopView: customTopView,
+            navigationController: navigationController
+        )
+
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
             self.present(vc, animated: true, completion: nil)
         }
-        customTopView.onWhatsAppTapped = {
-            let vc = ChatWithExpertViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-            self.navigationController?.pushViewController(vc, animated: false)
-        }
         updateBottomButtonState()
         
         // Initialize the CBCentralManager with the current view controller as the delegate

package/ios/ViewControllers/PutOnTheSensorViewController.swift

@@ -25,6 +25,11 @@ class PutOnTheSensorViewController: UIViewController {
         // Do any additional setup after loading the view.
         setupLayout()
     }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+    }
     
     func setupLayout() {
         tableView.delegate = self
@@ -52,32 +57,22 @@ class PutOnTheSensorViewController: UIViewController {
             self.navigationController?.pushViewController(vc, animated: false)
         }
 
-        customTopView.onDemoTapped = {
-            let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
-            let payload = [
-                "status": "cgm_watch_demo_clicked"
-            ]
-            
-            NotificationCenter.default.post(
-                name: Notification.Name("cgmwatchdemoclicked"),
-                object: nil,
-                userInfo: payload
-            )
-            let webVC = WebViewController()
-            webVC.modalPresentationStyle = .formSheet
-            webVC.videoURL = URL(string: isForReconnect == true ? reconnectionwatchCGMVideo : watchCGMVideo)
-            self.present(webVC, animated: true, completion: nil)
-        }
-        
+        CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+        CustomTopViewSupportHelper.bindDemoAction(
+            customTopView: customTopView,
+            isForReconnect: UserDefaults.standard.bool(forKey: "isForReconnect"),
+            presenter: self
+        )
+        CustomTopViewSupportHelper.bindWhatsappAction(
+            customTopView: customTopView,
+            navigationController: navigationController
+        )
+
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
             self.present(vc, animated: true, completion: nil)
         }
-        customTopView.onWhatsAppTapped = {
-            let vc = ChatWithExpertViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-            self.navigationController?.pushViewController(vc, animated: false)
-        }
     }
 
 }

package/ios/ViewControllers/StartConnectionViewController.swift

@@ -37,10 +37,15 @@ class StartConnectionViewController: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Do any additional setup after loading the view.
+        CustomerSupportConfig.shared.fetchIfNeeded()
         setupLayout()
         //checkForDevice()
     }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+    }
     
     func setupLayout() {
         navigationController?.navigationBar.isHidden = true
@@ -92,36 +97,24 @@ class StartConnectionViewController: UIViewController {
             }
         }
 
-        customTopView.onDemoTapped = {
-            let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
-            let payload = [
-                "status": "cgm_watch_demo_clicked"
-            ]
-            
-            NotificationCenter.default.post(
-                name: Notification.Name("cgmwatchdemoclicked"),
-                object: nil,
-                userInfo: payload
-            )
-            let webVC = WebViewController()
-            webVC.modalPresentationStyle = .formSheet // or .pageSheet, .fullScreen
-            webVC.videoURL = URL(string: isForReconnect == true ? reconnectionwatchCGMVideo : watchCGMVideo)
-            self.present(webVC, animated: true, completion: nil)
-            
-        }
-        
+        CustomTopViewSupportHelper.configureWhatsapp(customTopView: customTopView)
+        CustomTopViewSupportHelper.bindDemoAction(
+            customTopView: customTopView,
+            isForReconnect: isForReconnect,
+            presenter: self
+        )
+        CustomTopViewSupportHelper.bindWhatsappAction(
+            customTopView: customTopView,
+            navigationController: navigationController
+        )
+
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
             self.present(vc, animated: true, completion: nil)
         }
-        
-        customTopView.onWhatsAppTapped = {
-            let vc = ChatWithExpertViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-            self.navigationController?.pushViewController(vc, animated: false)
-        }
     }
-    
+
     private func updateBottomButtonState() {
         if isBluetoothEnabled && isLocationEnabled {
             let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")

package/ios/ViewModel/FinalViewModel.swift

@@ -254,7 +254,7 @@ class FinalViewModel: NSObject {
     
     func getStatus(encryptionKey: String = PROD_ENC_KEY,
                    encryptionIv: String = PROD_ENC_IV) {
-        print("ios token:", TOKEN)
+        print("ios token:", currentAuthToken())
         let url = URL(string: "https://api-feature2.mytatva.in/api/v8/cgm/status")!
         var request = URLRequest(url: url)
         request.httpMethod = "GET"
@@ -262,7 +262,7 @@ class FinalViewModel: NSObject {
         // Set headers
         //request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         request.addValue(PROD_API_KEY, forHTTPHeaderField: "api-key")
-        request.addValue(TOKEN, forHTTPHeaderField: "token")
+        request.addValue(currentAuthToken(), forHTTPHeaderField: "token")
         
       
         // Set request body

package/package.json

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