From bc72d81396cb2b3192e21f9674925bb597fb287e Mon Sep 17 00:00:00 2001
From: "Hedden, Kyle Matthew" <kyle.hedden@verizonwireless.com>
Date: Tue, 16 Jul 2024 15:16:56 -0400
Subject: [PATCH 1/2] Digital PCT265 story DE307-834: Prevent scroll reset on
 reconfigure.

---
 MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
index ad627d35..fb333772 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
@@ -210,6 +210,7 @@ open class Carousel: View {
         
         registerCells(with: carouselModel, delegateObject: delegateObject)
         prepareMolecules(with: carouselModel)
+        pageIndex = 0
         FormValidator.setupValidation(for: carouselModel, delegate: delegateObject?.formHolderDelegate)
         
         setupPagingMolecule(carouselModel.pagingMolecule, delegateObject: delegateObject)
@@ -250,8 +251,6 @@ open class Carousel: View {
         } else {
             loop = false
         }
-        
-        pageIndex = 0
     }
     
     open override func reset() {

From 16c20507ce19f11df7326c5761df432843c5c164 Mon Sep 17 00:00:00 2001
From: "Hedden, Kyle Matthew" <kyle.hedden@verizonwireless.com>
Date: Tue, 16 Jul 2024 19:58:26 -0400
Subject: [PATCH 2/2] Digital PCT265 story DE307-834: Crash prevention on
 registered cells check for gone change.

---
 MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
index fb333772..f84bdfc5 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
@@ -285,7 +285,7 @@ open class Carousel: View {
     /// Registers the cells with the collection view
     func registerCells(with carouselModel: CarouselModel, delegateObject: MVMCoreUIDelegateObject?) {
         var registeredIds = [String]()
-        for molecule in carouselModel.molecules {
+        for molecule in carouselModel.visibleMolecules {
             if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) {
                 collectionView.register(info.class, forCellWithReuseIdentifier: info.identifier)
                 registeredIds.append(info.identifier)
@@ -299,7 +299,7 @@ open class Carousel: View {
     func hasSameCellRegistration(with carouselModel: CarouselModel, delegateObject: MVMCoreUIDelegateObject?) -> Bool {
         guard let registeredMoleculeIds else { return false }
         
-        let incomingIds = carouselModel.molecules.map { molecule in
+        let incomingIds = carouselModel.visibleMolecules.map { molecule in
             if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) {
                 return info.identifier
             } else {