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] 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