'Switch application' navigation link should be removed from 'Give page feedback' screens for logged in user

Author: sherif-olaboye

DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs

@@ -37,7 +37,6 @@ IMultiPageFormService multiPageFormService
         public IActionResult Index(string sourceUrl, string sourcePageTitle)
         {
             ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;
-            ViewBag.HideSwitchApplication = true;
             _multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddUserFeedback, TempData);
 
             _userFeedbackViewModel = new()
@@ -129,7 +128,6 @@ private string DeriveUserRoles()
         public IActionResult StartUserFeedbackSession(UserFeedbackViewModel userFeedbackViewModel)
         {
             ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;
-            ViewBag.HideSwitchApplication = true;
 
             var userFeedbackSessionData = new UserFeedbackTempData()
             {

DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml

@@ -138,15 +138,16 @@
 
                                 @if (User.IsAdminAccount())
                                 {
-                                    if ((bool?)ViewBag.HideSwitchApplication == false)
+                                   if ((bool?)ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] != true)
                                     {
-                                        <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.SwitchApplication)">
+                                         <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.SwitchApplication)">
                                             <a class="nhsuk-header__navigation-link" asp-controller="ApplicationSelector" asp-action="Index">
                                                 Switch application
                                                 <partial name="_NhsChevronRight" />
                                             </a>
                                         </li>
                                     }
+                                    
                                 }
                             </ul>
                         </div>