@usercentrics/react-native-sdk 2.2.1 → 2.4.0

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/FirstLayerOptionsExtensions.kt

@@ -20,12 +20,24 @@ internal fun ReadableMap.bannerSettingsFromMap(assetManager: AssetManager): Bann
     val customFont = getMap("font")
     val customLogo = getMap("logo")
 
+    val rawFirstLayerStyleSettings = getMap("firstLayerSettings")
+    val rawSecondLayerStyleSettings = getMap("secondLayerSettings")
+    val rawLegalLinkSettings = getString("links")
+
     return BannerSettings(
-        customFont?.usercentricsFontFromMap(assetManager),
-        customLogo?.usercentricsImageFromMap()
+        font = customFont?.bannerFontFromMap(assetManager),
+        logo = customLogo?.bannerLogoFromMap(),
+        firstLayerSettings = rawFirstLayerStyleSettings?.firstLayerStyleSettingsFromMap(assetManager),
+        secondLayerSettings = rawSecondLayerStyleSettings?.secondLayerStyleSettingsFromMap(assetManager),
+        links = rawLegalLinkSettings?.legalLinksFromEnumString()
     )
 }
 
+internal fun ReadableMap.bannerLogoFromMap(): UsercentricsImage? {
+    val logoPath = getString("logoPath") ?: return null
+    return UsercentricsImage.ImageUrl(logoPath)
+}
+
 internal fun ReadableMap.firstLayerStyleSettingsFromMap(assetManager: AssetManager): FirstLayerStyleSettings {
     return FirstLayerStyleSettings(
         headerImage = getMap("headerImage")?.headerImageFromMap(),
@@ -44,7 +56,7 @@ internal fun ReadableMap.headerImageFromMap(): HeaderImageSettings? {
         return HeaderImageSettings.Hidden
     }
 
-    val image = getMap("image")?.usercentricsImageFromMap() ?: return null
+    val image = getMap("image")?.bannerLogoFromMap() ?: return null
 
     val isExtended = getBooleanOrNull("isExtended") ?: false
     return if (isExtended) {
@@ -59,21 +71,18 @@ internal fun ReadableMap.headerImageFromMap(): HeaderImageSettings? {
 }
 
 internal fun ReadableMap.titleFromMap(assetManager: AssetManager): TitleSettings {
-    val font = getMap("font")?.usercentricsFontFromMap(assetManager)
     return TitleSettings(
         alignment = getString("alignment")?.sectionAlignmentFromMap(),
         textColor = getString("textColorHex")?.deserializeColor(),
-        font = font?.font,
-        textSizeInSp = font?.sizeInSp
+        font = assetManager.createFontFromName(getString("fontName")),
+        textSizeInSp = getDoubleOrNull("textSize")?.toFloat()
     )
 }
 
 internal fun ReadableMap.messageFromMap(assetManager: AssetManager): MessageSettings {
-    val font = getMap("font")?.usercentricsFontFromMap(assetManager)
-
     return MessageSettings(
-        font = font?.font,
-        textSizeInSp = font?.sizeInSp,
+        font = assetManager.createFontFromName(getString("fontName")),
+        textSizeInSp = getDoubleOrNull("textSize")?.toFloat(),
         textColor = getString("textColorHex")?.deserializeColor(),
         alignment = getString("alignment")?.sectionAlignmentFromMap(),
         linkTextColor = getString("linkTextColorHex")?.deserializeColor(),
@@ -129,15 +138,14 @@ internal fun ReadableMap.buttonLayoutFromMap(
 internal fun ReadableMap.buttonSettingsFromMap(
     assetManager: AssetManager
 ): ButtonSettings {
-    val font = getMap("font")?.usercentricsFontFromMap(assetManager)
-    return ButtonSettings(
+  return ButtonSettings(
         type = getString("buttonType")!!.deserializeButtonType(),
         isAllCaps = getBooleanOrNull("isAllCaps"),
-        font = font?.font,
+        font = assetManager.createFontFromName(getString("fontName")),
         textColor = getString("textColorHex")?.deserializeColor(),
         backgroundColor = getString("backgroundColorHex")?.deserializeColor(),
         cornerRadius = getIntOrNull("cornerRadius"),
-        textSizeInSp = font?.sizeInSp
+        textSizeInSp = getDoubleOrNull("textSize")?.toFloat()
     )
 }
 
@@ -145,6 +153,23 @@ internal fun String.deserializeButtonType(): ButtonType {
     return ButtonType.valueOf(this)
 }
 
+internal fun ReadableMap.secondLayerStyleSettingsFromMap(assetManager: AssetManager): SecondLayerStyleSettings {
+    return SecondLayerStyleSettings(
+        buttonLayout = getMap("buttonLayout")?.buttonLayoutFromMap(assetManager),
+        showCloseButton = getBoolean("showCloseButton"),
+    )
+}
+
+internal fun String?.legalLinksFromEnumString(): LegalLinksSettings? {
+    return when (this) {
+        "BOTH" -> LegalLinksSettings.BOTH
+        "NONE" -> LegalLinksSettings.NONE
+        "FIRST_LAYER_ONLY" -> LegalLinksSettings.FIRST_LAYER_ONLY
+        "SECOND_LAYER_ONLY" -> LegalLinksSettings.SECOND_LAYER_ONLY
+        else -> null
+    }
+}
+
 @ColorInt
 internal fun String.deserializeColor(): Int? {
     val colorString: String =

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/TCFDataExtensions.kt

@@ -10,7 +10,8 @@ internal fun TCFData.serialize(): WritableMap {
         "specialFeatures" to specialFeatures.map { it.serialize() },
         "specialPurposes" to specialPurposes.map { it.serialize() },
         "stacks" to stacks.map { it.serialize() },
-        "vendors" to vendors.map { it.serialize() }
+        "vendors" to vendors.map { it.serialize() },
+        "tcString" to tcString
     ).toWritableMap()
 }
 

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/UsercentricsReadyStatusExtensions.kt

@@ -6,7 +6,7 @@ import com.usercentrics.sdk.UsercentricsReadyStatus
 
 internal fun UsercentricsReadyStatus.toWritableMap(): WritableMap {
     return Arguments.createMap().apply {
-        putBoolean("shouldShowCMP", shouldShowCMP)
+        putBoolean("shouldCollectConsent", shouldCollectConsent)
         putArray("consents", consents.toWritableArray())
     }
 }

package/ios/Extensions/BannerSettings+Dict.swift

@@ -5,25 +5,84 @@ extension BannerSettings {
     init?(from dictionary: NSDictionary?) {
         guard let dictionary = dictionary else { return nil }
 
-        self.init(font: UIFont(from: dictionary["font"] as? NSDictionary),
-                  logo: UIImage(from: dictionary["logo"] as? NSDictionary))
+        let bannerFontHolder = BannerFontHolder(from: dictionary["font"] as? NSDictionary)
+
+        let firstLayerStyleSettingsDict = dictionary["firstLayerSettings"] as? NSDictionary
+        let firstLayerSettings = FirstLayerStyleSettings(from: firstLayerStyleSettingsDict, bannerFontHolder: bannerFontHolder)
+
+        let secondLayerStyleSettingsDict = dictionary["secondLayerSettings"] as? NSDictionary
+        let secondLayerSettings = SecondLayerStyleSettings(from: secondLayerStyleSettingsDict, bannerFontHolder: bannerFontHolder)
+
+        let links = LegalLinksSettings.from(enumString: dictionary["links"] as? String)
+
+        self.init(font: bannerFontHolder?.font,
+                  logo: UIImage(from: dictionary["logo"] as? NSDictionary),
+                  links: links,
+                  firstLayerSettings: firstLayerSettings,
+                  secondLayerSettings: secondLayerSettings)
     }
 }
 
-extension FirstLayerStyleSettings {
+struct BannerFontHolder {
+    public let font: BannerFont
+
+    public let regularFont: UIFont
+    public let boldFont: UIFont
+
     init?(from dictionary: NSDictionary?) {
+        guard let dictionary = dictionary,
+              let regularFontName: String = dictionary["regularFont"] as? String,
+              let boldFontName: String = dictionary["boldFont"] as? String,
+              let fontSize: CGFloat = dictionary["fontSize"] as? CGFloat,
+              let regularFont = UIFont(name: regularFontName, size: fontSize),
+              let boldFont = UIFont(name: boldFontName, size: fontSize)
+        else { return nil }
+
+        self.regularFont = regularFont
+        self.boldFont = boldFont
+        self.font = .init(regularFont: regularFont, boldFont: boldFont)
+    }
+}
+
+extension UIFont {
+    static func initialize(from fontName: String?, fontSizeValue: CGFloat?, fallbackFont: UIFont?) -> UIFont? {
+        let fontSize = fontSizeValue ?? UIFont.systemFontSize
+
+        // System font with custom size
+        if fontName == nil, fontSizeValue != nil {
+            return fallbackFont?.withSize(fontSize) ?? UIFont.systemFont(ofSize: fontSize)
+        }
+
+        if let fontName = fontName {
+            return UIFont(name: fontName, size: fontSize)
+        }
+
+        return fallbackFont?.withSize(fontSize)
+    }
+}
+
+extension FirstLayerStyleSettings {
+    init?(from dictionary: NSDictionary?, bannerFontHolder: BannerFontHolder?) {
         guard let dictionary = dictionary else { return nil }
 
         self.init(headerImage: HeaderImageSettings.from(dictionary: dictionary["headerImage"] as? NSDictionary),
-                  title: TitleSettings(from: dictionary["title"] as? NSDictionary),
-                  message: MessageSettings(from: dictionary["message"] as? NSDictionary),
-                  buttonLayout: ButtonLayout.from(dictionary: dictionary["buttonLayout"] as? NSDictionary),
+                  title: TitleSettings(from: dictionary["title"] as? NSDictionary, fallbackFont: bannerFontHolder?.boldFont),
+                  message: MessageSettings(from: dictionary["message"] as? NSDictionary, fallbackFont: bannerFontHolder?.regularFont),
+                  buttonLayout: ButtonLayout.from(dictionary: dictionary["buttonLayout"] as? NSDictionary, fallbackFont: bannerFontHolder?.boldFont),
                   backgroundColor: UIColor(unsafeHex: dictionary["backgroundColorHex"] as? String),
                   cornerRadius: dictionary["cornerRadius"] as? CGFloat,
                   overlayColor: UIColor(unsafeHex: dictionary["overlayColorHex"] as? String))
     }
 }
 
+extension SecondLayerStyleSettings {
+    init?(from dictionary: NSDictionary?, bannerFontHolder: BannerFontHolder?) {
+        guard let dictionary = dictionary else { return nil }
+
+        self.init(buttonLayout: ButtonLayout.from(dictionary: dictionary["buttonLayout"] as? NSDictionary, fallbackFont: bannerFontHolder?.boldFont),
+                  showCloseButton: dictionary["showCloseButton"] as? Bool)
+    }
+}
 
 extension HeaderImageSettings {
     static func from(dictionary: NSDictionary?) -> HeaderImageSettings? {
@@ -50,10 +109,13 @@ extension HeaderImageSettings {
 }
 
 extension TitleSettings {
-    init?(from dictionary: NSDictionary?) {
+    init?(from dictionary: NSDictionary?, fallbackFont: UIFont? = nil) {
         guard let dictionary = dictionary else { return nil }
 
-        self.init(font: UIFont(from: dictionary["font"] as? NSDictionary),
+        let fontName: String? = dictionary["fontName"] as? String
+        let fontSize: CGFloat? = dictionary["textSize"] as? CGFloat
+
+        self.init(font: UIFont.initialize(from: fontName, fontSizeValue: fontSize, fallbackFont: fallbackFont),
                   textColor: UIColor(unsafeHex: dictionary["textColorHex"] as? String ?? ""),
                   textAlignment: NSTextAlignment.from(enumString: dictionary["textAlignment"] as? String))
     }
@@ -61,10 +123,13 @@ extension TitleSettings {
 
 
 extension MessageSettings {
-    init?(from dictionary: NSDictionary?) {
+    init?(from dictionary: NSDictionary?, fallbackFont: UIFont? = nil) {
         guard let dictionary = dictionary else { return nil }
 
-        self.init(font: UIFont(from: dictionary["font"] as? NSDictionary),
+        let fontName: String? = dictionary["fontName"] as? String
+        let textSize: CGFloat? = dictionary["textSize"] as? CGFloat
+
+        self.init(font: UIFont.initialize(from: fontName, fontSizeValue: textSize, fallbackFont: fallbackFont),
                   textColor: UIColor(unsafeHex: dictionary["textColorHex"] as? String ?? ""),
                   textAlignment: NSTextAlignment.from(enumString: dictionary["textAlignment"] as? String),
                   linkTextColor: UIColor(unsafeHex: dictionary["linkTextColorHex"] as? String ?? ""),
@@ -73,7 +138,7 @@ extension MessageSettings {
 }
 
 extension ButtonLayout {
-    static func from(dictionary: NSDictionary?) -> ButtonLayout? {
+    static func from(dictionary: NSDictionary?, fallbackFont: UIFont? = nil) -> ButtonLayout? {
         guard let dictionary = dictionary else { return nil }
 
         let layoutDict = dictionary["layout"] as? String
@@ -81,11 +146,11 @@ extension ButtonLayout {
 
         switch layoutDict {
             case "ROW":
-                return .row(buttons: buttons.flatMap { $0 }.compactMap { ButtonSettings(from: $0) })
+                return .row(buttons: buttons.flatMap { $0 }.compactMap { ButtonSettings(from: $0, fallbackFont: fallbackFont) })
             case "COLUMN":
-                return .column(buttons: buttons.flatMap { $0 }.compactMap { ButtonSettings(from: $0) })
+                return .column(buttons: buttons.flatMap { $0 }.compactMap { ButtonSettings(from: $0, fallbackFont: fallbackFont) })
             case "GRID":
-                let gridButtons = buttons.map { $0.compactMap { button in ButtonSettings(from: button) }}
+                let gridButtons = buttons.map { $0.compactMap { button in ButtonSettings(from: button, fallbackFont: fallbackFont) }}
                 return .grid(buttons: gridButtons)
             default:
                 break
@@ -96,15 +161,18 @@ extension ButtonLayout {
 }
 
 extension ButtonSettings {
-    init?(from dictionary: NSDictionary?) {
+    init?(from dictionary: NSDictionary?, fallbackFont: UIFont? = nil) {
         guard
             let dictionary = dictionary,
             let buttonTypeDict = dictionary["buttonType"] as? String,
             let buttonType = ButtonType.from(enumString: buttonTypeDict)
         else { return nil }
 
+        let fontName: String? = dictionary["fontName"] as? String
+        let textSize: CGFloat? = dictionary["textSize"] as? CGFloat
+
         self.init(type: buttonType,
-                  font: UIFont(from: dictionary["font"] as? NSDictionary),
+                  font: UIFont.initialize(from: fontName, fontSizeValue: textSize, fallbackFont: fallbackFont),
                   textColor: UIColor(unsafeHex: dictionary["textColorHex"] as? String),
                   backgroundColor: UIColor(unsafeHex: dictionary["backgroundColorHex"] as? String),
                   cornerRadius: dictionary["cornerRadius"] as? CGFloat)
@@ -178,3 +246,22 @@ extension NSTextAlignment {
         }
     }
 }
+
+extension LegalLinksSettings {
+    static func from(enumString: String?) -> LegalLinksSettings? {
+        guard let enumString = enumString else { return nil }
+
+        switch enumString {
+            case "BOTH":
+                return .both
+            case "FIRST_LAYER_ONLY":
+                return .firstLayerOnly
+            case "NONE":
+                return LegalLinksSettings.none
+            case "SECOND_LAYER_ONLY":
+                return .secondLayerOnly
+            default:
+                return nil
+        }
+    }
+}

package/ios/Extensions/ReadyStatus+Dict.swift

@@ -4,7 +4,7 @@ import Usercentrics
 public extension UsercentricsReadyStatus {
     func toDictionary() -> NSDictionary {
         return [
-            "shouldShowCMP": self.shouldShowCMP,
+            "shouldCollectConsent": self.shouldCollectConsent,
             "consents": self.consents.toListOfDictionary()
         ]
     }

package/ios/Manager/UsercentricsManager.swift

@@ -8,26 +8,22 @@ public protocol UsercentricsManager {
     func isReady(onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onFailure: @escaping ((Error) -> Void))
     func restoreUserSession(controllerId: String, onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onFailure: @escaping ((Error) -> Void))
 
-    func getPredefinedUI(settings: UsercentricsUISettings?, dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) -> UIViewController
-
     func showFirstLayer(bannerSettings: BannerSettings?,
-                        hostView: UINavigationController,
+                        hostView: UIViewController,
                         layout: UsercentricsLayout,
-                        settings: FirstLayerStyleSettings?,
                         dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void)
 
     func showSecondLayer(bannerSettings: BannerSettings?,
-                         hostView: UINavigationController,
-                         showCloseButton: Bool,
+                         hostView: UIViewController,
                          dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void)
 
-    func getTCString() -> String
+    func getTCString(callback: @escaping (String) -> Void)
     func getControllerId() -> String
     func getConsents() -> [UsercentricsServiceConsent]
     func getCMPData() -> UsercentricsCMPData
     func getUserSessionData() -> String
     func getUSPData() -> CCPAData
-    func getTCFData() -> TCFData
+    func getTCFData(callback: @escaping (TCFData) -> Void)
 
     func changeLanguage(language: String, onSuccess: @escaping (() -> Void), onFailure: @escaping ((Error) -> Void))
 
@@ -71,37 +67,28 @@ final class UsercentricsManagerImplementation: UsercentricsManager {
         UsercentricsCore.reset()
     }
 
-    func getPredefinedUI(settings: UsercentricsUISettings?, dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) -> UIViewController {
-        return UsercentricsUserInterface.getPredefinedUI(settings: settings, dismissViewHandler: dismissViewHandler)
-    }
-
     func showFirstLayer(bannerSettings: BannerSettings?,
-                        hostView: UINavigationController,
+                        hostView: UIViewController,
                         layout: UsercentricsLayout,
-                        settings: FirstLayerStyleSettings?,
                         dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) {
         UsercentricsBanner(bannerSettings: bannerSettings).showFirstLayer(hostView: hostView,
                                                                           layout: layout,
-                                                                          settings: settings,
                                                                           completionHandler: dismissViewHandler)
     }
 
     func showSecondLayer(bannerSettings: BannerSettings?,
-                         hostView: UINavigationController,
-                         showCloseButton: Bool,
+                         hostView: UIViewController,
                          dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) {
-        UsercentricsBanner(bannerSettings: bannerSettings).showSecondLayer(hostView: hostView,
-                                                                           showCloseButton: showCloseButton,
-                                                                           presentationMode: .present,
-                                                                           completionHandler: dismissViewHandler)
+        UsercentricsBanner(bannerSettings: bannerSettings).showSecondLayer(hostView: hostView, completionHandler: dismissViewHandler)
     }
 
     func restoreUserSession(controllerId: String, onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onFailure: @escaping ((Error) -> Void)) {
         UsercentricsCore.shared.restoreUserSession(controllerId: controllerId, onSuccess: onSuccess, onFailure: onFailure)
     }
 
-    func getTCString() -> String {
-        return UsercentricsCore.shared.getTCString()
+    @available(*, deprecated, message: "Please, call getTCFData() to get the 'tcString' from that model")
+    func getTCString(callback: @escaping (String) -> Void) {
+        UsercentricsCore.shared.getTCString(callback: callback)
     }
 
     func getControllerId() -> String {
@@ -124,8 +111,8 @@ final class UsercentricsManagerImplementation: UsercentricsManager {
         return UsercentricsCore.shared.getUSPData()
     }
 
-    func getTCFData() -> TCFData {
-        return UsercentricsCore.shared.getTCFData()
+    func getTCFData(callback: @escaping (TCFData) -> Void) {
+        UsercentricsCore.shared.getTCFData(callback: callback)
     }
     
     func changeLanguage(language: String, onSuccess: @escaping (() -> Void), onFailure: @escaping ((Error) -> Void)) {

package/ios/RNUsercentricsModule.swift

@@ -24,37 +24,20 @@ class RNUsercentricsModule: NSObject, RCTBridgeModule {
                 let self = self,
                 let userOptions = UsercentricsOptions(from: dict)
             else { return }
-            
+
             self.usercentricsManager.configure(options: userOptions)
         }
     }
-    
+
     @objc func isReady(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        usercentricsManager.isReady { status in
-            resolve(status.toDictionary())
-        } onFailure: { error in
-            reject("usercentrics_reactNative_isReady_error", error.localizedDescription, error)
-        }
-    }
-    
-    @objc func showCMP(_ dict: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         queue.async { [weak self] in
-            guard
-                let self = self,
-                let rootVC = self.rootVC,
-                let settings = UsercentricsUISettings(from: dict)
-            else {
-                reject("usercentrics_reactNative_showCMP_error", RNUsercentricsModuleError.invalidData.localizedDescription, RNUsercentricsModuleError.invalidData)
-                return
-            }
-            
-            let predefinedUI = self.usercentricsManager.getPredefinedUI(settings: settings) { response in
-                resolve(response.toDictionary())
-                rootVC.dismiss(animated: true)
+            guard let self = self else { return }
+
+            self.usercentricsManager.isReady { status in
+                resolve(status.toDictionary())
+            } onFailure: { error in
+                reject("usercentrics_reactNative_isReady_error", error.localizedDescription, error)
             }
-            
-            if #available(iOS 13.0, *) { predefinedUI.isModalInPresentation = true }
-            rootVC.present(predefinedUI)
         }
     }
     
@@ -69,23 +52,11 @@ class RNUsercentricsModule: NSObject, RCTBridgeModule {
                 reject("usercentrics_reactNative_showFirstLayer_error", RNUsercentricsModuleError.invalidData.localizedDescription, RNUsercentricsModuleError.invalidData)
                 return
             }
-            
-            let nav = UINavigationController()
-            nav.setNavigationBarHidden(true, animated: false)
-            nav.modalPresentationStyle = .overFullScreen
-            if #available(iOS 13.0, *) {
-                nav.isModalInPresentation = true
-            }
-            
-            rootVC.present(nav)
+
             let bannerSettingsDict = dict["bannerSettings"] as? NSDictionary
-            let styleSettingsDict = dict["styleSettings"] as? NSDictionary
-            
             self.usercentricsManager.showFirstLayer(bannerSettings: BannerSettings(from: bannerSettingsDict),
-                                                    hostView: nav,
-                                                    layout: layout,
-                                                    settings: FirstLayerStyleSettings(from: styleSettingsDict)) { response in
-                rootVC.dismiss(animated: true)
+                                                    hostView: rootVC as! UIViewController,
+                                                    layout: layout) { response in
                 resolve(response.toDictionary())
             }
         }
@@ -100,21 +71,10 @@ class RNUsercentricsModule: NSObject, RCTBridgeModule {
                 reject("usercentrics_reactNative_showFirstLayer_error", RNUsercentricsModuleError.invalidData.localizedDescription, RNUsercentricsModuleError.invalidData)
                 return
             }
+
             let bannerSettingsDict = dict["bannerSettings"] as? NSDictionary
-            let showCloseButton = (dict["showCloseButton"] as? Bool) ?? false
-            
-            let nav = UINavigationController()
-            nav.setNavigationBarHidden(true, animated: false)
-            nav.modalPresentationStyle = .overFullScreen
-            if #available(iOS 13.0, *) {
-                nav.isModalInPresentation = true
-            }
-            
-            rootVC.present(nav)
-            
             self.usercentricsManager.showSecondLayer(bannerSettings: BannerSettings(from: bannerSettingsDict),
-                                                     hostView: nav,
-                                                     showCloseButton: showCloseButton) { response in
+                                                     hostView: rootVC as! UIViewController) { response in
                 rootVC.dismiss(animated: true)
                 resolve(response.toDictionary())
             }
@@ -134,7 +94,9 @@ class RNUsercentricsModule: NSObject, RCTBridgeModule {
     }
     
     @objc func getTCFString(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        resolve(usercentricsManager.getTCString())
+        usercentricsManager.getTCString { tcString in
+            resolve(tcString)
+        }
     }
     
     @objc func getControllerId(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
@@ -150,7 +112,9 @@ class RNUsercentricsModule: NSObject, RCTBridgeModule {
     }
     
     @objc func getTCFData(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        resolve(usercentricsManager.getTCFData().toDictionary())
+        usercentricsManager.getTCFData { tcfData in
+            resolve(tcfData.toDictionary())
+        }
     }
     
     @objc func getUserSessionData(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {

package/ios/RNUsercentricsModule.xcodeproj/project.pbxproj

@@ -13,9 +13,7 @@
 		A22EDF9F271DA49900F5BB8C /* ReadyStatus+Dict.swift in Sources */ = {isa = PBXBuildFile; fileRef = A22EDF9A271DA49900F5BB8C /* ReadyStatus+Dict.swift */; };
 		A22EDFA0271DA49900F5BB8C /* UsercentricsUserInteraction+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = A22EDF9B271DA49900F5BB8C /* UsercentricsUserInteraction+String.swift */; };
 		A22EDFA1271DA49900F5BB8C /* UserResponse+Dict.swift in Sources */ = {isa = PBXBuildFile; fileRef = A22EDF9C271DA49900F5BB8C /* UserResponse+Dict.swift */; };
-		A22EDFA2271DA49900F5BB8C /* UsercentricsUISettings+Dict.swift in Sources */ = {isa = PBXBuildFile; fileRef = A22EDF9D271DA49900F5BB8C /* UsercentricsUISettings+Dict.swift */; };
 		A2390F8227B52ADA00F355C1 /* UIImage+UsercentricsLogoDict.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2390F8127B52ADA00F355C1 /* UIImage+UsercentricsLogoDict.swift */; };
-		A2390F8427B52B0800F355C1 /* UIFont+UsercentricsFontDict.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2390F8327B52B0800F355C1 /* UIFont+UsercentricsFontDict.swift */; };
 		A2390F8627B52B2700F355C1 /* UIColor+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2390F8527B52B2700F355C1 /* UIColor+Extensions.swift */; };
 		A24E4EA327313492001093C7 /* UserDecision+Dict.swift in Sources */ = {isa = PBXBuildFile; fileRef = A24E4EA227313492001093C7 /* UserDecision+Dict.swift */; };
 		A24E4EAB273186FD001093C7 /* TCFData+Dict.swift in Sources */ = {isa = PBXBuildFile; fileRef = A24E4EAA273186FD001093C7 /* TCFData+Dict.swift */; };
@@ -51,9 +49,7 @@
 		A22EDF9A271DA49900F5BB8C /* ReadyStatus+Dict.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ReadyStatus+Dict.swift"; sourceTree = "<group>"; };
 		A22EDF9B271DA49900F5BB8C /* UsercentricsUserInteraction+String.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UsercentricsUserInteraction+String.swift"; sourceTree = "<group>"; };
 		A22EDF9C271DA49900F5BB8C /* UserResponse+Dict.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UserResponse+Dict.swift"; sourceTree = "<group>"; };
-		A22EDF9D271DA49900F5BB8C /* UsercentricsUISettings+Dict.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UsercentricsUISettings+Dict.swift"; sourceTree = "<group>"; };
 		A2390F8127B52ADA00F355C1 /* UIImage+UsercentricsLogoDict.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+UsercentricsLogoDict.swift"; sourceTree = "<group>"; };
-		A2390F8327B52B0800F355C1 /* UIFont+UsercentricsFontDict.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+UsercentricsFontDict.swift"; sourceTree = "<group>"; };
 		A2390F8527B52B2700F355C1 /* UIColor+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extensions.swift"; sourceTree = "<group>"; };
 		A24E4EA227313492001093C7 /* UserDecision+Dict.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDecision+Dict.swift"; sourceTree = "<group>"; };
 		A24E4EAA273186FD001093C7 /* TCFData+Dict.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TCFData+Dict.swift"; sourceTree = "<group>"; };
@@ -88,7 +84,6 @@
 			children = (
 				A22EDF9A271DA49900F5BB8C /* ReadyStatus+Dict.swift */,
 				A22EDF99271DA49900F5BB8C /* UsercentricsOptions+Dict.swift */,
-				A22EDF9D271DA49900F5BB8C /* UsercentricsUISettings+Dict.swift */,
 				A22EDF9B271DA49900F5BB8C /* UsercentricsUserInteraction+String.swift */,
 				A22EDF9C271DA49900F5BB8C /* UserResponse+Dict.swift */,
 				A21D32A3272AE191004ED33E /* UsercentricsServiceConsents+Dict.swift */,
@@ -101,7 +96,6 @@
 				A20E7C9327B28D88004DC947 /* BannerSettings+Dict.swift */,
 				A2390F8127B52ADA00F355C1 /* UIImage+UsercentricsLogoDict.swift */,
 				A2390F8527B52B2700F355C1 /* UIColor+Extensions.swift */,
-				A2390F8327B52B0800F355C1 /* UIFont+UsercentricsFontDict.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -215,11 +209,9 @@
 				A2F0B086272C483300A99DD3 /* TCFUserDecisions+Dict.swift in Sources */,
 				A22EDF9F271DA49900F5BB8C /* ReadyStatus+Dict.swift in Sources */,
 				A24E4EAB273186FD001093C7 /* TCFData+Dict.swift in Sources */,
-				A22EDFA2271DA49900F5BB8C /* UsercentricsUISettings+Dict.swift in Sources */,
 				A2DC25402722A91400AA9DD8 /* UCRNFlag.swift in Sources */,
 				A2DC252727216CFC00AA9DD8 /* DispatchQueueManager.swift in Sources */,
 				A20E7C9427B28D88004DC947 /* BannerSettings+Dict.swift in Sources */,
-				A2390F8427B52B0800F355C1 /* UIFont+UsercentricsFontDict.swift in Sources */,
 				A22EDF9E271DA49900F5BB8C /* UsercentricsOptions+Dict.swift in Sources */,
 				A2F0B080272C367B00A99DD3 /* UsercentricsConsentType+Int.swift in Sources */,
 				A2DC25362721A05500AA9DD8 /* RNUsercentricsModuleError.swift in Sources */,

package/lib/Usercentrics.d.ts

@@ -1,15 +1,14 @@
-import { UsercentricsOptions, UsercentricsServiceConsent, UsercentricsUIOptions, UsercentricsConsentUserResponse, UsercentricsReadyStatus, UsercentricsCMPData, CCPAData, TCFData, UsercentricsConsentType, TCFDecisionUILayer, UserDecision, TCFUserDecisions, FirstLayerOptions, SecondLayerOptions } from './models';
+import { UsercentricsOptions, UsercentricsServiceConsent, UsercentricsConsentUserResponse, UsercentricsReadyStatus, UsercentricsCMPData, CCPAData, TCFData, UsercentricsConsentType, TCFDecisionUILayer, UserDecision, TCFUserDecisions, FirstLayerOptions, SecondLayerOptions } from './models';
 export declare const Usercentrics: {
     configure: (options: UsercentricsOptions) => void;
     status: () => Promise<UsercentricsReadyStatus>;
-    /**
-    * @deprecated showCMP is deprecated: This API will soon be removed in favor of showFirstLayer and showSecondLayer, check our documentation for more details: https://docs.usercentrics.com/cmp_in_app_sdk/latest/collect_consent/present_cmp/
-    */
-    showCMP: (options: UsercentricsUIOptions) => Promise<UsercentricsConsentUserResponse>;
     showFirstLayer: (options: FirstLayerOptions) => Promise<UsercentricsConsentUserResponse>;
     showSecondLayer: (options: SecondLayerOptions) => Promise<UsercentricsConsentUserResponse>;
     restoreUserSession: (controllerId: string) => Promise<UsercentricsReadyStatus>;
     getControllerId: () => Promise<string>;
+    /**
+     * @deprecated Please, call getTCFData() to get the 'tcString' from that model
+     */
     getTCFString: () => Promise<string>;
     getConsents: () => Promise<[UsercentricsServiceConsent]>;
     getCMPData: () => Promise<UsercentricsCMPData>;

package/lib/Usercentrics.js

@@ -7,13 +7,6 @@ export const Usercentrics = {
     status: () => {
         return RNUsercentricsModule.isReady();
     },
-    /**
-    * @deprecated showCMP is deprecated: This API will soon be removed in favor of showFirstLayer and showSecondLayer, check our documentation for more details: https://docs.usercentrics.com/cmp_in_app_sdk/latest/collect_consent/present_cmp/
-    */
-    showCMP: async (options) => {
-        await RNUsercentricsModule.isReady();
-        return RNUsercentricsModule.showCMP(options);
-    },
     showFirstLayer: async (options) => {
         await RNUsercentricsModule.isReady();
         return RNUsercentricsModule.showFirstLayer(options);
@@ -30,6 +23,9 @@ export const Usercentrics = {
         await RNUsercentricsModule.isReady();
         return RNUsercentricsModule.getControllerId();
     },
+    /**
+     * @deprecated Please, call getTCFData() to get the 'tcString' from that model
+     */
     getTCFString: async () => {
         await RNUsercentricsModule.isReady();
         return RNUsercentricsModule.getTCFString();

package/lib/Usercentrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"Usercentrics.js","sourceRoot":"","sources":["../src/Usercentrics.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Usercentrics.js","sourceRoot":"","sources":["../src/Usercentrics.tsx"],"names":[],"mappings":"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"}