From 9f2a1cb6d1f8a68c401f662b4eb4a03b2725fe87 Mon Sep 17 00:00:00 2001
From: Sureshkumar Ramachandran <sureshkumar.ramachandran@verizon.com>
Date: Fri, 8 Dec 2023 14:42:50 +0530
Subject: [PATCH 1/2] Hamberg menu fix

---
 .../MVMCoreUISplitViewController+Extension.swift       |  2 +-
 .../SplitViewController/MVMCoreUISplitViewController.h |  2 +-
 .../SplitViewController/MVMCoreUISplitViewController.m | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
index 55e1071c..d407fdc3 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift
@@ -263,7 +263,7 @@ extension MVMCoreUISplitViewController: MVMCoreViewManagerProtocol {
     }
     
     public func willDisplay(_ viewController: UIViewController) {
-        setupPanels()
+        setupPanels(viewController)
         updateState(with: viewController)
     }
     
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
index a5c1577f..ac057f10 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
@@ -99,7 +99,7 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) {
 - (void)setNavigationIconColor:(nullable UIColor *)color;
 
 /// Updates the panels that are used.
-- (void)setupPanels;
+- (void)setupPanels:(nullable UIViewController*)viewController;
 
 /// Returns if the left panel is staying extended (usually do to screen size threshold)
 - (BOOL)leftPanelStaysExtended;
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index c43d17d9..462bb6af 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -723,9 +723,9 @@ CGFloat const PanelAnimationDuration = 0.2;
     [panel removeFromParentViewController];
 }
 
-- (void)setupLeftPanel {
+- (void)setupLeftPanel:(nullable UIViewController*)viewController {
     UIViewController <MVMCoreUIPanelProtocol> *panel = nil;
-    UIViewController *currentViewController = [self getCurrentDetailViewController];
+    UIViewController *currentViewController = viewController ? viewController : [self getCurrentDetailViewController];
     if ([currentViewController respondsToSelector:@selector(overrideLeftPanel)]) {
         panel = [((UIViewController <MVMCoreUIDetailViewProtocol> *)currentViewController) overrideLeftPanel];
     } else {
@@ -795,9 +795,9 @@ CGFloat const PanelAnimationDuration = 0.2;
     }
 }
 
-- (void)setupPanels {
+- (void)setupPanels:(nullable UIViewController*)viewController {
     [self forceHideBothDrawers];
-    [self setupLeftPanel];
+    [self setupLeftPanel:viewController];
     [self setupRightPanel];
     self.explictlyShowingPanel = nil;
     [self.view layoutIfNeeded];
@@ -968,7 +968,7 @@ CGFloat const PanelAnimationDuration = 0.2;
     [NSLayoutConstraint constraintWithItem:coverView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeTop multiplier:1.0 constant:0].active = YES;
     [NSLayoutConstraint constraintWithItem:self.view attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:coverView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0].active = YES;
     
-    [self setupPanels];
+    [self setupPanels:nil];
 }
 
 - (void)viewDidLoad {

From fed441360678cea38d9b6b8e008b59780d06472f Mon Sep 17 00:00:00 2001
From: Sureshkumar Ramachandran <sureshkumar.ramachandran@verizon.com>
Date: Fri, 8 Dec 2023 17:33:44 +0530
Subject: [PATCH 2/2] To avoid display on the hamberg menu at discover
 screen(Homescreen)

---
 .../SplitViewController/MVMCoreUISplitViewController.m           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index 462bb6af..79c81b8d 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -735,6 +735,7 @@ CGFloat const PanelAnimationDuration = 0.2;
     
     if (!panel) {
         [self removePanel:self.leftPanel];
+        self.leftPanel = nil;
     } else if (panel && panel != self.leftPanel) {
         [self removePanel:self.leftPanel];
         [self addPanel:panel];