Resolved merge conflicts

Author: asharma12-sonata

src/App.jsx

@@ -23,12 +23,6 @@ export const App = () => {
   const hasNetworkFailure = !masqueradeUser && isError;
   const supportEmail = data?.platformSettings?.supportEmail || undefined;
 
-  /* istanbul ignore next */
-  const { masqueradeUser } = useMasquerade();
-  const { data, isError } = useInitializeLearnerHome();
-  const hasNetworkFailure = !masqueradeUser && isError;
-  const supportEmail = data?.platformSettings?.supportEmail || undefined;
-
   /* istanbul ignore next */
   React.useEffect(() => {
     if (getConfig().HOTJAR_APP_ID) {

src/App.test.jsx

@@ -17,7 +17,6 @@ jest.mock('data/context', () => ({
 
 jest.mock('containers/Dashboard', () => jest.fn(() => <div>Dashboard</div>));
 jest.mock('containers/LearnerDashboardHeader', () => jest.fn(() => <div>LearnerDashboardHeader</div>));
-jest.mock('containers/AppWrapper', () => jest.fn(({ children }) => <div className="AppWrapper">{children}</div>));
 
 jest.mock('@edx/frontend-platform', () => ({
   getConfig: jest.fn(() => ({})),

src/containers/AppWrapper/index.test.tsx

@@ -4,14 +4,14 @@ import { IntlProvider } from '@edx/frontend-platform/i18n';
 import { logError } from '@edx/frontend-platform/logging';
 
 import ProgramsList from '.';
-import { getProgramsListData } from '../data/api';
+import { useProgramsListData } from '../data/api';
 import ProgramListCard from './ProgramListCard';
 import ExploreProgramsCTA from './ExploreProgramsCTA';
 import messages from './messages';
 
 // Mock API and external utilities
 jest.mock('../data/api', () => ({
-  getProgramsListData: jest.fn(),
+  useProgramsListData: jest.fn(),
 }));
 jest.mock('@edx/frontend-platform/logging', () => ({
   logError: jest.fn(),
@@ -40,7 +40,7 @@ describe('ProgramsList', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     // Set up a successful mock API response by default
-    (getProgramsListData as jest.Mock).mockResolvedValue(mockApiData);
+    (useProgramsListData as jest.Mock).mockResolvedValue(mockApiData);
   });
 
   const renderComponent = () => render(
@@ -60,7 +60,7 @@ describe('ProgramsList', () => {
   it('fetches program data on mount', async () => {
     renderComponent();
 
-    expect(getProgramsListData).toHaveBeenCalledTimes(1);
+    expect(useProgramsListData).toHaveBeenCalledTimes(1);
   });
 
   it('renders ProgramListCard components upon successful API response', async () => {
@@ -90,7 +90,7 @@ describe('ProgramsList', () => {
   });
 
   it('renders the ExploreProgramsCTA with "hasEnrollments" set to false if there are no program enrollments', async () => {
-    (getProgramsListData as jest.Mock).mockResolvedValueOnce({ data: [] });
+    (useProgramsListData as jest.Mock).mockResolvedValueOnce({ data: [] });
     renderComponent();
 
     await waitFor(() => {
@@ -107,7 +107,7 @@ describe('ProgramsList', () => {
 
   it('calls logError if the API request fails', async () => {
     const mockError = new Error('Network failed');
-    (getProgramsListData as jest.Mock).mockRejectedValue(mockError);
+    (useProgramsListData as jest.Mock).mockRejectedValue(mockError);
 
     const mockContactUrl = 'mock-contact-url';
 

src/containers/ProgramDashboard/ProgramsList/index.test.tsx

@@ -1,7 +1,7 @@
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import { getConfig } from '@edx/frontend-platform';
 
-export async function getProgramsListData() {
+export async function useProgramsListData() {
   const url = `${getConfig().LMS_BASE_URL}/api/dashboard/v0/programs/`;
   const response = await getAuthenticatedHttpClient().get(url);
   return response;

src/containers/ProgramDashboard/api.ts

@@ -1,5 +1,5 @@
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { getProgramsListData } from './api';
+import { useProgramsListData } from './api';
 
 const mockGet = jest.fn(() => ({
   data: {},
@@ -19,7 +19,7 @@ jest.mock('@edx/frontend-platform', () => ({
 
 describe('API', () => {
   it('uses the expected URL to call the endpoint', async () => {
-    await getProgramsListData();
+    await useProgramsListData();
 
     expect(getAuthenticatedHttpClient).toHaveBeenCalled();
     expect(mockGet).toHaveBeenCalledWith(`${mockLMSBaseUrl}/api/dashboard/v0/programs/`);

src/containers/ProgramDashboard/data/api.test.ts

@@ -26,8 +26,6 @@ import { FooterSlot } from '@edx/frontend-component-footer';
 import LearnerDashboardHeader from 'containers/LearnerDashboardHeader';
 import { ProgramsList } from './containers/ProgramDashboard';
 
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import ContextProviders from 'data/context';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import ContextProviders from 'data/context';
 import { configuration } from './config';
@@ -55,9 +53,9 @@ subscribe(APP_READY, () => {
             <LearnerDashboardHeader />
             <Routes>
               <Route path="/" element={<PageWrap><App /></PageWrap>} />
-              {getConfig().ENABLE_PROGRAM_DASHBOARD && (
+              {/* {getConfig().ENABLE_PROGRAM_DASHBOARD && ( */}
                 <Route path="programs" element={<PageWrap><ProgramsList /></PageWrap>} />
-              )}
+              {/* )} */}
               <Route path="*" element={<Navigate to="/" replace />} />
             </Routes>
           </QueryClientProvider>