Merge branch 'bugfix/CXTDT-626224' into 'develop'

CXTDT-626224

### Summary
CXTDT-626224
MVA/iOS: Progress section has visual defects that need to be corrected.
Change :-  Number size should be: (font-size: 32px / line-height: 36px and “%” symbol size should be: font-size: 11px / line-height: 16px

### JIRA Ticket
https://onejira.verizon.com/browse/CXTDT-626224![Screenshot_2024-10-17_at_7.15.02_PM](/uploads/e89f367a09b23c230ab4f461320fc669/Screenshot_2024-10-17_at_7.15.02_PM.png)

![Screenshot_2024-10-17_at_7.15.33_PM](/uploads/a5055585223f4ab2697d1ce79f52d43b/Screenshot_2024-10-17_at_7.15.33_PM.png)

Co-authored-by: rajani kumari  Gupta <rajani.kumari.gupta@verizon.com>

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1204

MVMCoreUI.xcodeproj/project.pbxproj

@@ -3625,7 +3625,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../SharedFrameworks";
 				INFOPLIST_FILE = MVMCoreUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3655,7 +3655,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../SharedFrameworks";
 				INFOPLIST_FILE = MVMCoreUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

MVMCoreUI/Atomic/Atoms/Buttons/ButtonGroup.swift

@@ -38,7 +38,10 @@ open class ButtonGroup: VDS.ButtonGroup, VDSMoleculeViewProtocol {
         return PillButton.estimatedHeight(with: buttonModel, delegateObject)
     }
     
-    public func viewModelDidUpdate() {                
+    public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         surface = viewModel.surface
         isEnabled = viewModel.enabled
         alignment = viewModel.alignment

MVMCoreUI/Atomic/Atoms/Buttons/ButtonGroupModel.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import MVMCore
 import VDS
 
 public class ButtonGroupModel: ParentMoleculeModelProtocol {
@@ -17,6 +18,7 @@ public class ButtonGroupModel: ParentMoleculeModelProtocol {
     
     public static var identifier: String = "buttonGroup"
     public var id: String = UUID().uuidString
+    public var accessibilityIdentifier: String?
     public var backgroundColor: Color?
     public var children: [MoleculeModelProtocol] { buttons }
 
@@ -38,6 +40,7 @@ public class ButtonGroupModel: ParentMoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case backgroundColor
         case buttons
         case alignment
@@ -56,6 +59,7 @@ public class ButtonGroupModel: ParentMoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         surface = try typeContainer.decodeIfPresent(Surface.self, forKey: .surface) ?? .light
         enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) ?? true
         buttons = try typeContainer.decodeModels(codingKey: .buttons)
@@ -70,6 +74,7 @@ public class ButtonGroupModel: ParentMoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(surface, forKey: .surface)
         try container.encode(enabled, forKey: .enabled)
         try container.encodeModels(buttons, forKey: .buttons)

MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift

@@ -15,7 +15,8 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
     
     public static var identifier: String = "imageButton"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var image: ImageViewModel?
     
@@ -45,6 +46,7 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case image
         case backgroundColor
         case accessibilityText
@@ -64,6 +66,7 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         image = try typeContainer.decodeIfPresent(ImageViewModel.self, forKey: .image)
         accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
@@ -91,6 +94,7 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(image, forKey: .image)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)

MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagModel.swift

@@ -12,13 +12,15 @@ import MVMCore
 @objcMembers public class TagModel: MoleculeModelProtocol {
     public static var identifier: String = "tag"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var label: LabelModel
     public var action: ActionModelProtocol?
     public var backgroundColor: Color?
-    
+
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case label
         case action
@@ -42,6 +44,7 @@ import MVMCore
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         label = try typeContainer.decode(LabelModel.self, forKey: .label)
         action = try typeContainer.decodeModelIfPresent(codingKey: .action)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
@@ -50,6 +53,7 @@ import MVMCore
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(label, forKey: .label)
         try container.encodeModelIfPresent(action, forKey: .action)

MVMCoreUI/Atomic/Atoms/FormFields/Tags/TagsModel.swift

@@ -12,12 +12,14 @@ import MVMCore
 @objcMembers public class TagsModel: MoleculeModelProtocol {
     public static var identifier: String = "tags"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var tags: [TagModel]
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case backgroundColor
         case tags
@@ -34,6 +36,7 @@ import MVMCore
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         tags = try typeContainer.decode([TagModel].self, forKey: .tags)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
     }
@@ -41,6 +44,7 @@ import MVMCore
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(tags, forKey: .tags)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)

MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift

@@ -123,6 +123,9 @@ import VDS
     
     
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         //forms
         FormValidator.setupValidation(for: viewModel, delegate: delegateObject?.formHolderDelegate)
         groupName = viewModel.groupName

MVMCoreUI/Atomic/Atoms/Selectors/Checkboxes.swift

@@ -28,6 +28,9 @@ open class Checkboxes: VDS.CheckboxGroup, VDSMoleculeViewProtocol {
             
     // MARK: - MoleculeViewProtocol
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         surface = viewModel.surface
         showError = viewModel.showError
         isEnabled = viewModel.enabled && !viewModel.readOnly

MVMCoreUI/Atomic/Atoms/Selectors/RadioBox.swift

@@ -28,7 +28,9 @@ import VDS
     //--------------------------------------------------
     
     public func viewModelDidUpdate() {
-
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         text = viewModel.text
         subText = viewModel.subText
         subTextRight = viewModel.subTextRight

MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxes.swift

@@ -28,6 +28,9 @@ open class RadioBoxes: VDS.RadioBoxGroup, VDSMoleculeViewProtocol {
             
     // MARK: - MoleculeViewProtocol
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         boxes = viewModel.boxes
         surface = viewModel.surface
         selectorModels = viewModel.boxes.convertToVDSRadioBoxModel(surface: surface)

MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift

@@ -79,6 +79,11 @@ import VDS
     //--------------------------------------------------    
     open override func setup() {
         super.setup()
+        
+        // Radio button should never be smaller that its content size.
+        setContentCompressionResistancePriority(.required, for: .vertical)
+        setContentCompressionResistancePriority(.required, for: .horizontal)
+        
         publisher(for: .valueChanged)
             .sink { [weak self] control in
                 guard let self, isEnabled else { return }
@@ -88,7 +93,9 @@ import VDS
     }
 
     open func viewModelDidUpdate() {
-                    
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         //events
         viewModel.updateUI = {
             MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in

MVMCoreUI/Atomic/Atoms/Selectors/RadioButtons.swift

@@ -28,6 +28,9 @@ open class RadioButtons: VDS.RadioButtonGroup, VDSMoleculeViewProtocol {
             
     // MARK: - MoleculeViewProtocol
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         showError = viewModel.showError
         isEnabled = viewModel.isEnabled
         surface = viewModel.surface

MVMCoreUI/Atomic/Atoms/Selectors/Toggle.swift

@@ -103,6 +103,9 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     }
     
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         FormValidator.setupValidation(for: viewModel, delegate: delegateObject?.formHolderDelegate)
         
         isOn = viewModel.selected

MVMCoreUI/Atomic/Atoms/Views/ArrowModel.swift

@@ -19,7 +19,8 @@ open class ArrowModel: MoleculeModelProtocol, EnableableModelProtocol {
     }
     public var moleculeName: String?
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var disabledColor: Color = Color(uiColor: .mvmCoolGray3)
     public var color: Color = Color(uiColor: .mvmBlack)
@@ -59,6 +60,7 @@ open class ArrowModel: MoleculeModelProtocol, EnableableModelProtocol {
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case backgroundColor
         case disabledColor
@@ -79,7 +81,8 @@ open class ArrowModel: MoleculeModelProtocol, EnableableModelProtocol {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
+
         if let disabledColor = try typeContainer.decodeIfPresent(Color.self, forKey: .disabledColor) {
             self.disabledColor = disabledColor
         }
@@ -116,6 +119,7 @@ open class ArrowModel: MoleculeModelProtocol, EnableableModelProtocol {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(disabledColor, forKey: .disabledColor)

MVMCoreUI/Atomic/Atoms/Views/Badge.swift

@@ -27,10 +27,14 @@ open class Badge: VDS.Badge, VDSMoleculeViewProtocol {
     //--------------------------------------------------
     
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         text = viewModel.text
+        textColor = viewModel.textColorStyle
         maxWidth = viewModel.maxWidth
         numberOfLines = viewModel.numberOfLines
-        fillColor = viewModel.fillColor
+        fillColor = viewModel.fillColorStyle
         surface = viewModel.surface
     }
     

MVMCoreUI/Atomic/Atoms/Views/BadgeIndicator.swift

@@ -25,6 +25,9 @@ open class BadgeIndicator: VDS.BadgeIndicator, VDSMoleculeViewProtocol {
     //--------------------------------------------------
     
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         surface = viewModel.surface
         number = viewModel.number
         fillColor = viewModel.fillColor

MVMCoreUI/Atomic/Atoms/Views/BadgeIndicatorModel.swift

@@ -17,7 +17,8 @@ open class BadgeIndicatorModel: MoleculeModelProtocol {
     public static var identifier: String { "badgeIndicator" }
     public var id: String = UUID().uuidString
     public var backgroundColor: Color?
-    
+    public var accessibilityIdentifier: String?
+
     //--------------------------------------------------
     // MARK: - VDS Properties
     //--------------------------------------------------
@@ -43,6 +44,7 @@ open class BadgeIndicatorModel: MoleculeModelProtocol {
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case inverted
         case accessibilityText
         case number
@@ -67,6 +69,7 @@ open class BadgeIndicatorModel: MoleculeModelProtocol {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.init()
         id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
         accessibilityText = try container.decodeIfPresent(String.self, forKey: .accessibilityText)
         number = try container.decodeIfPresent(Int.self, forKey: .number)
@@ -91,6 +94,7 @@ open class BadgeIndicatorModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(inverted, forKey: .inverted)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
         try container.encodeIfPresent(number, forKey: .number)
         try container.encodeIfPresent(fillColor, forKey: .fillColor)

MVMCoreUI/Atomic/Atoms/Views/BadgeModel.swift

@@ -16,28 +16,46 @@ open class BadgeModel: MoleculeModelProtocol {
     public static var identifier: String = "badge"
     public var id: String = UUID().uuidString
     public var backgroundColor: Color?
-    
+    public var accessibilityIdentifier: String?
+
     //--------------------------------------------------
     // MARK: - VDS Properties
     //--------------------------------------------------
     public var text: String = ""
+    public var textColorStyle: Badge.TextColor? = nil
     public var accessibilityText: String?
     public var maxWidth: CGFloat?
     public var numberOfLines: Int = 1
-    public var fillColor = Badge.FillColor.red
+    public var fillColorStyle = Badge.FillColor.red
     public var surface: Surface = .light
     
     private enum CodingKeys: String, CodingKey {
-        case id, text, accessibilityText, fillColor, surface, numberOfLines, maxWidth
+        case id, accessibilityIdentifier, accessibilityText
+        case surface, numberOfLines, maxWidth
+        case text, textColor
+        case fillColor, fillColorStyle
     }
         
     required public convenience init(from decoder: Decoder) throws {
         self.init()
         let container = try decoder.container(keyedBy: CodingKeys.self)
         id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         text = try container.decode(String.self, forKey: .text)
         accessibilityText = try container.decodeIfPresent(String.self, forKey: .accessibilityText)
-        fillColor = try container.decodeIfPresent(Badge.FillColor.self, forKey: .fillColor) ?? .red
+
+        //look for a textColor
+        if let textColor = try container.decodeIfPresent(Color.self, forKey: .textColor) {
+            textColorStyle = .custom(textColor.uiColor)
+        }
+        
+        //look for a style
+        fillColorStyle = try container.decodeIfPresent(Badge.FillColor.self, forKey: .fillColorStyle) ?? .red
+        
+        //look for a color and set the style
+        if let fillColor = try container.decodeIfPresent(Color.self, forKey: .fillColor) {
+            fillColorStyle = .custom(fillColor.uiColor)
+        }
         surface = try container.decodeIfPresent(Surface.self, forKey: .surface) ?? .light
         numberOfLines = try container.decodeIfPresent(Int.self, forKey: .numberOfLines) ?? 1
         maxWidth = try container.decodeIfPresent(CGFloat.self, forKey: .maxWidth)
@@ -48,16 +66,24 @@ open class BadgeModel: MoleculeModelProtocol {
         try container.encode(id, forKey: .id)
         try container.encode(text, forKey: .text)
         try container.encode(accessibilityText, forKey: .accessibilityText)
-        try container.encode(fillColor, forKey: .fillColor)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(surface, forKey: .surface)
         try container.encode(numberOfLines, forKey: .numberOfLines)
         try container.encodeIfPresent(maxWidth, forKey: .maxWidth)
+        try container.encode(fillColorStyle, forKey: .fillColorStyle)
+        switch textColorStyle {
+        case .custom(let color):
+            try container.encode(Color(uiColor: color), forKey: .textColor)
+        default:
+            break
+        }
     }
     
     public func isEqual(to model: any ModelComparisonProtocol) -> Bool {
         guard let model = model as? BadgeModel else { return false }
         return self.backgroundColor == model.backgroundColor
-        && self.fillColor == model.fillColor
+        && self.fillColorStyle == model.fillColorStyle
+        && self.textColorStyle == model.textColorStyle
         && self.numberOfLines == model.numberOfLines
         && self.text == model.text
         && self.surface == model.surface

MVMCoreUI/Atomic/Atoms/Views/ButtonIcon.swift

@@ -25,6 +25,9 @@ open class ButtonIcon: VDS.ButtonIcon, VDSMoleculeViewProtocol {
     //--------------------------------------------------
     
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         surface = viewModel.surface
         
         onClick = { [weak self] control in

MVMCoreUI/Atomic/Atoms/Views/ButtonIconModel.swift

@@ -16,7 +16,8 @@ open class ButtonIconModel: ButtonModelProtocol, MoleculeModelProtocol {
     public static var identifier: String = "buttonIcon"
     public var id: String = UUID().uuidString
     public var backgroundColor: Color?
-    
+    public var accessibilityIdentifier: String?
+
     //--------------------------------------------------
     // MARK: - VDS Properties
     //--------------------------------------------------
@@ -77,6 +78,7 @@ open class ButtonIconModel: ButtonModelProtocol, MoleculeModelProtocol {
     //--------------------------------------------------
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case inverted
         case accessibilityText
         case action
@@ -105,6 +107,7 @@ open class ButtonIconModel: ButtonModelProtocol, MoleculeModelProtocol {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         action = try container.decodeModel(codingKey: .action)
         id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
         accessibilityText = try container.decodeIfPresent(String.self, forKey: .accessibilityText)
         badgeIndicator = try container.decodeIfPresent(BadgeIndicatorModel.self, forKey: .badgeIndicator)
@@ -128,6 +131,7 @@ open class ButtonIconModel: ButtonModelProtocol, MoleculeModelProtocol {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(inverted, forKey: .inverted)
         try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
         try container.encodeIfPresent(badgeIndicator, forKey: .badgeIndicator)

MVMCoreUI/Atomic/Atoms/Views/CalendarView.swift

@@ -22,6 +22,9 @@ open class CalendarView: VDS.CalendarBase, VDSMoleculeViewProtocol {
     //--------------------------------------------------
     
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         if let _selectedDate = viewModel.selectedDate {
             selectedDate = _selectedDate
         }

MVMCoreUI/Atomic/Atoms/Views/CalendarViewModel.swift

@@ -16,6 +16,7 @@ open class CalendarViewModel: MoleculeModelProtocol {
     public static var identifier: String = "calendar"
     public var id: String = UUID().uuidString
     public var backgroundColor: Color?
+    public var accessibilityIdentifier: String?
 
     public var dateFormatter: DateFormatter = {
         let formatter = DateFormatter()
@@ -51,6 +52,8 @@ open class CalendarViewModel: MoleculeModelProtocol {
     //--------------------------------------------------
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
+        case moleculeName
         case inverted
         case dateFormat
         case hideContainerBorder
@@ -76,7 +79,8 @@ open class CalendarViewModel: MoleculeModelProtocol {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
-        
+        accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
+
         hideContainerBorder = try container.decodeIfPresent(Bool.self, forKey: .hideContainerBorder)
         hideCurrentDateIndicator = try container.decodeIfPresent(Bool.self, forKey: .hideCurrentDateIndicator)
         
@@ -111,7 +115,9 @@ open class CalendarViewModel: MoleculeModelProtocol {
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(inverted, forKey: .inverted)
         try container.encode(dateFormat, forKey: .dateFormat)
         try container.encode(hideContainerBorder, forKey: .hideContainerBorder)

MVMCoreUI/Atomic/Atoms/Views/CaretViewModel.swift

@@ -16,6 +16,7 @@ import MVMCore
     
     public static var identifier: String = "caretView"
     public var id: String = UUID().uuidString
+    public var accessibilityIdentifier: String?
     public var backgroundColor: Color?
     public var strokeColor: Color = Color(uiColor: .mvmBlack)
     public var strokeColor_inverted: Color = Color(uiColor: .mvmWhite)
@@ -30,6 +31,7 @@ import MVMCore
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case backgroundColor
         case strokeColor
@@ -54,7 +56,8 @@ import MVMCore
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
-        
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
+
         if let strokeColor = try typeContainer.decodeIfPresent(Color.self, forKey: .strokeColor) {
             self.strokeColor = strokeColor
         }
@@ -84,6 +87,7 @@ import MVMCore
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(strokeColor, forKey: .strokeColor)
         try container.encode(strokeColor_inverted, forKey: .strokeColor_inverted)
         try container.encode(inverted, forKey: .inverted)

MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift

@@ -19,6 +19,7 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
     }
     
     public var id: String = UUID().uuidString
+    public var accessibilityIdentifier: String?
     public var backgroundColor: Color?
     public var moleculeName: String?
 
@@ -48,6 +49,7 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case backgroundColor
         case currentIndex
@@ -70,6 +72,7 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         moleculeName = try typeContainer.decodeIfPresent(String.self, forKey: .moleculeName)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         
@@ -118,6 +121,7 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encodeIfPresent(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(currentIndex, forKey: .currentIndex)
         try container.encode(alwaysSendAction, forKey: .alwaysSendAction)

MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift

@@ -31,23 +31,20 @@ import VDS
     // MARK: - Atomic
     //--------------------------------------------------
     open func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         surface = viewModel.surface
         
         updateCheckbox()
         
         //primary label
-        labelText = viewModel.label.text
-        if let attributes = viewModel.label.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
-            labelTextAttributes = attributes
-        }
+        labelText = viewModel.label?.text
+        labelTextAttributes = viewModel.label?.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
         
         //secondary label
-        if let subTitleModel = viewModel.subTitle {
-            childText = subTitleModel.text
-            if let attributes = subTitleModel.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
-                childTextAttributes = attributes
-            }
-        }
+        childText = viewModel.subTitle?.text
+        childTextAttributes = viewModel.subTitle?.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
     }
     
     private func performCheckboxAction(with actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {

MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift

@@ -14,17 +14,20 @@ import VDS
     open class var identifier: String { "checkboxLabel" }
     public var moleculeName: String = CheckboxLabelModel.identifier
     @DecodableDefault.UUIDString public var id: String
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var checkbox: CheckboxModel
-    public var label: LabelModel
+    public var label: LabelModel?
     public var subTitle: LabelModel?
     public var inverted: Bool? = false
     public var surface: Surface { inverted ?? false ? .dark : .light }
     
     public var children: [MoleculeModelProtocol] {
-        guard let subTitle else { return [checkbox, label] }
-        return [checkbox, label, subTitle]
+        var values: [MoleculeModelProtocol] = [checkbox]
+        if let label { values.append(label) }
+        if let subTitle { values.append(subTitle) }
+        return values
     }
     
     //--------------------------------------------------
@@ -54,8 +57,8 @@ extension Array where Element == CheckboxLabelModel {
         return compactMap({ model in
             var item = CheckboxGroup.CheckboxItemModel()
             item.inputId = model.checkbox.fieldKey
-            item.labelText = model.label.text
-            if let attributes = model.label.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
+            item.labelText = model.label?.text
+            if let attributes = model.label?.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
                 item.labelTextAttributes = attributes
             }
             item.childText = model.subTitle?.text

MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift

@@ -107,15 +107,15 @@ import UIKit
         // configure attributed string for progress percentage.
         let attributedString = NSMutableAttributedString(string: String(percent) + "%")
         // percent value
-        attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldTitleLarge()], range: NSMakeRange(0, percentLen))
+        attributedString.setAttributes([NSAttributedString.Key.font: Styler.Font.BoldTitleXLarge], range: NSMakeRange(0, percentLen))
         // % symbol
-        attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldBodyLarge()], range: NSMakeRange(percentLen, 1))
+        attributedString.setAttributes([NSAttributedString.Key.font: Styler.Font.RegularMicro], range: NSMakeRange(percentLen, 1))
 
         // show progress percentage in a text layer
         let width = viewWidth
         let height = width
         labelLayer.string = attributedString
-        labelLayer.frame = CGRectMake((width - CGFloat(percentLen * 20))/2, (height - 30)/2, 60, 30)
+        labelLayer.frame = CGRectMake((width - CGFloat(percentLen * 20))/2, (height - 40)/2, 80, 40)
         self.layer.addSublayer(labelLayer)
     }
     

MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift

@@ -14,7 +14,8 @@ public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol {
     
     public static var identifier: String = "circularProgress"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var percent: Int = 0
     public var diameter: CGFloat? = 64
     public var lineWidth: CGFloat? = 4
@@ -31,6 +32,7 @@ public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol {
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case percent
         case size
@@ -48,7 +50,8 @@ public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol {
         super.init()
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
-        
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
+
         percent = try typeContainer.decode(Int.self, forKey: .percent)
 
         if let size = try typeContainer.decodeIfPresent(GraphSize.self, forKey: .size) {
@@ -89,6 +92,7 @@ public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(percent, forKey: .percent)
         try container.encodeIfPresent(size, forKey: .size)
         try container.encodeIfPresent(diameter, forKey: .diameter)

MVMCoreUI/Atomic/Atoms/Views/Icon.swift

@@ -31,6 +31,9 @@ open class Icon: VDS.Icon, VDSMoleculeViewProtocol{
     // MARK: - Public
     //--------------------------------------------------
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         surface = viewModel.surface
         color = viewModel.color.uiColor
         size = viewModel.size

MVMCoreUI/Atomic/Atoms/Views/IconModel.swift

@@ -21,6 +21,8 @@ open class IconModel: MoleculeModelProtocol {
     
     public var backgroundColor: Color?
     
+    public var accessibilityIdentifier: String?
+
     /// A representation that will be used to render the icon with corresponding name.
     public var name: Icon.Name
     

MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift

@@ -18,6 +18,7 @@
     public var backgroundColor: Color?
     public var moleculeName: String = ImageViewModel.identifier
     public var image: String
+    public var accessibilityIdentifier: String?
     public var accessibilityText: String?
     public var fallbackImage: String?
     public var imageFormat: String?
@@ -47,6 +48,7 @@
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case backgroundColor
         case image

MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift

@@ -182,6 +182,9 @@ public typealias ActionBlock = () -> ()
     }
     
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         shouldMaskWhileRecording = viewModel.shouldMaskRecordedView ?? false
         text = viewModel.text
         hero = viewModel.hero

MVMCoreUI/Atomic/Atoms/Views/Label/LabelModel.swift

@@ -14,7 +14,8 @@ import VDS
     
     open class var identifier: String { "label" }
     public var id: String
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var text: String
     public var accessibilityText: String?
@@ -38,6 +39,7 @@ import VDS
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case text
         case accessibilityText
@@ -88,6 +90,7 @@ import VDS
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         text = try typeContainer.decode(String.self, forKey: .text)
         accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
         textColor = try typeContainer.decodeIfPresent(Color.self, forKey: .textColor)
@@ -115,6 +118,7 @@ import VDS
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encodeIfPresent(moleculeName, forKey: .moleculeName)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(text, forKey: .text)
         try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
         try container.encodeIfPresent(textColor, forKey: .textColor)

MVMCoreUI/Atomic/Atoms/Views/LeftRightLabelModel.swift

@@ -16,7 +16,8 @@ import UIKit
     public static var identifier: String = "leftRightLabelView"
     public var moleculeName: String = LeftRightLabelModel.identifier
     @DecodableDefault.UUIDString public var id: String
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var leftText: LabelModel
     public var rightText: LabelModel?

MVMCoreUI/Atomic/Atoms/Views/Line.swift

@@ -93,6 +93,9 @@ import VDS
     // MARK: - VDSMoleculeViewProtocol
     //--------------------------------------------------
     open func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         surface = viewModel.surface
         style = VDS.Line.Style(rawValue: viewModel.type.rawValue) ?? .primary
         orientation = viewModel.orientation

MVMCoreUI/Atomic/Atoms/Views/LineModel.swift

@@ -55,6 +55,7 @@ public class LineModel: MoleculeModelProtocol, Invertable {
     
     public static var identifier: String = "line"
     public var id: String = UUID().uuidString
+    public var accessibilityIdentifier: String?
     public var backgroundColor: Color?
 
     public var type: Style = .secondary
@@ -83,6 +84,7 @@ public class LineModel: MoleculeModelProtocol, Invertable {
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case type
         case frequency
@@ -99,7 +101,8 @@ public class LineModel: MoleculeModelProtocol, Invertable {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
-        
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
+
         if let type = try typeContainer.decodeIfPresent(Style.self, forKey: .type) {
             self.type = type
         }
@@ -124,6 +127,7 @@ public class LineModel: MoleculeModelProtocol, Invertable {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(type, forKey: .type)
         try container.encode(inverted, forKey: .inverted)
         try container.encodeIfPresent(frequency, forKey: .frequency)

MVMCoreUI/Atomic/Atoms/Views/LoadingSpinner.swift

@@ -22,6 +22,9 @@ open class LoadingSpinner: VDS.Loader, VDSMoleculeViewProtocol {
     // MARK: - Public Functions
     //--------------------------------------------------
     open func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         size = Int(viewModel.diameter)
         surface = viewModel.surface
     }

MVMCoreUI/Atomic/Atoms/Views/LoadingSpinnerModel.swift

@@ -16,7 +16,8 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
     //--------------------------------------------------
     public static var identifier: String = "loadingSpinner"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var inverted: Bool = false
     public var diameter: CGFloat = 40
@@ -27,6 +28,7 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case strokeColor
         case diameter
@@ -47,7 +49,8 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
-        
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
+
         if let diameter = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .diameter) {
             self.diameter = diameter
         }
@@ -65,6 +68,7 @@ open class LoadingSpinnerModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(diameter, forKey: .diameter)
         try container.encodeIfPresent(inverted, forKey: .inverted)
     }

MVMCoreUI/Atomic/Atoms/Views/MultiProgressModel.swift

@@ -22,7 +22,8 @@ import Foundation
     
     public static var identifier: String = "multiProgressBar"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var progressList: [SingleProgressBarModel]
     public var backgroundColor: Color?
     public var thickness: CGFloat?
@@ -30,6 +31,7 @@ import Foundation
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case progressList
         case thickness
@@ -44,6 +46,7 @@ import Foundation
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         progressList = try typeContainer.decode([SingleProgressBarModel].self, forKey: .progressList)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         thickness = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .thickness)
@@ -54,6 +57,7 @@ import Foundation
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(progressList, forKey: .progressList)
         try container.encodeIfPresent(thickness, forKey: .thickness)
         try container.encodeIfPresent(roundedCorners, forKey: .roundedCorners)

MVMCoreUI/Atomic/Atoms/Views/Pagination.swift

@@ -39,6 +39,9 @@ import VDS
     }
 
     open func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         isEnabled = viewModel.enabled
         surface = viewModel.surface
         total = viewModel.totalPages

MVMCoreUI/Atomic/Atoms/Views/PaginationModel.swift

@@ -19,7 +19,8 @@ open class PaginationModel: MoleculeModelProtocol {
     open var moleculeName: String { Self.identifier }
     open var backgroundColor: Color?
     open var id: String = UUID().uuidString
-    
+    open var accessibilityIdentifier: String?
+
     open var totalPages: Int = 0
     open var selectedPage: Int = 0
     open var enabled: Bool = true
@@ -31,6 +32,9 @@ open class PaginationModel: MoleculeModelProtocol {
     //--------------------------------------------------
     
     private enum CodingKeys: String, CodingKey {
+        case id
+        case moleculeName
+        case accessibilityIdentifier
         case totalPages
         case selectedPage
         case enabled
@@ -43,6 +47,8 @@ open class PaginationModel: MoleculeModelProtocol {
     
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
+        id = try container.decode(String.self, forKey: .id)
+        accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         totalPages = try container.decode(Int.self, forKey: .totalPages)
         selectedPage = try container.decodeIfPresent(Int.self, forKey: .selectedPage) ?? 0
         enabled = try container.decodeIfPresent(Bool.self, forKey: .enabled) ?? false
@@ -51,6 +57,9 @@ open class PaginationModel: MoleculeModelProtocol {
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(totalPages, forKey: .totalPages)
         try container.encode(selectedPage, forKey: .selectedPage)
         try container.encode(enabled, forKey: .enabled)

MVMCoreUI/Atomic/Atoms/Views/ProgressBar.swift

@@ -75,6 +75,9 @@ import Foundation
         guard let progressBarModel = model as? ProgressBarModel else { return }
         
         self.progressBarModel = progressBarModel
+        if let accessibilityIdentifier = model.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         thickness = progressBarModel.thickness ?? 8
         progress = Float((progressBarModel.percent) / 100.0)
         progressTintColor = progressBarModel.color.uiColor

MVMCoreUI/Atomic/Atoms/Views/ProgressBarModel.swift

@@ -11,7 +11,8 @@ import Foundation
 @objcMembers open class ProgressBarModel: MoleculeModelProtocol {
     open class var identifier: String { "progressBar" }
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     @Percent public var percent: CGFloat
     public var color: Color = Color(uiColor: .mfCerulean())
     public var backgroundColor: Color? = Color(uiColor: .mfLightSilver())
@@ -20,6 +21,7 @@ import Foundation
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case roundedCorners
         case thickness
@@ -35,6 +37,7 @@ import Foundation
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         percent = try typeContainer.decode(CGFloat.self, forKey: .percent)
         if let color = try typeContainer.decodeIfPresent(Color.self, forKey: .color) {
             self.color = color
@@ -50,6 +53,7 @@ import Foundation
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(percent, forKey: .percent)
         try container.encode(color, forKey: .color)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)

MVMCoreUI/Atomic/Atoms/Views/StarModel.swift

@@ -14,7 +14,8 @@ open class StarModel: MoleculeModelProtocol {
     //--------------------------------------------------
     public static var identifier: String = "star"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     @Percent public var percent: CGFloat = 0
     public var borderColor: Color?
@@ -26,6 +27,7 @@ open class StarModel: MoleculeModelProtocol {
     //--------------------------------------------------
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case backgroundColor
         case percent
@@ -47,6 +49,7 @@ open class StarModel: MoleculeModelProtocol {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         if let percent = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .percent) {
             self.percent = percent
         }
@@ -63,6 +66,7 @@ open class StarModel: MoleculeModelProtocol {
         try container.encode(id, forKey: .id)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(percent, forKey: .percent)
         try container.encodeIfPresent(borderColor, forKey: .borderColor)
         try container.encodeIfPresent(fillColor, forKey: .fillColor)

MVMCoreUI/Atomic/Atoms/Views/StarsModel.swift

@@ -14,7 +14,8 @@ import MVMCore
     //--------------------------------------------------
     public static var identifier: String = "stars"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var starBackgroundColor: Color?
     public var stars: [StarModel]
@@ -28,6 +29,7 @@ import MVMCore
     //--------------------------------------------------
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case backgroundColor
         case starBackgroundColor
@@ -53,6 +55,7 @@ import MVMCore
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         stars = try typeContainer.decode([StarModel].self, forKey: .stars)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         starBackgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .starBackgroundColor)
@@ -70,6 +73,7 @@ import MVMCore
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(stars, forKey: .stars)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(starBackgroundColor, forKey: .starBackgroundColor)

MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift

@@ -40,7 +40,9 @@ open class TileContainer: VDS.TileContainer, VDSMoleculeViewProtocol{
     // MARK: - Public
     //--------------------------------------------------
     public func viewModelDidUpdate() {
-        
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         if let moleculeModel = viewModel.molecule {
             if let molecule,
                 moleculeModel.moleculeName == molecule.model?.moleculeName {

MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift

@@ -70,8 +70,10 @@ open class TileContainerBaseModel<PaddingType: DefaultValuing & Codable, TileCon
     public var aspectRatio: TileContainerType.AspectRatio = .none
     public var backgroundEffect: TileContainerType.BackgroundEffect = .none
     public var surface: Surface { inverted ? .dark : .light }
-    
+    public var accessibilityIdentifier: String?
+
     private enum CodingKeys: String, CodingKey {
+        case accessibilityIdentifier
         case inverted
         case backgroundImage
         case action
@@ -88,6 +90,7 @@ open class TileContainerBaseModel<PaddingType: DefaultValuing & Codable, TileCon
     
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
+        accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
         backgroundImage = try container.decodeIfPresent(String.self, forKey: .backgroundImage)
         action = try container.decodeModelIfPresent(codingKey: .action)
@@ -104,6 +107,7 @@ open class TileContainerBaseModel<PaddingType: DefaultValuing & Codable, TileCon
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundImage, forKey: .backgroundImage)
         try container.encodeModelIfPresent(action, forKey: .action)
         try container.encodeIfPresent(imageFallbackColor, forKey: .imageFallbackColor)

MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift

@@ -39,6 +39,9 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol{
     // MARK: - Public
     //--------------------------------------------------
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         //tilelet specific properties
         if let value = viewModel.textWidth {
             textWidth = .value(value)
@@ -48,7 +51,7 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol{
         eyebrowModel = viewModel.eyebrowModel(delegateObject: delegateObject, additionalData: additionalData)
         titleModel = viewModel.titleModel(delegateObject: delegateObject, additionalData: additionalData)
         subTitleModel = viewModel.subTitleModel(delegateObject: delegateObject, additionalData: additionalData)
-        badgeModel = viewModel.badge
+        badgeModel = viewModel.badgeModel()
         descriptiveIconModel = viewModel.descriptiveIcon
         directionalIconModel = viewModel.directionalIcon
         //setup action

MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift

@@ -18,7 +18,7 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
     public var id: String = UUID().uuidString
     public var backgroundColor: Color?
     
-    public var badge: Tilelet.BadgeModel?
+    public var badge: BadgeModel?
     public var eyebrow: LabelModel?
     public var eyebrowColor: TitleLockup.TextColor = .primary
     public var title: LabelModel?
@@ -49,7 +49,7 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
-        badge = try container.decodeIfPresent(Tilelet.BadgeModel.self, forKey: .badge)
+        badge = try container.decodeIfPresent(BadgeModel.self, forKey: .badge)
         eyebrow = try container.decodeIfPresent(LabelModel.self, forKey: .eyebrow)
         title = try container.decodeIfPresent(LabelModel.self, forKey: .title)
         subTitle = try container.decodeIfPresent(LabelModel.self, forKey: .subTitle)
@@ -91,32 +91,48 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
         try super.init(from: decoder)
     }
     
+    public func badgeModel() -> Tilelet.BadgeModel? {
+        guard let badge else { return nil }
+        return .init(text: badge.text,
+                     textColor: badge.textColorStyle,
+                     fillColor: badge.fillColorStyle,
+                     surface: badge.surface,
+                     numberOfLines: badge.numberOfLines,
+                     maxWidth: badge.maxWidth
+                    )
+    }
+    
     public func eyebrowModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.EyebrowModel? {
         guard let eyebrow else { return nil }
         let attrs = eyebrow.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
+        var isBold: Bool = true
         do {
             if let style = eyebrow.fontStyle {
+                isBold = style.isBold()
                 return .init(text: eyebrow.text,
                              textColor: eyebrowColor,
-                             textAttributes: attrs, isBold: style.isBold(),
+                             textAttributes: attrs,
+                             isBold: isBold,
                              standardStyle: try style.vdsSubsetStyle())
             }
         } catch MVMCoreError.errorObject(let object) {
             MVMCoreLoggingHandler.shared()?.addError(toLog: object)
         } catch { }
         
-        return .init(text: eyebrow.text, textColor: eyebrowColor, textAttributes: attrs)
+        return .init(text: eyebrow.text, textColor: eyebrowColor, textAttributes: attrs, isBold: isBold)
     }
     
     public func titleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.TitleModel? {
         guard let title else { return nil }
         let attrs = title.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
-        
+        var isBold: Bool = true
         do {
             if let style = title.fontStyle {
+                isBold = style.isBold()
                 return .init(text: title.text,
                              textColor: titleColor,
                              textAttributes: attrs,
+                             isBold: isBold,
                              standardStyle: try style.vdsSubsetStyle())
             }
 
@@ -124,7 +140,7 @@ open class TileletModel: TileContainerBaseModel<Tilelet.Padding, Tilelet>, Molec
             MVMCoreLoggingHandler.shared()?.addError(toLog: object)
         } catch { }
         
-        return .init(text: title.text, textColor: titleColor, textAttributes: attrs)
+        return .init(text: title.text, textColor: titleColor, textAttributes: attrs, isBold: isBold)
     }
     
     public func subTitleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.SubTitleModel? {

MVMCoreUI/Atomic/Atoms/Views/Tooltip.swift

@@ -28,6 +28,9 @@ open class Tooltip: VDS.Tooltip, VDSMoleculeViewProtocol{
     // MARK: - Public
     //--------------------------------------------------
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         surface = viewModel.surface
         fillColor = viewModel.fillColor
         size = viewModel.size

MVMCoreUI/Atomic/Atoms/Views/TooltipModel.swift

@@ -22,6 +22,8 @@ open class TooltipModel: MoleculeModelProtocol {
     
     public var backgroundColor: Color?
     
+    public var accessibilityIdentifier: String?
+
     public var size: VDS.Tooltip.Size = .medium
     
     public var fillColor: VDS.Tooltip.FillColor = .primary
@@ -39,6 +41,7 @@ open class TooltipModel: MoleculeModelProtocol {
 
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case backgroundColor
         case closeButtonText
@@ -52,13 +55,14 @@ open class TooltipModel: MoleculeModelProtocol {
     
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
-        self.backgroundColor = try container.decodeIfPresent(Color.self, forKey: .backgroundColor)
+        id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        backgroundColor = try container.decodeIfPresent(Color.self, forKey: .backgroundColor)
+        accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
 
-        self.title = try container.decodeIfPresent(String.self, forKey: .title)
-        self.content = try container.decodeIfPresent(String.self, forKey: .content)
+        title = try container.decodeIfPresent(String.self, forKey: .title)
+        content = try container.decodeIfPresent(String.self, forKey: .content)
         
-        self.molecule = try container.decodeModelIfPresent(codingKey: .contentView)
+        molecule = try container.decodeModelIfPresent(codingKey: .contentView)
 
         if let closeButtonText = try container.decodeIfPresent(String.self, forKey: .closeButtonText) {
             self.closeButtonText = closeButtonText
@@ -81,6 +85,7 @@ open class TooltipModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(surface, forKey: .surface)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)

MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift

@@ -11,6 +11,7 @@ import Foundation
 open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
     public static var identifier = "video"
     public var id: String = UUID().uuidString
+    public var accessibilityIdentifier: String?
     public var backgroundColor: Color?
     public var video: String
     public var showControls = false
@@ -45,6 +46,7 @@ open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
 
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case moleculeName
         case video
         case showControls
@@ -60,6 +62,7 @@ open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         video = try typeContainer.decode(String.self, forKey:.video)
         if let showControls = try typeContainer.decodeIfPresent(Bool.self, forKey: .showControls) {
             self.showControls = showControls
@@ -76,6 +79,7 @@ open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer {
     open func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(video, forKey: .video)
         try container.encode(showControls, forKey: .showControls)

MVMCoreUI/Atomic/Atoms/Views/WebViewModel.swift

@@ -13,7 +13,8 @@ import MVMCore
     public static var identifier: String = "webview"
     public var moleculeName: String = WebViewModel.identifier
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var url: URL?
     public var htmlString: String?
@@ -26,6 +27,7 @@ import MVMCore
     
     private enum CodingKeys: String, CodingKey{
         case id
+        case accessibilityIdentifier
         case moleculeName
         case backgroundColor
         case url
@@ -43,6 +45,7 @@ import MVMCore
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         url = try typeContainer.decodeIfPresent(URL.self, forKey: .url)
         htmlString = try typeContainer.decodeIfPresent(String.self, forKey: .htmlString)
@@ -57,6 +60,7 @@ import MVMCore
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(url, forKey: .url)
         try container.encodeIfPresent(htmlString, forKey: .htmlString)

MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift

@@ -16,7 +16,8 @@ public class WheelModel: GraphSizeBase, MoleculeModelProtocol {
     
     public static var identifier: String = "wheel"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var style: GraphStyle = .unlimited {
         didSet {
             updateStyle()
@@ -38,6 +39,7 @@ public class WheelModel: GraphSizeBase, MoleculeModelProtocol {
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case style
         case size
         case diameter
@@ -53,7 +55,8 @@ public class WheelModel: GraphSizeBase, MoleculeModelProtocol {
         super.init()
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
-        
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
+
         if let style = try typeContainer.decodeIfPresent(GraphStyle.self, forKey: .style) {
             self.style = style
         }
@@ -84,6 +87,7 @@ public class WheelModel: GraphSizeBase, MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(style, forKey: .style)
         try container.encode(size, forKey: .size)
         try container.encode(diameter, forKey: .diameter)

MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift

@@ -16,7 +16,6 @@ import MVMCore
 //--------------------------------------------------
 
 extension VDS.Surface: Codable {}
-extension VDS.Badge.FillColor: Codable {}
 extension VDS.BadgeIndicator.FillColor: Codable {}
 extension VDS.BadgeIndicator.Kind: Codable {}
 extension VDS.BadgeIndicator.MaximumDigits: Codable {}
@@ -294,6 +293,45 @@ extension VDS.TitleLockup.TextColor: Codable {
     }
 }
 
+extension VDS.Badge.FillColor: Codable {
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        let type = try container.decode(String.self)
+        switch type {
+        case "red":
+            self = .red
+        case "yellow":
+            self = .yellow
+        case "green":
+            self = .green
+        case "orange":
+            self = .orange
+        case "blue":
+            self = .blue
+        case "black":
+            self = .black
+        case "white":
+            self = .white
+        default:
+            if let color = try? Color(from: decoder) {
+                self = .custom(color.uiColor)
+            } else {
+                self = .custom(UIColor(hexString: type))
+            }
+        }
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+        switch self {
+        case .custom(let value):
+            try container.encode(Color(uiColor: value))
+        default:
+            try container.encode(String(reflecting: self))
+        }
+    }
+}
+
 extension VDS.TitleLockup.TitleTextColor: Codable {
 
     enum CodingKeys: String, CodingKey {

MVMCoreUI/Atomic/Extensions/VDS-LabelAttributeModel.swift

@@ -69,6 +69,8 @@ extension LabelAttributeFontModel: VDSLabelAttributeConvertable {
         var textStyle: TextStyle?
         if let found = style?.vdsTextStyle() {
             textStyle = found
+        } else if let name, let size, let font = UIFont(name: name, size: size) {
+            textStyle = TextStyle.convert(font: font)
         } else if let name, let found = TextStyle(rawValue: name) {
             textStyle = found
         }

MVMCoreUI/Atomic/Molecules/Breadcrumbs/Breadcrumbs.swift

@@ -30,6 +30,9 @@ import VDS
     }
 
     open func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         isEnabled = viewModel.enabled
         surface = viewModel.surface
         breadcrumbModels = viewModel.breadcrumbs.compactMap { [unowned self] breadcrumb in

MVMCoreUI/Atomic/Molecules/Breadcrumbs/BreadcrumbsModel.swift

@@ -19,6 +19,7 @@ open class BreadcrumbsModel: MoleculeModelProtocol, ParentMoleculeModelProtocol
     open var moleculeName: String { Self.identifier }
     open var backgroundColor: Color?
     open var id: String = UUID().uuidString
+    open var accessibilityIdentifier: String?
     open var children: [any MoleculeModelProtocol] { breadcrumbs }
     
     open var breadcrumbs: [BreadcrumbModel] = []
@@ -31,6 +32,8 @@ open class BreadcrumbsModel: MoleculeModelProtocol, ParentMoleculeModelProtocol
     //--------------------------------------------------
     
     private enum CodingKeys: String, CodingKey {
+        case accessibilityIdentifier
+        case moleculeName
         case breadcrumbs
         case enabled
         case inverted
@@ -42,6 +45,7 @@ open class BreadcrumbsModel: MoleculeModelProtocol, ParentMoleculeModelProtocol
     
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
+        accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         breadcrumbs = try container.decode([BreadcrumbModel].self, forKey: .breadcrumbs)
         enabled = try container.decodeIfPresent(Bool.self, forKey: .enabled) ?? false
         inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
@@ -49,6 +53,9 @@ open class BreadcrumbsModel: MoleculeModelProtocol, ParentMoleculeModelProtocol
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encode(breadcrumbs, forKey: .breadcrumbs)
         try container.encode(enabled, forKey: .enabled)
         try container.encode(inverted, forKey: .inverted)
     }
@@ -68,6 +75,7 @@ open class BreadcrumbModel: MoleculeModelProtocol {
     open var moleculeName: String { Self.identifier }
     open var backgroundColor: Color?
     open var id: String = UUID().uuidString
+    open var accessibilityIdentifier: String?
 
     open var text: String = ""
     open var selected: Bool = false
@@ -79,6 +87,8 @@ open class BreadcrumbModel: MoleculeModelProtocol {
     //--------------------------------------------------
     
     private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case accessibilityIdentifier
         case text
         case selected
         case action
@@ -90,6 +100,7 @@ open class BreadcrumbModel: MoleculeModelProtocol {
     
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
+        accessibilityIdentifier = try container.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         text = try container.decode(String.self, forKey: .text)
         selected = try container.decodeIfPresent(Bool.self, forKey: .selected) ?? false
         action = try container.decodeModel(codingKey: .action)
@@ -97,6 +108,8 @@ open class BreadcrumbModel: MoleculeModelProtocol {
     
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
+        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(text, forKey: .text)
         try container.encode(selected, forKey: .selected)
         try container.encodeModelIfPresent(action, forKey: .action)

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1ButtonModel.swift

@@ -52,6 +52,9 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol, ParentMol
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
+        if titleLockup.title.accessibilityTraits == nil {
+            titleLockup.title.accessibilityTraits = [.header]
+        }
     }
     
     //--------------------------------------------------

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift

@@ -31,6 +31,9 @@ public class HeadersH1NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
+        if titleLockup.title.accessibilityTraits == nil {
+            titleLockup.title.accessibilityTraits = [.header]
+        }
     }
     
     //--------------------------------------------------

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift

@@ -47,18 +47,15 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
     //--------------------------------------------------
     
     public override func setDefaults() {
-        if topPadding == nil {
-            topPadding = Padding.Component.VerticalMarginSpacing
-        }
-        if bottomPadding == nil {
-            bottomPadding = Padding.Component.VerticalMarginSpacing
-        }
         if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
+        if titleLockup.title.accessibilityTraits == nil {
+            titleLockup.title.accessibilityTraits = [.header]
+        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift

@@ -42,18 +42,15 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
     // MARK: - Methods
     //--------------------------------------------------
     public override func setDefaults() {
-        if topPadding == nil {
-            topPadding = Padding.Component.VerticalMarginSpacing
-        }
-        if bottomPadding == nil {
-            bottomPadding = Padding.Component.VerticalMarginSpacing
-        }
         if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
+        if titleLockup.title.accessibilityTraits == nil {
+            titleLockup.title.accessibilityTraits = [.header]
+        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift

@@ -46,18 +46,15 @@ public class HeadersH2LinkModel: HeaderModel, ParentMoleculeModelProtocol {
     //--------------------------------------------------
     
     public override func setDefaults() {
-        if topPadding == nil {
-            topPadding = Padding.Component.VerticalMarginSpacing
-        }
-        if bottomPadding == nil {
-            bottomPadding = Padding.Component.VerticalMarginSpacing
-        }
-        if titleLockup.title.fontStyle == nil {
+       if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
+        if titleLockup.title.accessibilityTraits == nil {
+            titleLockup.title.accessibilityTraits = [.header]
+        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2NoButtonsBodyTextModel.swift

@@ -36,18 +36,15 @@ public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol
     }
 
     public override func setDefaults() {
-        if topPadding == nil {
-            topPadding = Padding.Component.VerticalMarginSpacing
-        }
-        if bottomPadding == nil {
-            bottomPadding = Padding.Component.VerticalMarginSpacing
-        }
         if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
+        if titleLockup.title.accessibilityTraits == nil {
+            titleLockup.title.accessibilityTraits = [.header]
+        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift

@@ -57,12 +57,6 @@ public class HeadersH2PricingTwoRowsModel: HeaderModel, MoleculeModelProtocol, P
     // MARK: - Methods
     //--------------------------------------------------
     public override func setDefaults() {
-        if topPadding == nil {
-            topPadding = Padding.Component.VerticalMarginSpacing
-        }
-        if bottomPadding == nil {
-            bottomPadding = Padding.Component.VerticalMarginSpacing
-        }
         if headline.accessibilityTraits == nil {
             headline.accessibilityTraits = .header
         }

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift

@@ -47,18 +47,15 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
     //--------------------------------------------------
     
     public override func setDefaults() {
-        if topPadding == nil {
-            topPadding = Padding.Component.VerticalMarginSpacing
-        }
-        if bottomPadding == nil {
-            bottomPadding = Padding.Component.VerticalMarginSpacing
-        }
         if titleLockup.title.fontStyle == nil {
             titleLockup.title.fontStyle = Styler.Font.RegularTitleXLarge
         }
         if titleLockup.subTitle?.fontStyle == nil {
             titleLockup.subTitle?.fontStyle = Styler.Font.RegularTitleMedium
         }
+        if titleLockup.title.accessibilityTraits == nil {
+            titleLockup.title.accessibilityTraits = [.header]
+        }
         super.setDefaults()
         button.style = .secondary
         button.size = .small

MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockUpsPlanNamesModel.swift

@@ -14,7 +14,8 @@ public class LockUpsPlanNamesModel: MoleculeModelProtocol {
     //--------------------------------------------------
     public static var identifier: String = "planNamesLockup"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var headline: LabelModel
     public var subHeadline: LabelModel
@@ -35,6 +36,7 @@ public class LockUpsPlanNamesModel: MoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case backgroundColor
         case headline
         case subHeadline
@@ -47,6 +49,7 @@ public class LockUpsPlanNamesModel: MoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         headline = try typeContainer.decode(LabelModel.self, forKey: .headline)
         subHeadline = try typeContainer.decode(LabelModel.self, forKey: .subHeadline)
@@ -57,6 +60,7 @@ public class LockUpsPlanNamesModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(headline, forKey: .headline)
         try container.encode(subHeadline, forKey: .subHeadline)

MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/LockupsPlanSMLXLModel.swift

@@ -15,7 +15,8 @@ public class LockupsPlanSMLXLModel: MoleculeModelProtocol {
     
     public static var identifier: String = "planLockup"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var planLabel : LabelModel
     public var headline : LabelModel
@@ -47,6 +48,7 @@ public class LockupsPlanSMLXLModel: MoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case backgroundColor
         case planLabel
         case headline
@@ -61,6 +63,7 @@ public class LockupsPlanSMLXLModel: MoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         planLabel = try typeContainer.decode(LabelModel.self, forKey: .planLabel)
         headline = try typeContainer.decode(LabelModel.self, forKey: .headline)
@@ -73,6 +76,7 @@ public class LockupsPlanSMLXLModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(planLabel, forKey: .planLabel)
         try container.encode(headline, forKey: .headline)

MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockup.swift

@@ -20,6 +20,9 @@ import VDS
     // MARK: - Public Functions
     //--------------------------------------------------
     open func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         surface = viewModel.surface
         textAlignment = viewModel.textAlignment
         eyebrowModel = viewModel.eyebrowModel(delegateObject: delegateObject, additionalData: additionalData)

MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift

@@ -18,7 +18,8 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
     public static var identifier: String = "titleLockup"
     public var moleculeName: String = TitleLockupModel.identifier
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var textAlignment: TitleLockup.TextAlignment = .left
     public var eyebrow: LabelModel?
     public var eyebrowColor: TitleLockup.TextColor = .primary
@@ -26,8 +27,6 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
     public var titleColor: TitleLockup.TitleTextColor = .primary
     public var subTitle: LabelModel?
     public var subTitleColor: TitleLockup.TextColor = .primary
-    
-    public var alignment: VDS.TitleLockup.TextAlignment = .left
     public var inverted: Bool = false
     
     public var backgroundColor: Color?
@@ -49,7 +48,6 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
     public func isEqual(to model: any ModelComparisonProtocol) -> Bool {
         guard let model = model as? Self else { return false }
         return textAlignment == model.textAlignment
-        && alignment == model.alignment
         && titleColor == model.titleColor
         && subTitleColor == model.subTitleColor
         && inverted == model.inverted
@@ -75,6 +73,7 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case textAlignment
         case eyebrow
         case eyebrowColor
@@ -83,7 +82,6 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
         case subTitle
         case subTitleColor
         case inverted
-        case alignment
     }
     
     //--------------------------------------------------
@@ -93,6 +91,7 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         textAlignment = try typeContainer.decodeIfPresent(TitleLockup.TextAlignment.self, forKey: .textAlignment) ?? .left
         title = try typeContainer.decodeMolecule(codingKey: .title)
         eyebrow = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .eyebrow)
@@ -128,10 +127,6 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
             subTitleColor = .primary
         }
         
-        if let newAlignment = try typeContainer.decodeIfPresent(VDS.TitleLockup.TextAlignment.self, forKey: .alignment) {
-            alignment = newAlignment
-        }
-        
         if let inverted = try typeContainer.decodeIfPresent(Bool.self, forKey: .inverted) {
             self.inverted = inverted
         } else {
@@ -144,6 +139,7 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(textAlignment, forKey: .textAlignment)
         try container.encodeIfPresent(eyebrow, forKey: .eyebrow)
         try container.encode(eyebrowColor, forKey: .eyebrowColor)
@@ -151,7 +147,6 @@ public class TitleLockupModel: ParentMoleculeModelProtocol {
         try container.encode(titleColor, forKey: .titleColor)
         try container.encodeIfPresent(subTitle, forKey: .subTitle)
         try container.encode(subTitleColor, forKey: .subTitleColor)
-        try container.encode(alignment, forKey: .alignment)
         try container.encode(inverted, forKey: .inverted)
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShort.swift

@@ -15,7 +15,7 @@ import Foundation
     //-----------------------------------------------------
     
     public var stack: Stack<StackModel>
-    public let headline = Label(fontStyle: .BoldTitleMedium)
+    public let headline = Label(fontStyle: .BoldTitleLarge)
     public let body = Label(fontStyle: .RegularBodySmall)
     
     //--------------------------------------------------
@@ -24,7 +24,7 @@ import Foundation
     
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
-                                                     (view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))],
+                                                     (view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))],
                                               axis: .vertical)
         super.init(style: style, reuseIdentifier: reuseIdentifier)
     }
@@ -63,7 +63,7 @@ import Foundation
     
     open override func reset() {
         super.reset()
-        headline.setFontStyle(.BoldTitleMedium)
+        headline.setFontStyle(.BoldTitleLarge)
         body.setFontStyle(.RegularBodySmall)
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerShortModel.swift

@@ -47,6 +47,9 @@ public class ListOneColumnTextWithWhitespaceDividerShortModel: ListItemModel, Mo
     
     override public func setDefaults() {
         style = .shortDivider
+        if headline.accessibilityTraits == nil {
+            headline.accessibilityTraits = [.header]
+        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift

@@ -15,7 +15,7 @@ import Foundation
     //-----------------------------------------------------
     
     public var stack: Stack<StackModel>
-    public let headline = Label(fontStyle: .BoldTitleMedium)
+    public let headline = Label(fontStyle: .BoldTitleLarge)
     public let body = Label(fontStyle: .RegularBodySmall)
     
     //--------------------------------------------------
@@ -24,7 +24,7 @@ import Foundation
     
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         stack = Stack<StackModel>.createStack(with: [(view: headline, model: StackItemModel(horizontalAlignment: .leading)),
-                                                     (view: body, model: StackItemModel(spacing: 0, horizontalAlignment: .leading))],
+                                                     (view: body, model: StackItemModel(spacing: 8, horizontalAlignment: .leading))],
                                               axis: .vertical)
         super.init(style: style, reuseIdentifier: reuseIdentifier)
     }
@@ -62,7 +62,7 @@ import Foundation
     
     open override func reset() {
         super.reset()
-        headline.setFontStyle(.BoldTitleMedium)
+        headline.setFontStyle(.BoldTitleLarge)
         body.setFontStyle(.RegularBodySmall)
         accessibilityLabel = nil
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift

@@ -47,6 +47,9 @@ public class ListOneColumnTextWithWhitespaceDividerTallModel: ListItemModel, Mol
     
     override public func setDefaults() {
         style = .tallDivider
+        if headline.accessibilityTraits == nil {
+            headline.accessibilityTraits = [.header]
+        }
         super.setDefaults()
     }
     

MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartItemModel.swift

@@ -17,7 +17,8 @@ import Foundation
     public static var identifier: String = "doughnutChartItem"
     public var moleculeName: String = DoughnutChartItemModel.identifier
     @DecodableDefault.UUIDString public var id: String
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var label: LabelModel
     @Percent public var percent: CGFloat
@@ -28,6 +29,8 @@ import Foundation
     //--------------------------------------------------
     
     private enum CodingKeys: String, CodingKey {
+        case id
+        case accessibilityIdentifier
         case backgroundColor
         case label
         case percent

MVMCoreUI/Atomic/Molecules/Doughnut/DoughnutChartModel.swift

@@ -17,7 +17,8 @@ import Foundation
     public static var identifier: String = "doughnutChart"
     public var moleculeName: String = DoughnutChartModel.identifier
     @DecodableDefault.UUIDString public var id: String
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var title: LabelModel?
     public var subtitle: LabelModel?

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift

@@ -16,7 +16,8 @@ public class ImageHeadlineBodyModel: MoleculeModelProtocol {
     public static var identifier: String = "imageHeadlineBody"
     public var moleculeName: String = ImageHeadlineBodyModel.identifier
     @DecodableDefault.UUIDString public var id: String
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var image: ImageViewModel
     public var headlineBody: HeadlineBodyModel

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabel.swift

@@ -80,6 +80,10 @@ import VDS
     // MARK: - Atomic
     //--------------------------------------------------
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
+        
         surface = viewModel.surface
         
         updateRadioButton()

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/RadioButtonLabelModel.swift

@@ -10,14 +10,15 @@ import Foundation
 import MVMCore
 import VDS
 
-@objcMembers public class RadioButtonLabelModel: MoleculeModelProtocol, ParentMoleculeModelProtocol {
+public class RadioButtonLabelModel: MoleculeModelProtocol, ParentMoleculeModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
 
     public static var identifier: String = "radioButtonLabel"
     @DecodableDefault.UUIDString public var id: String
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var moleculeName: String = RadioButtonLabelModel.identifier
     public var radioButton: RadioButtonModel

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift

@@ -38,6 +38,10 @@ import VDSCoreTokens
         guard let model = model as? TabBarModel else { return }
         self.model = model
         
+        if let accessibilityIdentifier = model.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
+        
         // Set appearance
         let appearance = UITabBarAppearance()
         appearance.backgroundColor = model.backgroundColor?.uiColor
@@ -51,6 +55,9 @@ import VDSCoreTokens
         for (index, tab) in model.tabs.enumerated() {
             let tabBarItem = UITabBarItem(title: tab.title, image: MVMCoreCache.shared()?.getImageFromRegisteredBundles(tab.image), tag: index)
             tabBarItem.accessibilityLabel = tab.accessibilityText
+            if let accessibilityIdentifier = tab.accessibilityIdentifier {
+                tabBarItem.accessibilityIdentifier = accessibilityIdentifier
+            }
             tabs.append(tabBarItem)
         }
         setItems(tabs, animated: false)

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift

@@ -12,7 +12,8 @@ import VDSCoreTokens
 open class TabBarModel: MoleculeModelProtocol {
     public static var identifier: String = "tabBar"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     open var tabs: [TabBarItemModel]
     
     private var _backgroundColor: Color?
@@ -62,6 +63,7 @@ open class TabBarModel: MoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case backgroundColor
         case tabs
         case selectedColor
@@ -77,6 +79,7 @@ open class TabBarModel: MoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         tabs = try typeContainer.decode([TabBarItemModel].self, forKey: .tabs)
         if let color = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) {
             backgroundColor = color
@@ -99,6 +102,7 @@ open class TabBarModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(tabs, forKey: .tabs)
         try container.encodeIfPresent(_backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(_selectedColor, forKey: .selectedColor)
@@ -134,12 +138,14 @@ open class TabBarItemModel: Codable, Equatable, MoleculeModelComparisonProtocol
     open var image: String
     open var action: ActionModelProtocol
     open var accessibilityText: String?
+    open var accessibilityIdentifier: String?
 
     private enum CodingKeys: String, CodingKey {
         case title
         case image
         case action
         case accessibilityText
+        case accessibilityIdentifier
     }
     
     public init(with title: String?, image: String, action: ActionModelProtocol) {
@@ -154,6 +160,7 @@ open class TabBarItemModel: Codable, Equatable, MoleculeModelComparisonProtocol
         image = try typeContainer.decode(String.self, forKey: .image)
         action = try typeContainer.decodeModel(codingKey: .action)
         accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
     }
               
     open func encode(to encoder: Encoder) throws {
@@ -162,6 +169,7 @@ open class TabBarItemModel: Codable, Equatable, MoleculeModelComparisonProtocol
         try container.encode(image, forKey: .image)
         try container.encodeModel(action, forKey: .action)
         try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
     }
     
     public static func == (lhs: TabBarItemModel, rhs: TabBarItemModel) -> Bool {

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift

@@ -63,6 +63,9 @@ import VDS
     //-------------------------------------------------
     
     open func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
         borderLine = viewModel.borderLine
         if let minWidth = viewModel.minWidth {
             self.minWidth = minWidth

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift

@@ -13,7 +13,8 @@ open class TabsModel: MoleculeModelProtocol {
     
     public static var identifier: String = "tabs"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     open var tabs: [TabItemModel]
     
     open var style: Surface?
@@ -33,6 +34,7 @@ open class TabsModel: MoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case tabs
         case backgroundColor
         case selectedIndex
@@ -53,6 +55,7 @@ open class TabsModel: MoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         tabs = try typeContainer.decode([TabItemModel].self, forKey: .tabs)
         style = try typeContainer.decodeIfPresent(Surface.self, forKey: .style)
         
@@ -94,6 +97,7 @@ open class TabsModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encode(tabs, forKey: .tabs)
         try container.encode(selectedIndex, forKey: .selectedIndex)
         try container.encode(fillContainer, forKey: .fillContainer)

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift

@@ -64,6 +64,10 @@ import VDS
     // MARK: - VDSMoleculeViewProtocol
     //--------------------------------------------------
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
+        
         var buttons = [PillButton]()
         if let secondaryModel = viewModel.secondaryButton {
             secondaryButton.set(with: secondaryModel, delegateObject, additionalData)

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonViewModel.swift

@@ -16,6 +16,7 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
     
     public static var identifier: String = "twoButtonView"
     public var id: String = UUID().uuidString
+    public var accessibilityIdentifier: String?
     public var backgroundColor: Color?
     public var primaryButton: ButtonModel?
     public var secondaryButton: ButtonModel?
@@ -39,6 +40,7 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case backgroundColor
         case primaryButton
         case secondaryButton
@@ -62,7 +64,8 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
+
         //set context value for 'primary' style to be set for the primaryButton in case the
         //property is not returned in the JSON and once decoded, this value is removed from the context
         try decoder.setContext(value: Use.primary, for: "style") {
@@ -81,6 +84,7 @@ public class TwoButtonViewModel: ParentMoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(primaryButton, forKey: .primaryButton)
         try container.encodeIfPresent(secondaryButton, forKey: .secondaryButton)

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoLinkView.swift

@@ -105,6 +105,10 @@ import VDS
     // MARK: - VDSMoleculeViewProtocol
     //--------------------------------------------------
     public func viewModelDidUpdate() {
+        if let accessibilityIdentifier = viewModel.accessibilityIdentifier {
+            self.accessibilityIdentifier = accessibilityIdentifier
+        }
+        
         buttons.removeAll()
         
         if let model = viewModel.leftLink {

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoLinkViewModel.swift

@@ -11,7 +11,8 @@ import Foundation
 public class TwoLinkViewModel: ParentMoleculeModelProtocol {
     public static var identifier: String = "twoLinkView"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var rightLink: LinkModel?
     public var leftLink: LinkModel?
@@ -21,6 +22,7 @@ public class TwoLinkViewModel: ParentMoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case backgroundColor
         case rightLink
         case leftLink
@@ -34,6 +36,7 @@ public class TwoLinkViewModel: ParentMoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         rightLink = try typeContainer.decodeIfPresent(LinkModel.self, forKey: .rightLink)
         leftLink = try typeContainer.decodeIfPresent(LinkModel.self, forKey: .leftLink)
@@ -43,6 +46,7 @@ public class TwoLinkViewModel: ParentMoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(rightLink, forKey: .rightLink)
         try container.encodeIfPresent(leftLink, forKey: .leftLink)

MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift

@@ -72,9 +72,9 @@ import MVMCore
         case .standard:
             set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: Padding.Component.VerticalMarginSpacing)
         case .shortDivider:
-            set(topPadding: Padding.Component.LargeVerticalMarginSpacing, bottomPadding: Padding.Four)
+            set(topPadding: Padding.Component.LargeVerticalMarginSpacing, bottomPadding: Padding.Five)
         case .tallDivider:
-            set(topPadding: Padding.Twelve, bottomPadding: Padding.Four)
+            set(topPadding: Padding.Twelve, bottomPadding: Padding.Five)
         case .sectionFooter:
             set(topPadding: Padding.Component.VerticalMarginSpacing, bottomPadding: 0)
         case ListItemStyle.none:

MVMCoreUI/Atomic/Molecules/LeftRightViews/ActionDetailWithImageModel.swift

@@ -12,7 +12,8 @@ public class ActionDetailWithImageModel: MoleculeModelProtocol {
     public static var identifier: String = "actionDetailWithImage"
     public var moleculeName: String = ActionDetailWithImageModel.identifier
     @DecodableDefault.UUIDString public var id: String
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var headlineBodyButton: HeadlineBodyButtonModel
     public var image: ImageViewModel

MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabelsModel.swift

@@ -12,6 +12,7 @@ import MVMCore
 public class CornerLabelsModel: ParentMoleculeModelProtocol {
     public static var identifier: String = "cornerLabels"
     public var id: String = UUID().uuidString
+    public var accessibilityIdentifier: String?
     public var backgroundColor: Color?
     public var topLeftLabel: LabelModel?
     public var topRightLabel: LabelModel?
@@ -41,6 +42,7 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol {
     
     private enum CodingKeys: String, CodingKey {
         case id
+        case accessibilityIdentifier
         case backgroundColor
         case topLeftLabel
         case topRightLabel
@@ -53,6 +55,7 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         molecule = try typeContainer.decodeModelIfPresent(codingKey: .molecule)
         topLeftLabel = try typeContainer.decodeMoleculeIfPresent(codingKey: .topLeftLabel)
@@ -64,6 +67,7 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeModelIfPresent(molecule, forKey: .molecule)
         try container.encodeModelIfPresent(topLeftLabel, forKey: .topLeftLabel)

MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift

@@ -11,6 +11,7 @@ public class HeadlineBodyLinkToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyLinkToggle"
     public var moleculeName: String = HeadlineBodyLinkToggleModel.identifier
     @DecodableDefault.UUIDString public var id: String
+    public var accessibilityIdentifier: String?
     public var backgroundColor: Color?
     public var headlineBodyLink: HeadlineBodyLinkModel
     public var toggle: ToggleModel

MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift

@@ -13,6 +13,7 @@ open class HeadlineBodyToggleModel: MoleculeModelProtocol, ParentMoleculeModelPr
     public static var identifier: String = "headlineBodyToggle"
     public var moleculeName: String = HeadlineBodyToggleModel.identifier
     @DecodableDefault.UUIDString public var id: String
+    public var accessibilityIdentifier: String?
     open var backgroundColor: Color?
     open var headlineBody: HeadlineBodyModel
     open var toggle: ToggleModel

MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift

@@ -13,7 +13,8 @@ public class LabelToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "labelToggle"
     public var moleculeName: String = LabelToggleModel.identifier
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var label: LabelModel
     public var toggle: ToggleModel
@@ -26,6 +27,7 @@ public class LabelToggleModel: MoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case backgroundColor
         case label
         case toggle
@@ -34,6 +36,7 @@ public class LabelToggleModel: MoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey:.backgroundColor)
         label = try typeContainer.decode(LabelModel.self, forKey:.label)
         toggle = try typeContainer.decode(ToggleModel.self, forKey:.toggle)
@@ -43,6 +46,7 @@ public class LabelToggleModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(id, forKey: .id)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(label, forKey: .label)
         try container.encode(toggle, forKey: .toggle)

MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift

@@ -20,7 +20,8 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
     
     open class var identifier: String { "navigationBar" }
     public var id: String = UUID().uuidString
-        
+    public var accessibilityIdentifier: String?
+
     open var title: String?
     open var hidden: Bool?
     open var hidesSystemBackButton: Bool?
@@ -85,6 +86,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case title
         case hidden
         case backgroundColor
@@ -107,6 +109,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         title = try typeContainer.decodeIfPresent(String.self, forKey: .title)
         hidden = try typeContainer.decodeIfPresent(Bool.self, forKey: .hidden)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
@@ -126,6 +129,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encode(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(title, forKey: .title)
         try container.encodeIfPresent(hidden, forKey: .hidden)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)

MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMolecule.swift

@@ -16,6 +16,8 @@ open class BGImageMolecule: MoleculeContainer {
         super.setupView()
         insertSubview(image, at: 0)
         NSLayoutConstraint.constraintPinSubview(toSuperview: image)
+        image.setContentCompressionResistancePriority(.defaultLow, for: .vertical)
+        image.imageView.setContentCompressionResistancePriority(.defaultLow, for: .vertical)
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {

MVMCoreUI/Atomic/Molecules/TopNotification/CollapsableNotification.swift

@@ -37,7 +37,8 @@ import VDSCoreTokens
         verticalStack.alignment = .fill
         verticalStack.distribution = .fill
         addSubview(verticalStack)
-        NSLayoutConstraint.constraintPinSubview(verticalStack, pinTop: true, topConstant: 0, pinBottom: true, bottomConstant: 0, pinLeft: true, leftConstant: 0, pinRight: true, rightConstant: 0)
+        verticalStack.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor).isActive = true
+        NSLayoutConstraint.constraintPinSubview(verticalStack, pinTop: false, topConstant: 0, pinBottom: true, bottomConstant: 0, pinLeft: true, leftConstant: 0, pinRight: true, rightConstant: 0)
         
         reset()
         subscribeForNotifications()
@@ -223,6 +224,10 @@ extension CollapsableNotification: StatusBarUI {
         topView.label.textColor.getWhite(&greyScale, alpha: nil)
         return (color, greyScale > 0.5 ? .lightContent : .default)
     }
+    
+    public func shouldUseSafeAreaLayoutGuide() -> Bool {
+        return false
+    }
 }
 
 extension CollapsableNotification: AccessibilityProtocol {

MVMCoreUI/Atomic/Molecules/TopNotification/NotificationXButtonModel.swift

@@ -13,13 +13,15 @@ public class NotificationXButtonModel: ButtonModelProtocol, MoleculeModelProtoco
     
     public static var identifier: String = "notificationXButton"
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     public var action: ActionModelProtocol = ActionNoopModel()
     
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case action
     }
     
@@ -30,6 +32,7 @@ public class NotificationXButtonModel: ButtonModelProtocol, MoleculeModelProtoco
     public required init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         if let action: ActionModelProtocol = try typeContainer.decodeModelIfPresent(codingKey: .action) {
             self.action = action
         }
@@ -39,6 +42,7 @@ public class NotificationXButtonModel: ButtonModelProtocol, MoleculeModelProtoco
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encode(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeModel(action, forKey: .action)
     }
 }

MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift

@@ -14,6 +14,7 @@ public class EyebrowHeadlineBodyLinkModel: ParentMoleculeModelProtocol {
     
     public static var identifier: String = "eyebrowHeadlineBodyLink"
     public var id: String = UUID().uuidString
+    public var accessibilityIdentifier: String?
     public var moleculeName: String = EyebrowHeadlineBodyLinkModel.identifier
     public var backgroundColor: Color?
     public var eyebrow: LabelModel?
@@ -70,6 +71,7 @@ public class EyebrowHeadlineBodyLinkModel: ParentMoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case backgroundColor
         case eyebrow
         case headline
@@ -84,6 +86,7 @@ public class EyebrowHeadlineBodyLinkModel: ParentMoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         eyebrow = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .eyebrow)
         headline = try typeContainer.decodeMoleculeIfPresent(codingKey: .headline)
@@ -100,6 +103,7 @@ public class EyebrowHeadlineBodyLinkModel: ParentMoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(eyebrow, forKey: .eyebrow)
         try container.encodeModelIfPresent(headline, forKey: .headline)

MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift

@@ -15,7 +15,8 @@ public class HeadlineBodyButtonModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyButton"
     public var moleculeName: String = HeadlineBodyButtonModel.identifier
     public var id: String = UUID().uuidString
-    
+    public var accessibilityIdentifier: String?
+
     public var backgroundColor: Color?
     
     public var headlineBody: HeadlineBodyModel
@@ -49,6 +50,7 @@ public class HeadlineBodyButtonModel: MoleculeModelProtocol {
     private enum CodingKeys: String, CodingKey {
         case id
         case moleculeName
+        case accessibilityIdentifier
         case backgroundColor
         case headlineBody
         case button
@@ -62,6 +64,7 @@ public class HeadlineBodyButtonModel: MoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        accessibilityIdentifier = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityIdentifier)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
         button = try typeContainer.decode(ButtonModel.self, forKey: .button)
@@ -73,6 +76,7 @@ public class HeadlineBodyButtonModel: MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
         try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(accessibilityIdentifier, forKey: .accessibilityIdentifier)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encode(headlineBody, forKey: .headlineBody)
         try container.encode(button, forKey: .button)

MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift

@@ -17,7 +17,8 @@ public class HeadlineBodyLinkModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyLink"
     public var moleculeName: String = HeadlineBodyLinkModel.identifier
     @DecodableDefault.UUIDString public var id: String
-    
+    public var accessibilityIdentifier: String?
+
     public var headlineBody: HeadlineBodyModel
     public var link: LinkModel
     public var backgroundColor: Color?