From 9446899ca7fe352de2c95d083609b710fdf8fac6 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 9 Apr 2024 17:07:14 -0400
Subject: [PATCH 01/11] Digital ACT191 story - Monarch Testing

---
 .../Molecules/HorizontalCombinationViews/TabBarModel.swift    | 4 ++--
 .../Atomic/Molecules/NavigationBar/NavigationItemModel.swift  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
index b984a9da..6e8cb4a7 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
@@ -34,7 +34,7 @@ open class TabBarModel: MoleculeModelProtocol {
             if let selectedColor = _selectedColor { return selectedColor }
             if let style = style,
                 style == .dark { return Color(uiColor: VDSColor.elementsPrimaryOndark) }
-            return Color(uiColor: VDSColor.elementsPrimaryOnlight)
+            return Color(uiColor: UIColor.mfGet(forHex: "#FF1129"))
         }
         set {
             _selectedColor = newValue
@@ -54,7 +54,7 @@ open class TabBarModel: MoleculeModelProtocol {
         }
     }
     
-    open var style: NavigationItemStyle? = .dark
+    open var style: NavigationItemStyle? = .light
     
     // Must be capped to 0...(tabs.count - 1)
     open var selectedTab: Int = 0
diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
index d39cdeaf..406fe56f 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
@@ -106,7 +106,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         _tintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .tintColor)
         if let line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) {
-            self.line = line
+            //self.line = line
         }
         if let hidesSystemBackButton = try typeContainer.decodeIfPresent(Bool.self, forKey: .hidesSystemBackButton) {
             self.hidesSystemBackButton = hidesSystemBackButton
@@ -116,7 +116,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
         additionalLeftButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalLeftButtons)
         additionalRightButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalRightButtons)
         titleView = try typeContainer.decodeModelIfPresent(codingKey: .titleView)
-        style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style)
+        //style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style)
         if let titleOffset = try typeContainer.decodeIfPresent(UIOffset.self, forKey: .titleOffset) {
             self.titleOffset = titleOffset
         }

From b8526ac8e1ae452a309daed3ab36167bbe224d41 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 23 Apr 2024 17:00:22 -0400
Subject: [PATCH 02/11] Monarch colors

---
 .../TabBarModel.swift                         |  2 +-
 .../NavigationBar/NavigationItemModel.swift   |  4 ++--
 MVMCoreUI/Categories/UIColor+Extension.swift  | 17 ++++++++++++++--
 .../monarchRed.colorset/Contents.json         | 20 +++++++++++++++++++
 .../monarchStone.colorset/Contents.json       | 20 +++++++++++++++++++
 5 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json
 create mode 100644 MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json

diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
index 13c43afc..c74c3946 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
@@ -34,7 +34,7 @@ open class TabBarModel: MoleculeModelProtocol {
             if let selectedColor = _selectedColor { return selectedColor }
             if let style = style,
                 style == .dark { return Color(uiColor: VDSColor.elementsPrimaryOndark) }
-            return Color(uiColor: UIColor.mfGet(forHex: "#FF1129"))
+            return Color(uiColor: UIColor.monarchRed)
         }
         set {
             _selectedColor = newValue
diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
index 2846d164..67fc779f 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
@@ -106,7 +106,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         _tintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .tintColor)
         if let line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) {
-            //self.line = line
+            self.line = line
         }
         if let hidesSystemBackButton = try typeContainer.decodeIfPresent(Bool.self, forKey: .hidesSystemBackButton) {
             self.hidesSystemBackButton = hidesSystemBackButton
@@ -116,7 +116,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
         additionalLeftButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalLeftButtons)
         additionalRightButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalRightButtons)
         titleView = try typeContainer.decodeModelIfPresent(codingKey: .titleView)
-        //style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style)
+        style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style)
         if let titleOffset = try typeContainer.decodeIfPresent(UIOffset.self, forKey: .titleOffset) {
             self.titleOffset = titleOffset
         }
diff --git a/MVMCoreUI/Categories/UIColor+Extension.swift b/MVMCoreUI/Categories/UIColor+Extension.swift
index f4ef0f7f..854726bb 100644
--- a/MVMCoreUI/Categories/UIColor+Extension.swift
+++ b/MVMCoreUI/Categories/UIColor+Extension.swift
@@ -54,7 +54,10 @@ extension UIColor {
                                                         "coolGray10": (.mvmCoolGray10, "#333333"),
                                                         "upGold1": (.vzupGold1, "#F9D542"),
                                                         "upGold2": (.vzupGold2, "#F4CA53"),
-                                                        "upGold3": (.vzupGold3, "#CC9B2D")]
+                                                        "upGold3": (.vzupGold3, "#CC9B2D"),
+                                                        "monarchRed": (.monarchRed, "#f50a23"),
+                                                        "monarchStone": (.monarchStone, "#f3ede0"),
+    ]
     
     //--------------------------------------------------
     // MARK: - Helper
@@ -84,7 +87,7 @@ extension UIColor {
     
     /// HEX: #D52B1E
     public static let mvmRed = UIColor.assetColor(named: "red")
-    
+
     //--------------------------------------------------
     // MARK: - Pink
     //--------------------------------------------------
@@ -222,6 +225,16 @@ extension UIColor {
     /// HEX: #CC9B2D
     public static let vzupGold3 = UIColor.assetColor(named: "upGold3")
     
+    //--------------------------------------------------
+    // MARK: - Monarch
+    //--------------------------------------------------
+    
+    /// HEX: #f50a23
+    @objc public static let monarchRed = UIColor.assetColor(named: "monarchRed")
+
+    /// HEX: #f3ede0
+    @objc public static let monarchStone = UIColor.assetColor(named: "monarchStone")
+    
     //--------------------------------------------------
     // MARK: - Functions
     //--------------------------------------------------
diff --git a/MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json
new file mode 100644
index 00000000..5f3b4048
--- /dev/null
+++ b/MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x23",
+          "green" : "0x0A",
+          "red" : "0xF5"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json
new file mode 100644
index 00000000..ead33d73
--- /dev/null
+++ b/MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xE0",
+          "green" : "0xED",
+          "red" : "0xF3"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

From 01371a320a1c626f6f5419e812abf5d379fbd520 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Wed, 24 Apr 2024 11:37:31 -0400
Subject: [PATCH 03/11] Digital ACT191 story ONV9720_MVAPP - Updated colors and
 icons for Monarch MVP

---
 .../TabBarModel.swift                         |  2 +-
 MVMCoreUI/Categories/UIColor+Extension.swift  | 38 ++++++++++++++-----
 MVMCoreUI/Categories/UIColor+MFConvenience.m  | 12 ++----
 .../Contents.json                             |  6 +--
 .../gray44.colorset/Contents.json             | 20 ++++++++++
 .../red.colorset/Contents.json                | 22 +++++------
 .../Contents.json                             |  0
 .../yellow.colorset/Contents.json             | 22 +++++------
 8 files changed, 77 insertions(+), 45 deletions(-)
 rename MVMCoreUI/Categories/colors.xcassets/{monarchRed.colorset => coral.colorset}/Contents.json (75%)
 create mode 100644 MVMCoreUI/Categories/colors.xcassets/gray44.colorset/Contents.json
 rename MVMCoreUI/Categories/colors.xcassets/{monarchStone.colorset => stone.colorset}/Contents.json (100%)

diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
index c74c3946..bbe11c36 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
@@ -34,7 +34,7 @@ open class TabBarModel: MoleculeModelProtocol {
             if let selectedColor = _selectedColor { return selectedColor }
             if let style = style,
                 style == .dark { return Color(uiColor: VDSColor.elementsPrimaryOndark) }
-            return Color(uiColor: UIColor.monarchRed)
+            return Color(uiColor: UIColor.mvmRed)
         }
         set {
             _selectedColor = newValue
diff --git a/MVMCoreUI/Categories/UIColor+Extension.swift b/MVMCoreUI/Categories/UIColor+Extension.swift
index 854726bb..6f994254 100644
--- a/MVMCoreUI/Categories/UIColor+Extension.swift
+++ b/MVMCoreUI/Categories/UIColor+Extension.swift
@@ -19,7 +19,7 @@ extension UIColor {
     /// Dictionary to access brand approved colors by name.
     public static let names: [String: ColorHexTuple] = ["black": (.mvmBlack, "#000000"),
                                                         "white": (.mvmWhite, "#FFFFFF"),
-                                                        "red": (.mvmRed, "#D52B1E"),
+                                                        "red": (.mvmRed, "#F50A23"),
                                                         "pink": (.mvmPink, "#D90368"),
                                                         "pink33": (.mvmPink33, "#F2ABCD"),
                                                         "pink66": (.mvmPink66, "#E6589B"),
@@ -47,7 +47,7 @@ extension UIColor {
                                                         "blueShade1": (.mvmBlueShade1, "#136598"),
                                                         "blueShade2": (.mvmBlueShade2, "#0B4467"),
                                                         "blueInverted": (.mvmBlueInverted, "#0088CE"),
-                                                        "yellow": (.mvmYellow, "#FFBC3D"),
+                                                        "yellow": (.mvmYellow, "#F5FF1E"),
                                                         "coolGray1": (.mvmCoolGray1, "#F6F6F6"),
                                                         "coolGray3": (.mvmCoolGray3, "#D8DADA"),
                                                         "coolGray6": (.mvmCoolGray6, "#747676"),
@@ -55,8 +55,11 @@ extension UIColor {
                                                         "upGold1": (.vzupGold1, "#F9D542"),
                                                         "upGold2": (.vzupGold2, "#F4CA53"),
                                                         "upGold3": (.vzupGold3, "#CC9B2D"),
-                                                        "monarchRed": (.monarchRed, "#f50a23"),
-                                                        "monarchStone": (.monarchStone, "#f3ede0"),
+                                                        "stone": (.stone, "#F3EDE0"),
+                                                        "coral": (.coral, "#FF3C2D"),
+                                                        "gray44": (.gray44, "#6F7171"),
+                                                        "gray85": (.gray85, "#D8DADA"),
+                                                        "gray95": (.gray95, "#F6F6F6")
     ]
     
     //--------------------------------------------------
@@ -85,7 +88,8 @@ extension UIColor {
     // MARK: - Red
     //--------------------------------------------------
     
-    /// HEX: #D52B1E
+    /// HEX: ##F50A23
+    @objc
     public static let mvmRed = UIColor.assetColor(named: "red")
 
     //--------------------------------------------------
@@ -193,7 +197,7 @@ extension UIColor {
     // MARK: - Yellow
     //--------------------------------------------------
     
-    /// HEX: #FFBC3D
+    /// HEX: ##F5FF1E
     public static let mvmYellow = UIColor.assetColor(named: "yellow")
     
     //--------------------------------------------------
@@ -229,11 +233,20 @@ extension UIColor {
     // MARK: - Monarch
     //--------------------------------------------------
     
-    /// HEX: #f50a23
-    @objc public static let monarchRed = UIColor.assetColor(named: "monarchRed")
+    /// HEX: #F3EDE0
+    @objc public static let stone = UIColor.assetColor(named: "stone")
+    
+    // HEX:#FF3C2D
+    @objc public static let coral = UIColor.assetColor(named: "coral")
 
-    /// HEX: #f3ede0
-    @objc public static let monarchStone = UIColor.assetColor(named: "monarchStone")
+    // HEX:#6F7171
+    @objc public static let gray44 = UIColor.assetColor(named: "gray44")
+
+    // HEX:#D8DADA
+    @objc public static let gray85 = mvmCoolGray3
+    
+    // HEX:#F6F6F6
+    @objc public static let gray95 = mvmCoolGray1
     
     //--------------------------------------------------
     // MARK: - Functions
@@ -243,6 +256,11 @@ extension UIColor {
         return UIColor(named: name, in: MVMCoreUIUtility.bundleForMVMCoreUI(), compatibleWith: nil)!
     }
     
+    @objc
+    public static func mvmCoreUIColor(with name: String) -> UIColor? {
+        return UIColor.names[name]?.uiColor
+    }
+    
     /// Convenience to get a grayscale UIColor where the same value is used for red, green, and blue.
     public class func grayscale(rgb: Int, alpha: CGFloat = 1.0) -> UIColor {
         
diff --git a/MVMCoreUI/Categories/UIColor+MFConvenience.m b/MVMCoreUI/Categories/UIColor+MFConvenience.m
index cd809509..77700413 100644
--- a/MVMCoreUI/Categories/UIColor+MFConvenience.m
+++ b/MVMCoreUI/Categories/UIColor+MFConvenience.m
@@ -7,6 +7,7 @@
 //
 
 #import "UIColor+MFConvenience.h"
+#import <MVMCoreUI/MVMCoreUI-Swift.h>
 @import MVMCore.MVMCoreDispatchUtility;
 
 @implementation UIColor (MFConvenience)
@@ -302,8 +303,6 @@
     static dispatch_once_t once;
     dispatch_once(&once, ^{
         stringColorMapping = @{@"PrimaryRed":[UIColor mfRedColor],
-                               @"black":[UIColor blackColor],
-                               @"red":[UIColor mfRedColor],
                                @"greyish":[UIColor mfLightGrayColor],
                                @"robinsEggBlue" : [UIColor mfRobinsEggBlue],
                                @"lightSalmon" : [UIColor mfLightSalmon],
@@ -327,14 +326,9 @@
     
     UIColor *color = nil;
     if (string && string.length > 0) {
-        color = [stringColorMapping objectForKey:string];
-        if (!color){
-            color = [UIColor blackColor];
-        }
-    } else {
-        color = [UIColor blackColor];
+        color = [stringColorMapping objectForKey:string] ?: [UIColor mvmCoreUIColorWith:string];
     }
-    return color;
+    return color ?: [UIColor blackColor];
 }
 
 + (nonnull UIColor *)mfGetColorForHex:(nonnull NSString *) hexString {
diff --git a/MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/coral.colorset/Contents.json
similarity index 75%
rename from MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json
rename to MVMCoreUI/Categories/colors.xcassets/coral.colorset/Contents.json
index 5f3b4048..a834049e 100644
--- a/MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json
+++ b/MVMCoreUI/Categories/colors.xcassets/coral.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x23",
-          "green" : "0x0A",
-          "red" : "0xF5"
+          "blue" : "0x2D",
+          "green" : "0x3C",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"
diff --git a/MVMCoreUI/Categories/colors.xcassets/gray44.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/gray44.colorset/Contents.json
new file mode 100644
index 00000000..296ef27c
--- /dev/null
+++ b/MVMCoreUI/Categories/colors.xcassets/gray44.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x71",
+          "green" : "0x71",
+          "red" : "0x6F"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/MVMCoreUI/Categories/colors.xcassets/red.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/red.colorset/Contents.json
index 536ccc9b..5f3b4048 100644
--- a/MVMCoreUI/Categories/colors.xcassets/red.colorset/Contents.json
+++ b/MVMCoreUI/Categories/colors.xcassets/red.colorset/Contents.json
@@ -1,20 +1,20 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
   "colors" : [
     {
-      "idiom" : "universal",
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0xD5",
           "alpha" : "1.000",
-          "blue" : "0x1E",
-          "green" : "0x2B"
+          "blue" : "0x23",
+          "green" : "0x0A",
+          "red" : "0xF5"
         }
-      }
+      },
+      "idiom" : "universal"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/stone.colorset/Contents.json
similarity index 100%
rename from MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json
rename to MVMCoreUI/Categories/colors.xcassets/stone.colorset/Contents.json
diff --git a/MVMCoreUI/Categories/colors.xcassets/yellow.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/yellow.colorset/Contents.json
index 5c00b5eb..5d0cb64a 100644
--- a/MVMCoreUI/Categories/colors.xcassets/yellow.colorset/Contents.json
+++ b/MVMCoreUI/Categories/colors.xcassets/yellow.colorset/Contents.json
@@ -1,20 +1,20 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
   "colors" : [
     {
-      "idiom" : "universal",
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0xFF",
           "alpha" : "1.000",
-          "blue" : "0x3D",
-          "green" : "0xBC"
+          "blue" : "0x1E",
+          "green" : "0xFF",
+          "red" : "0xF5"
         }
-      }
+      },
+      "idiom" : "universal"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

From 7eb0d642371bf237751323d041e51e6a438b7476 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Mon, 29 Apr 2024 19:26:49 -0400
Subject: [PATCH 04/11] Digital ACT191 story ONEAPP-7592 - Monarch testing

---
 MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift       | 6 ++++--
 MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift         | 6 +++++-
 .../Headers/H1/HeadersH1NoButtonsBodyTextModel.swift        | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift
index 895bb027..649e5316 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/TileContainerModel.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import VDS
+import MVMCore
 
 open class TileContainerModel: TileContainerBaseModel<TileContainer.Padding, TileContainer>, ParentMoleculeModelProtocol, MoleculeModelProtocol {
     
@@ -33,10 +34,11 @@ open class TileContainerModel: TileContainerBaseModel<TileContainer.Padding, Til
         case moleculeName
         case molecule
     }
+    
     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
-        molecule = try container.decodeModelIfPresent(codingKey: .molecule)
+        molecule = try container.decodeMoleculeIfPresent(codingKey: .molecule)
         try super.init(from: decoder)
     }
     
@@ -83,6 +85,7 @@ open class TileContainerBaseModel<PaddingType: DefaultValuing & Codable, TileCon
         case aspectRatio
         case backgroundEffect
     }
+    
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         inverted = try container.decodeIfPresent(Bool.self, forKey: .inverted) ?? false
@@ -97,7 +100,6 @@ open class TileContainerBaseModel<PaddingType: DefaultValuing & Codable, TileCon
         color = try container.decodeIfPresent(TileContainerType.BackgroundColor.self, forKey: .color) ?? .black
         aspectRatio = try container.decodeIfPresent(TileContainerType.AspectRatio.self, forKey: .aspectRatio) ?? .ratio1x1
         backgroundEffect = try container.decodeIfPresent(TileContainerType.BackgroundEffect.self, forKey: .backgroundEffect) ?? .none
-        
     }
     
     public func encode(to encoder: Encoder) throws {
diff --git a/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift b/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
index f514248e..e8b5d90f 100644
--- a/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
+++ b/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
@@ -95,7 +95,11 @@ extension VDS.TileContainerBase.BackgroundColor: Codable {
         case "black":
             self = .black
         default:
-            self = .custom(type)
+            if let color = try? Color(from: decoder) {
+                self = .custom(color.hex)
+            } else {
+                self = .custom(type)
+            }
         }
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift
index 7450c9aa..97d635a1 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H1/HeadersH1NoButtonsBodyTextModel.swift
@@ -91,7 +91,7 @@ public struct DeprecatedHeadlineBodyHelper {
     
     public func createTitleLockupModel(defaultStyle: HeadlineBodyModel.Style = .header, headlineBody: HeadlineBodyModel) throws -> TitleLockupModel {
         guard let headline = headlineBody.headline else { throw ModelRegistry.Error.decoderOther(message: "headline is required for this use case.") }
-        var body = headlineBody.body
+        let body = headlineBody.body
         switch headlineBody.style ?? defaultStyle {
         case .landingHeader:
             headline.fontStyle = Styler.Font.RegularTitle2XLarge
@@ -103,13 +103,13 @@ public struct DeprecatedHeadlineBodyHelper {
             headline.fontStyle = Styler.Font.RegularTitleXLarge
             body?.fontStyle = Styler.Font.RegularTitleMedium
         }
-        let model = try TitleLockupModel(title: headline, subTitle: body)
+        let model = TitleLockupModel(title: headline, subTitle: body)
         model.id = headlineBody.id
         return model
     }
     
     public func createHeadlineBodyModel(titleLockup: TitleLockupModel) -> HeadlineBodyModel {
-        var headlineBody = HeadlineBodyModel(headline: titleLockup.title)
+        let headlineBody = HeadlineBodyModel(headline: titleLockup.title)
         headlineBody.body = titleLockup.subTitle
         headlineBody.id = titleLockup.id
         return headlineBody

From b0c2a301eb17176184e6a70886200baa0b885468 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 30 Apr 2024 12:32:15 -0400
Subject: [PATCH 05/11]  Digital ACT191 story ONEAPP-7592 - Color Updates to
 allow strings or hash

---
 MVMCoreUI/Categories/UIColor+MFConvenience.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MVMCoreUI/Categories/UIColor+MFConvenience.m b/MVMCoreUI/Categories/UIColor+MFConvenience.m
index 77700413..259ba747 100644
--- a/MVMCoreUI/Categories/UIColor+MFConvenience.m
+++ b/MVMCoreUI/Categories/UIColor+MFConvenience.m
@@ -299,6 +299,10 @@
 }
 
 + (nullable UIColor *)mfGetColorForString:(nullable NSString *)string {
+    if ([string hasPrefix:@"#"]) {
+        return [self mfGetColorForHex:string];
+    }
+    
     static NSDictionary *stringColorMapping;
     static dispatch_once_t once;
     dispatch_once(&once, ^{

From c5fa1a251543944461c9895a243de3a446d44d43 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 30 Apr 2024 13:11:39 -0400
Subject: [PATCH 06/11] Digital ACT191 story ONEAPP-7592 - icon updates

---
 .../externalLink.imageset/Contents.json       |  24 ++++++------------
 .../externalLink.imageset/Vector.svg          |   3 +++
 .../externalLink.imageset/exportBlack.png     | Bin 345 -> 0 bytes
 .../externalLink.imageset/exportBlack@2x.png  | Bin 589 -> 0 bytes
 .../externalLink.imageset/exportBlack@3x.png  | Bin 869 -> 0 bytes
 .../nav_back.imageset/Contents.json           |  18 ++++---------
 .../nav_back.imageset/Vector.svg              |   3 +++
 .../nav_back.imageset/nav_back.png            | Bin 220 -> 0 bytes
 .../nav_back.imageset/nav_back@2x.png         | Bin 302 -> 0 bytes
 .../nav_back.imageset/nav_back@3x.png         | Bin 394 -> 0 bytes
 .../nav_close.imageset/Close-1.png            | Bin 435 -> 0 bytes
 .../nav_close.imageset/Close-2.png            | Bin 631 -> 0 bytes
 .../nav_close.imageset/Close.png              | Bin 257 -> 0 bytes
 .../nav_close.imageset/Contents.json          |  18 ++++---------
 .../nav_close.imageset/Vector.svg             |   3 +++
 15 files changed, 27 insertions(+), 42 deletions(-)
 create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Vector.svg
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@2x.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@3x.png
 create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Vector.svg
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-1.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-2.png
 delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close.png
 create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Vector.svg

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Contents.json
index 07a5a9f8..702db438 100644
--- a/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Contents.json
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Contents.json
@@ -1,23 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "exportBlack.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "exportBlack@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "exportBlack@3x.png",
-      "scale" : "3x"
+      "filename" : "Vector.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Vector.svg b/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Vector.svg
new file mode 100644
index 00000000..bcdaef29
--- /dev/null
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/Vector.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 -3.05176e-05V7.11108H18.7555V2.1333L11.9555 8.9333L11.0666 8.04441L17.8666 1.25553H12.8889V-3.05176e-05H20ZM15 18.7555H1.25553V4.99997H12.2222L13.3333 3.75552H-2.28882e-05V20H16.2555V6.66664L15 7.77775V18.7555Z" fill="black"/>
+</svg>
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack.png b/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack.png
deleted file mode 100644
index 34f6d7e9c930cfd3b15aa1fd6be1e88c0e281a28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s7A<4eM00001b5ch_0Itp)
z=>Px$6G=otR5%gMk}*yLK@3GFhz__y1QnspDN^PFTp_38DAdpqr9z^BGE$T}%YPov
z?wSm%DJZb?$6kMr*JC@SK{`x3FfKSG_gUq$XVa`u7`PWXB0WgIU=Oj*{8U|^!x^py
z=}Hm3_fl4<h#XV07C9%NRt_Y16|RJ85PrlGoE4P0w)4@mkf~Nq$Z{lz*R6#2K&AAl
z?=Rt6uuP#R9!!QCxA}E!oD;#{^t!(bVwiWMI>sjc-PqA;Ge-tqu#tTdY?n&sTlBLo
z?S-ZACVU9Df(Z#~J$E`NHjG)I%RH#=e7oiRO`e=!;#=Y1-&Dnx*c!A}<ag}_wm!wt
rG}{t9rT<?dniSqTRepuDCgcAGHZ3+UNfc!Z00000NkvXXu0mjft{;(H

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@2x.png
deleted file mode 100644
index c6de73e8b1df072656e4646843cb57200b08da7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s7mItT~00001b5ch_0Itp)
z=>Px%2T4RhR9Fe^mpM|zFc3v&fC~_D2#6sfnRKe)8eD`ka1TNPa&kBX5EDVw(66np
zl5LH=%o@0>+Pz7wuhwFFKC9CT^UN6K9>Zu}iOMP6<w?y7M%LMExMGmI#QT-#uC7{n
zT8?Iyoc)Q@r<I8kT*|+$5pj?88b20GX%iVoC}kpn7X#(d_$|qR3g~C!3uDiimeG7p
zKJB2tAajjEyb>i$vEiN@m5LcLHI&<i{c1Lw&1*%y`tmiMj3}kb>GkH(Sx$NeN)yQE
z`(H+vWD1wYtT+S!m1gd9b9eV+QEJj_ZA%FhJHA8|%a=|N2TB!tV7J+fqsPE49-8sW
zlAI^QvmKridz4BNkUa$1h8Y4a_~!pHhLi-!*^4_{uMZlPh`Wr=@5W5?!#EydM(#@~
z67_LJ7=05plW3YC^NX}^BHED*;<l*u8**riTjlu9+JwlLy!bf28fin;c4=`A2MVse
zQ4J5^b9^AE)%oY`52)V++};6k5eWzqTUVnmd9G~R@cr39OJh+Eh+<hlLq4>WsE;fG
zQU3^NYv)y&6Dc6P{vcj7eCY8S)F-H^ZPM~=t3m=oUhNT$dSePpNi0jcKeEA*&Ts2S
z6&69JX{gX?>S*e_0K{(@U`Ej{_s|4rR0X;^O-nXasH*~9@$??z7Tq;<j<M;#@Fo+;
b{>uCV77L$$&l_-Z00000NkvXXu0mjf1aSuz

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/externalLink.imageset/exportBlack@3x.png
deleted file mode 100644
index 15f13e3249cc453310cf2b87eed836add51186f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq001@s001@!1^@s7`$Aev00001b5ch_0Itp)
z=>Px&A4x<(RA>e5SUYkQF%Y%E0faV*Q;vW+fD>~9LZ5+z09W}41SC{(4k8je;Q+u%
zFjWMOTm}8c^R&HEOEc1FXLq*LRdQ=v-TnF_&5U(;VADTaypo<^YH1x)$6D;xo>0T$
z<%@@gI~Rks2z{sE8*_o&Uw^bLk2Yx;i#7;C3A#X!M1aYaTCk=cdp&d!V4ZO^)!qZv
z*<Gg##33@%NfsdGvDlEIy4X`Fxof9l0LOY{`9LeOBBQ}28<=YPXYu|_#+?l4U&<JS
zL$h^AgGSmw8?Jc)a*Ui&QInfdU)PQ9^jPmGw@w23>JREy=R6nyd<S6c3m?7oH>2fN
z|1E+SGH|GHxDHr*%*_WM7Df_4I;X;s)gRxkXvcd_m<fOYf}sD(K!pNg*@A@;f-}*9
zJpeUDeMT3wb>`gkS)+`j<7i-`OO;ZbwT${ue@I1DV{PhFgE3&M57Mk<9E@h7!cVd1
z0UwopDIS5yHwH!ka1gU|6ADWBmq(x7UmwVUaqE8*$#-RtGkp-{Prbnp;jd);l7Tlu
zK**%V83Pb}f&0`|tJc;B05U-dU;9Y>T?5Pl(mf<r$ETFhD&2eW3ZDT@&FrOk^h?K0
z7l1_<0!>?RVvB9*)XZ$J5orU96edsH%9vNLh;}Puq%e8n{VgLO#OHYhNoq%Z;fvUO
z_axnoTdei9Jq|5XYwTSLiZeKNDO21<zRfHK-rcykhV5Pu65@9^yLT@#&cPQ&RzgS+
za$Fv-C8mGu!u;AOHLj}s4lyCB?`&dUCBmnSvgb&MU-vA!pAb!wiPiWIjX+bll@Jny
zJVtAY@kJI>o?DK<Z)Kb*V07q0MsWYDbb{%u-yQ+_O27`?iHJ#Y%i-T;os@M3SDw_2
zdl!7}t;mFQ4Az!=F0tVZQcs2Nrg)d(CC}lM=T7WKf?%NFRzf1~2nE-=y*SRcxfS0?
zSlDJbQ+N;gTTVpfwC#rn&Jhx<PTTBQ^<=cemYA-_66URAOX!l0v2{#WV+r%tu_bg#
v$JjcitFeUn-ga!0x3imU?BIRq-gfLiC<Ho!k65U<00000NkvXXu0mjfPmGWz

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json
index 56ae55a3..702db438 100644
--- a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json
@@ -1,23 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "nav_back.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "nav_back@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "nav_back@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "Vector.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Vector.svg b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Vector.svg
new file mode 100644
index 00000000..a0d9c7b8
--- /dev/null
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Vector.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 10.6361H2.46073L10.9975 19.1001L10.0897 20L0 10L10.0897 0L10.9974 0.899867L2.46077 9.36388H20V10.6361Z" fill="black"/>
+</svg>
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png
deleted file mode 100644
index 895fade7109e9e7ea5b937adaa25e3a8111788aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#LQfaRkP61PQ}1#%81S^5pKp7W_s)SmJHzfC
z@im!b!`T$NPUJ27^&pP&Eha2Kq$hW$?OVyhGHJ$lg@7~m32}4JxNcp=bkA7EyH?Q6
zIl=!*W5<*UInHi23w8zyC&X8L`^+T7wA=HFOSW>>(eEm}Gx@D;FDkRIS9!t+w4A}y
L)z4*}Q$iB}lgCHV

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png
deleted file mode 100644
index e699cb47470c1e6084ce5374ae7d6d3f49ed5612..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8
za(7}_cTVOdki(Mh=<CS9u(6-}Pa-Rjf7sK-F{Fa=?akY~O%4LB5AS<Bma(X2u==P+
zb*bKH5|z-taF^xrB!@4ln~k5;oNU?f@S%(X3sZ-OZ|p2%$EP3G7ap3barpU5PM3$#
zoU(Nfr2ja6_`uE-_#;eYpJ;2o>%-{4AGgf7Ut8`G{k`18yk^Hgs|7Zn<<gU^gA-n^
z+OcJR<mN(ak?eVS3-?Pl&UcV+^ZJpnqJ<xc^0_Zz&1AKyNyt{~q4W7uUNI|D+--ky
kznk~WbA!B`(!@QCIjO5x{@*rpInX-{p00i_>zopr0GEVw6#xJL

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png
deleted file mode 100644
index 96e839ed04085187d59f599dc2a822c227b6b3b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~!moV=%tV@L(#+dBt+4?BpsUSway;MKr)NpSz<
zKj)m-r#Nt4V6;%|X6e7*tfBo}?&ax8>E))=%ok5&U^q~kv+SntXN@y&9@qGMHa$DL
zqvV;ZeWKs<Pz#BpH{UPmb&zSdU@PQ#Byq&BBf00%o^A_v@4|U3k1RlZf#Wy2EV@Co
zLZ72dGeV)j@f|NM$`fnlm$SdO@87I;{@3!0=ORDz+|7=>6>I+R;F_-=cgn6=`%!pz
zM7Mp!6{R5jC`2g;1xdL-lK9Yh$wr9%WWA=KrWP7HtNgabI7a6KdyFq5!-1<c%r%|K
V-`tm^Q~`sI!PC{xWt~$(696B5lGgwL

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-1.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-1.png
deleted file mode 100644
index dd579598756b1895983ffe741e27bea3afd76bdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00009a7bBm000&x
z000&x0ZCFM@Bjb-Wl2OqRA_<int=(!AP_~rogkZZg^rYwI!Z@qH|Yiz!GMG|CiVW^
zMf@P8BLDtF(IAExBYM`QYq|m0fd=5&H2{-B2y+Nw;>X#ilqF@_H8`DvTMfWH4Fm85
zFxAGhTgs5Lq(Ap+{tDcjjiLw072MM17Qk<YCXoMTp&5IC+XZM1*;-qzkOkZ!Ky65=
zT4sf{YM2LLd%Foj^K`S6NUNd=P%0R8$+sG`24rtqB7pw}RoRiHjE)A@I#Wdf_Xbz}
zV30Pf0cd~n(Jp@T4Zs7ywdj83-*w+D#`vb>U;*McWGN~f*q2T@_^p_^Qgk?sTeU`2
zmT2mGuy5;VfE$}kxm@{>y&n_fpqGZzhBSfGgfxTGf;5HGfHa3=L%M*YdU^@M@^%Hs
zsNoJyx|T~g$(nBAq-wi{lgQv6t~E=|wC_g<vG->rtC=*1TS0El+|tH_*t2T@o?Qd*
d?CKj3zz38L+0W2kewF|L002ovPDHLkV1gc>zia>i

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-2.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-2.png
deleted file mode 100644
index 3cbe291bc07a9ab4e5c50ff9d7e41c3d2f3c4756..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 631
zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r7o!&H|6fVg?39a}Z`Uj+kG?z`&&G
z>EaktG3V`_hq=uL0;~^;)laCUw)C9gkX(3IMS6$RqM%lVqvtmNeOKY{^tW-+?%z{{
z9QZV!=WyxCZ#v?(-~oq-Ok<OBKmiL^pTj{x4GSh#_XQ6^8kbF3Hs#Wspk0Ri;geIB
zm2O-4ig#M}&q-&`OmjN_bZOeR)U@rFz9-zB7I|&vC#%OHZ$7i7^|kCecxLO0rLNC?
z4+^YcpRxb;9icCwiPKlSnAv77z`2>rgez;c<O``!JwL@(gkQO4d)fR2r!dni)~(_F
z@1)Y+pUr)|#&)NC!`kTv%^SW5<Slr(b#bki+y8PC*0;6_M;9(DZH#N)R3ll&m}_fr
zb*Afjr?qV9*5BW9b+IkjGvP(70PDf3mDVg@Vg+9PW?Rg4{m_Q{H>J3uxSl*Rd-#Iw
zoKxk_iN2q;CzM8>KYYfnysUnGegC(+#pli+)1Ak4^?cSp$GhC3%Qmjv7oGU7-frT0
zr}oUA(~|y+f|6!kYk%a-UiHah*PCjCb^c44bpHe`a#_k~TX<_rxzAJQtDUtQv{hrP
z_zrz(dc}2_d6l(KS;+JmXIA7HMh3<v8!g&(JjI!}@nnk>+hkT#5jEGh8O*)!6jh#`
zh&z<j_e#^`S;xIY$=}|66q;dMy_Y9#{XG5Fn~T4nPTV%{;iMV5={t4OR?qb6er@QS
z5Max}&AF>tis>`M*1wBynXM>RIm7!Zrg`SfX)W%Z*V-{+5*ocJXWp<2R_coSZ_4Ea
PrX&VWS3j3^P6<r_G8`M2

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close.png
deleted file mode 100644
index dac97806313a32257b84e9a751a3d51f2cdfece3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 257
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zoCO|{#S9GGLLkg|>2BR0px|at
z7sn8f&bwg;c^edX_E<40@Az-h_kbfO;4+JlqwvCBab-^V%=bP!rwNC$7VCy=^B3qk
zp{1nBl_SwsYPrFBjdTNR3WIb*iQVj*)1nP{vU4r04oR(uyQJRpvW4TO?!xIMCh9x}
zveJ4NQ%s${KhoM8&J$PY`s7{kr;G=@D_4iVJp6mM>e8;ZTVhv^E$=gX^<kNv{}=Wd
ziH3Unwn)rhv&zyapi6M`{Cl(C+djPg`nj9L0Y>@%)0aPBjmQH!pTX1B&t;ucLK6Us
Ca$k!8

diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json
index ffda34e6..702db438 100644
--- a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json
@@ -1,23 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "Close.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "Close-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Close-2.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "Vector.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }
diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Vector.svg b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Vector.svg
new file mode 100644
index 00000000..1aece044
--- /dev/null
+++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Vector.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.87772 9.00001L17.7777 16.8889L16.8888 17.7778L8.99995 9.87778L1.11106 17.7778L0.222168 16.8889L8.11106 9.00001L0.222168 1.11112L1.11106 0.222229L8.99995 8.11112L16.8888 0.222229L17.7777 1.11112L9.87772 9.00001Z" fill="black"/>
+</svg>

From 16cd1601ba2e80de2247625cb4671593bc72c79d Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Wed, 1 May 2024 14:47:37 -0400
Subject: [PATCH 07/11] Digital ACT191 story ONEAPP-7459 - Update back to Vivid
 Red

---
 MVMCoreUI/Categories/UIColor+Extension.swift                | 4 ++--
 MVMCoreUI/Categories/UIColor+MFConvenience.m                | 2 +-
 .../Categories/colors.xcassets/red.colorset/Contents.json   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MVMCoreUI/Categories/UIColor+Extension.swift b/MVMCoreUI/Categories/UIColor+Extension.swift
index 6f994254..3cf8609e 100644
--- a/MVMCoreUI/Categories/UIColor+Extension.swift
+++ b/MVMCoreUI/Categories/UIColor+Extension.swift
@@ -19,7 +19,7 @@ extension UIColor {
     /// Dictionary to access brand approved colors by name.
     public static let names: [String: ColorHexTuple] = ["black": (.mvmBlack, "#000000"),
                                                         "white": (.mvmWhite, "#FFFFFF"),
-                                                        "red": (.mvmRed, "#F50A23"),
+                                                        "red": (.mvmRed, "#EE0000"),
                                                         "pink": (.mvmPink, "#D90368"),
                                                         "pink33": (.mvmPink33, "#F2ABCD"),
                                                         "pink66": (.mvmPink66, "#E6589B"),
@@ -88,7 +88,7 @@ extension UIColor {
     // MARK: - Red
     //--------------------------------------------------
     
-    /// HEX: ##F50A23
+    /// HEX: #EE0000
     @objc
     public static let mvmRed = UIColor.assetColor(named: "red")
 
diff --git a/MVMCoreUI/Categories/UIColor+MFConvenience.m b/MVMCoreUI/Categories/UIColor+MFConvenience.m
index 259ba747..d10672a8 100644
--- a/MVMCoreUI/Categories/UIColor+MFConvenience.m
+++ b/MVMCoreUI/Categories/UIColor+MFConvenience.m
@@ -77,7 +77,7 @@
 #pragma mark - legacy
 
 + (nonnull UIColor *)mfRedColor {
-    return [UIColor colorWithRed:.804 green:.016 blue:.043 alpha:1.0];
+    return [UIColor mvmRed];
 }
 
 + (nonnull UIColor *)mfDarkerRedColor {
diff --git a/MVMCoreUI/Categories/colors.xcassets/red.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/red.colorset/Contents.json
index 5f3b4048..3a204689 100644
--- a/MVMCoreUI/Categories/colors.xcassets/red.colorset/Contents.json
+++ b/MVMCoreUI/Categories/colors.xcassets/red.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x23",
-          "green" : "0x0A",
-          "red" : "0xF5"
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0xEE"
         }
       },
       "idiom" : "universal"

From 272465008f4049e248d60fd02a97d35fa1907f35 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 7 May 2024 10:46:05 -0400
Subject: [PATCH 08/11] Digital ACT191 story ONEAPP-7847 - Updating the VDS
 tokens library

---
 MVMCoreUI.xcodeproj/project.pbxproj                         | 6 ++++--
 MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift            | 2 +-
 MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift              | 2 +-
 MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift             | 2 +-
 MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift          | 2 +-
 .../Atoms/Views/CarouselIndicator/CarouselIndicator.swift   | 2 +-
 .../Views/CarouselIndicator/CarouselIndicatorModel.swift    | 2 +-
 MVMCoreUI/Atomic/Atoms/Views/IconModel.swift                | 2 +-
 MVMCoreUI/Atomic/Atoms/Views/LineModel.swift                | 2 +-
 MVMCoreUI/Atomic/Atoms/Views/TooltipModel.swift             | 2 +-
 MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift         | 2 +-
 .../DesignedComponents/LockUps/TitleLockupModel.swift       | 2 +-
 .../Molecules/HorizontalCombinationViews/TabBar.swift       | 2 +-
 .../Molecules/HorizontalCombinationViews/TabBarModel.swift  | 2 +-
 .../Atomic/Molecules/HorizontalCombinationViews/Tabs.swift  | 2 +-
 .../Molecules/HorizontalCombinationViews/TabsModel.swift    | 2 +-
 .../Molecules/NavigationBar/NavigationItemModel.swift       | 2 +-
 .../Molecules/TopNotification/CollapsableNotification.swift | 2 +-
 MVMCoreUI/Managers/SubNav/SubNavManagerController.swift     | 2 +-
 19 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 62792baf..a15ea41d 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -289,6 +289,7 @@
 		AF1C336F2885A16A006B1001 /* ActionCollapseNotificationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1C336E2885A16A006B1001 /* ActionCollapseNotificationHandler.swift */; };
 		AF1C33712885AE76006B1001 /* MVMCoreUIActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1C33702885AE76006B1001 /* MVMCoreUIActionHandler.swift */; };
 		AF1C33732885D481006B1001 /* MVMCoreUIActionOpenPageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1C33722885D481006B1001 /* MVMCoreUIActionOpenPageHandler.swift */; };
+		AF1CEFE82BEA73890001F9A5 /* VDSCoreTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1CEFE72BEA73890001F9A5 /* VDSCoreTokens.xcframework */; };
 		AF60A7F62892D2E300919EEB /* ActionDismissNotificationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF60A7F52892D2E300919EEB /* ActionDismissNotificationModel.swift */; };
 		AF60A7F82892D34D00919EEB /* ActionDismissNotificationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF60A7F72892D34D00919EEB /* ActionDismissNotificationHandler.swift */; };
 		AF766D262A3CD4C600749099 /* UIAccessibilityTraits+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF766D252A3CD4C600749099 /* UIAccessibilityTraits+Codable.swift */; };
@@ -605,7 +606,6 @@
 		EABFC1412763BB8D00E78B40 /* FormLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EABFC1402763BB8D00E78B40 /* FormLabel.swift */; };
 		EABFC152276913E800E78B40 /* FormLabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EABFC151276913E800E78B40 /* FormLabelModel.swift */; };
 		EACCF38C2ABB346700E0F104 /* VDS-Interpreters.swift in Sources */ = {isa = PBXBuildFile; fileRef = EACCF38B2ABB346700E0F104 /* VDS-Interpreters.swift */; };
-		EAD715AA2BBC8FAF00DEDA6A /* VDSTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAD715A92BBC8FAF00DEDA6A /* VDSTokens.xcframework */; };
 		FD99130028E21E4900542CC3 /* RuleNotEqualsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD9912FF28E21E4900542CC3 /* RuleNotEqualsModel.swift */; };
 /* End PBXBuildFile section */
 
@@ -897,6 +897,7 @@
 		AF1C336E2885A16A006B1001 /* ActionCollapseNotificationHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionCollapseNotificationHandler.swift; sourceTree = "<group>"; };
 		AF1C33702885AE76006B1001 /* MVMCoreUIActionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIActionHandler.swift; sourceTree = "<group>"; };
 		AF1C33722885D481006B1001 /* MVMCoreUIActionOpenPageHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIActionOpenPageHandler.swift; sourceTree = "<group>"; };
+		AF1CEFE72BEA73890001F9A5 /* VDSCoreTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSCoreTokens.xcframework; path = ../SharedFrameworks/VDSCoreTokens.xcframework; sourceTree = "<group>"; };
 		AF60A7F52892D2E300919EEB /* ActionDismissNotificationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionDismissNotificationModel.swift; sourceTree = "<group>"; };
 		AF60A7F72892D34D00919EEB /* ActionDismissNotificationHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionDismissNotificationHandler.swift; sourceTree = "<group>"; };
 		AF766D252A3CD4C600749099 /* UIAccessibilityTraits+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAccessibilityTraits+Codable.swift"; sourceTree = "<group>"; };
@@ -1225,9 +1226,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AF1CEFE82BEA73890001F9A5 /* VDSCoreTokens.xcframework in Frameworks */,
 				D29DF0E621E4F3C7003B2FB9 /* MVMCore.framework in Frameworks */,
 				EA985C602970A3F000F2FF2E /* VDS.framework in Frameworks */,
-				EAD715AA2BBC8FAF00DEDA6A /* VDSTokens.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2088,6 +2089,7 @@
 		D29DF0E421E4F3C7003B2FB9 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				AF1CEFE72BEA73890001F9A5 /* VDSCoreTokens.xcframework */,
 				EAD715A92BBC8FAF00DEDA6A /* VDSTokens.xcframework */,
 				EA985C632970A40E00F2FF2E /* VDSTypographyTokens.xcframework */,
 				EA985C5F2970A3F000F2FF2E /* VDS.framework */,
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
index dec3480c..0bfeff61 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 import VDS
 import MVMCore
 
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift b/MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift
index f9261d97..dcffc9e8 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 import VDS
 
 open class Link: VDS.TextLink, VDSMoleculeViewProtocol {
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
index 7334ccf5..986d4e72 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 import VDS
 import MVMCore
 import Combine
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
index 2f9ae80a..e73a8d5c 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 
 @objcMembers open class RadioButton: Control, MFButtonProtocol {
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
index 56827bec..21cca600 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
@@ -5,7 +5,7 @@
 //  Created by Kevin Christiano on 1/30/20.
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
-import VDSTokens
+import VDSCoreTokens
 
 open class CarouselIndicator: Control, CarouselPageControlProtocol {
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift
index 11bcdd8d..28fa22b0 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import VDSTokens
+import VDSCoreTokens
 
 open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelProtocol, EnableableModelProtocol {
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Atoms/Views/IconModel.swift b/MVMCoreUI/Atomic/Atoms/Views/IconModel.swift
index 4fbbd712..ac8e6d9e 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/IconModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/IconModel.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import VDS
-import VDSTokens
+import VDSCoreTokens
 
 open class IconModel: MoleculeModelProtocol {
     
diff --git a/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift b/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift
index 2cfe9b99..1b2d7ec2 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 import VDS
 
 public class LineModel: MoleculeModelProtocol, Invertable {
diff --git a/MVMCoreUI/Atomic/Atoms/Views/TooltipModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TooltipModel.swift
index 27400a2c..2b12cead 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/TooltipModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/TooltipModel.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import VDS
-import VDSTokens
+import VDSCoreTokens
 import MVMCore
 
 open class TooltipModel: MoleculeModelProtocol {
diff --git a/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift b/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
index e8b5d90f..a419279b 100644
--- a/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
+++ b/MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import VDS
-import VDSTokens
+import VDSCoreTokens
 
 //--------------------------------------------------
 // MARK: - Codable Extensions
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift
index a280e0b4..07c680b0 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022 Verizon Wireless. All rights reserved.
 //
 
-import VDSTokens
+import VDSCoreTokens
 import VDS
 
 public class TitleLockupModel: MoleculeModelProtocol, ParentMoleculeModelProtocol {
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
index 370b47a6..742fa150 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
@@ -5,7 +5,7 @@
 //  Created by Scott Pfeil on 5/28/20.
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
-import VDSTokens
+import VDSCoreTokens
 
 @objcMembers open class TabBar: UITabBar, MoleculeViewProtocol, TabBarProtocol, UITabBarDelegate {
     
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
index bbe11c36..f6a48c6e 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import VDSTokens
+import VDSCoreTokens
 
 open class TabBarModel: MoleculeModelProtocol {
     public static var identifier: String = "tabBar"
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift
index 5a34245d..d85412aa 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 import VDS
 
 @objc public protocol TabsDelegate {
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift
index a7acadf6..81f384cd 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 import VDS
 open class TabsModel: MoleculeModelProtocol {
     
diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
index 67fc779f..c8aad07f 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
-import VDSTokens
+import VDSCoreTokens
 
 public enum NavigationItemStyle: String, Codable {
     case light
diff --git a/MVMCoreUI/Atomic/Molecules/TopNotification/CollapsableNotification.swift b/MVMCoreUI/Atomic/Molecules/TopNotification/CollapsableNotification.swift
index cef93935..5691390a 100644
--- a/MVMCoreUI/Atomic/Molecules/TopNotification/CollapsableNotification.swift
+++ b/MVMCoreUI/Atomic/Molecules/TopNotification/CollapsableNotification.swift
@@ -10,7 +10,7 @@ import Foundation
 import Combine
 import Dispatch
 import MVMCore
-import VDSTokens
+import VDSCoreTokens
 
 @objcMembers open class CollapsableNotification: View {
     //--------------------------------------------------
diff --git a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
index 2bde433a..ceca433b 100644
--- a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
+++ b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import MVMCore
-import VDSTokens
+import VDSCoreTokens
 
 open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol, TabsDelegate, MVMCorePresentationDelegateProtocol, SubNavSwipeNavigationProtocol {
     /// The number of tabs count or less that will turn on the fillContainer

From ef26c27452a8ea41fa60e758fdc56d9dfb045ce7 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 7 May 2024 12:04:13 -0400
Subject: [PATCH 09/11]  Digital ACT191 story ONEAPP-7847 - Updating to use the
 vds core tokens library for monarch colors

---
 MVMCoreUI/Categories/UIColor+Extension.swift  | 11 +++++-----
 .../coral.colorset/Contents.json              | 20 -------------------
 .../gray44.colorset/Contents.json             | 20 -------------------
 .../stone.colorset/Contents.json              | 20 -------------------
 4 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 MVMCoreUI/Categories/colors.xcassets/coral.colorset/Contents.json
 delete mode 100644 MVMCoreUI/Categories/colors.xcassets/gray44.colorset/Contents.json
 delete mode 100644 MVMCoreUI/Categories/colors.xcassets/stone.colorset/Contents.json

diff --git a/MVMCoreUI/Categories/UIColor+Extension.swift b/MVMCoreUI/Categories/UIColor+Extension.swift
index 6ddd1da1..966436cf 100644
--- a/MVMCoreUI/Categories/UIColor+Extension.swift
+++ b/MVMCoreUI/Categories/UIColor+Extension.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import VDSCoreTokens
 
 public typealias ColorHexTuple = (uiColor: UIColor, hex: String)
 
@@ -234,19 +235,19 @@ extension UIColor {
     //--------------------------------------------------
     
     /// HEX: #F3EDE0
-    @objc public static let stone = UIColor.assetColor(named: "stone")
+    @objc public static let stone = VDSCoreTokens.VDSColor.paletteStone
     
     // HEX:#FF3C2D
-    @objc public static let coral = UIColor.assetColor(named: "coral")
+    @objc public static let coral = VDSCoreTokens.VDSColor.paletteCoral
 
     // HEX:#6F7171
-    @objc public static let gray44 = UIColor.assetColor(named: "gray44")
+    @objc public static let gray44 = VDSCoreTokens.VDSColor.paletteGray44
 
     // HEX:#D8DADA
-    @objc public static let gray85 = mvmCoolGray3
+    @objc public static let gray85 = VDSCoreTokens.VDSColor.paletteGray85
     
     // HEX:#F6F6F6
-    @objc public static let gray95 = mvmCoolGray1
+    @objc public static let gray95 = VDSCoreTokens.VDSColor.paletteGray95
     
     //--------------------------------------------------
     // MARK: - Functions
diff --git a/MVMCoreUI/Categories/colors.xcassets/coral.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/coral.colorset/Contents.json
deleted file mode 100644
index a834049e..00000000
--- a/MVMCoreUI/Categories/colors.xcassets/coral.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x2D",
-          "green" : "0x3C",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/MVMCoreUI/Categories/colors.xcassets/gray44.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/gray44.colorset/Contents.json
deleted file mode 100644
index 296ef27c..00000000
--- a/MVMCoreUI/Categories/colors.xcassets/gray44.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x71",
-          "green" : "0x71",
-          "red" : "0x6F"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/MVMCoreUI/Categories/colors.xcassets/stone.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/stone.colorset/Contents.json
deleted file mode 100644
index ead33d73..00000000
--- a/MVMCoreUI/Categories/colors.xcassets/stone.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xE0",
-          "green" : "0xED",
-          "red" : "0xF3"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

From 7e4b2a781dd2624940cefe5c7dcbee40010f525d Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Wed, 8 May 2024 15:28:43 -0400
Subject: [PATCH 10/11] Digital ACT191 story ONEAPP-7847 - neonYellow and
 monarchRed

---
 MVMCoreUI/Categories/UIColor+Extension.swift                | 4 +++-
 .../colors.xcassets/yellow.colorset/Contents.json           | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/MVMCoreUI/Categories/UIColor+Extension.swift b/MVMCoreUI/Categories/UIColor+Extension.swift
index 966436cf..59be616b 100644
--- a/MVMCoreUI/Categories/UIColor+Extension.swift
+++ b/MVMCoreUI/Categories/UIColor+Extension.swift
@@ -21,6 +21,7 @@ extension UIColor {
     public static let names: [String: ColorHexTuple] = ["black": (.mvmBlack, "#000000"),
                                                         "white": (.mvmWhite, "#FFFFFF"),
                                                         "red": (.mvmRed, "#EE0000"),
+                                                        "monarchRed": (VDSCoreTokens.VDSColor.paletteMonarchred, "#f50a23"),
                                                         "pink": (.mvmPink, "#D90368"),
                                                         "pink33": (.mvmPink33, "#F2ABCD"),
                                                         "pink66": (.mvmPink66, "#E6589B"),
@@ -48,7 +49,8 @@ extension UIColor {
                                                         "blueShade1": (.mvmBlueShade1, "#136598"),
                                                         "blueShade2": (.mvmBlueShade2, "#0B4467"),
                                                         "blueInverted": (.mvmBlueInverted, "#0088CE"),
-                                                        "yellow": (.mvmYellow, "#F5FF1E"),
+                                                        "yellow": (.mvmYellow, "#FFBC3D"),
+                                                        "neonYellow": (VDSCoreTokens.VDSColor.paletteNeonyellow, "#f5ff1e"),
                                                         "coolGray1": (.mvmCoolGray1, "#F6F6F6"),
                                                         "coolGray3": (.mvmCoolGray3, "#D8DADA"),
                                                         "coolGray6": (.mvmCoolGray6, "#747676"),
diff --git a/MVMCoreUI/Categories/colors.xcassets/yellow.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/yellow.colorset/Contents.json
index 5d0cb64a..8467664a 100644
--- a/MVMCoreUI/Categories/colors.xcassets/yellow.colorset/Contents.json
+++ b/MVMCoreUI/Categories/colors.xcassets/yellow.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x1E",
-          "green" : "0xFF",
-          "red" : "0xF5"
+          "blue" : "0x3D",
+          "green" : "0xBC",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

From df02a46c62636c0ae4da70ea87755d4906757416 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Tue, 4 Jun 2024 10:48:47 -0400
Subject: [PATCH 11/11] Tableview and collection view optimizations

---
 MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift           | 1 +
 .../BaseControllers/ThreeLayerTableViewController.swift      | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
index 12399292..6ed0c584 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
@@ -177,6 +177,7 @@ open class Carousel: View {
             if let originalModel, carouselModel.isDeeplyVisuallyEquivalent(to: originalModel) {
                 // Prevents a carousel reset while still updating the cell backing data through reconfigureItems.
                 MVMCoreLoggingHandler.shared()?.handleDebugMessage("[\(Self.self)] Model is visually equivalent. Skipping rebuild...")
+                prepareMolecules(with: carouselModel)
                 FormValidator.setupValidation(for: carouselModel, delegate: delegateObject?.formHolderDelegate)
                 updateModelIndex() // Ensure the new model indexing matches the old.
                 pagingView?.currentIndex = pageIndex // Trigger a paging view render.
diff --git a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
index 9ae3b1c4..d7c60545 100644
--- a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
+++ b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
@@ -56,13 +56,14 @@ open class ThreeLayerTableViewController: ProgrammaticTableViewController, Rotor
     }
     
     open override func updateUI(for molecules: [MoleculeModelProtocol]? = nil) {
+        let isFirstRender = self.isFirstRender
         super.updateUI(for: molecules)
         
         guard molecules == nil else { return }
-        
+
         createViewForTableHeader()
         createViewForTableFooter()
-        tableView?.reloadData()
+        // Reloading the table is handled in updateViews.
     }
     
     override open func viewDidLoad() {