Merge remote-tracking branch 'origin/main' into fix/MPT-17762/update-appstore-connect-links

# Conflicts:
#	app/app.config.js

Author: HalilSWO

app/app.config.js

@@ -40,7 +40,7 @@ export default {
     ios: {
       supportsTablet: true,
       bundleIdentifier: bundleId,
-      buildNumber: '5',
+      buildNumber: '6',
       infoPlist: {
         ITSAppUsesNonExemptEncryption: false,
       },

app/src/__tests__/__mocks__/services/invoice.ts

@@ -0,0 +1,26 @@
+export const mockInvoiceId1 = 'INV-123';
+
+export const mockInvoiceId2 = 'INV-234';
+
+export const mockInvoiceData = {
+  id: 'INV-123',
+  name: 'Test Invoice',
+  status: 'Issued',
+};
+
+export const expectedUrl1 =
+  `/v1/billing/invoices/${mockInvoiceId1}` +
+  `?select=seller.address.country,statement,statement.ledger.owner,audit`;
+export const expectedUrl2 =
+  `/v1/billing/invoices/${mockInvoiceId2}` +
+  `?select=seller.address.country,statement,statement.ledger.owner,audit`;
+
+export const mockResponse1 = {
+  id: 'INV-123',
+  name: 'Invoice One',
+};
+
+export const mockResponse2 = {
+  id: 'INV-234',
+  name: 'Invoice Two',
+};

app/src/__tests__/navigationPermissions.test.ts

@@ -1,5 +1,16 @@
 import { renderHook, act } from '@testing-library/react-native';
 
+import { mockNetworkError } from '../__mocks__/services/common';
+import {
+  mockInvoiceId1,
+  mockInvoiceId2,
+  mockInvoiceData,
+  expectedUrl1,
+  expectedUrl2,
+  mockResponse1,
+  mockResponse2,
+} from '../__mocks__/services/invoice';
+
 import { DEFAULT_OFFSET, DEFAULT_PAGE_SIZE } from '@/constants/api';
 import { useBillingApi } from '@/services/billingService';
 import type { PaginatedResponse } from '@/types/api';
@@ -175,3 +186,56 @@ describe('useBillingApi – getCreditMemoDetails', () => {
     );
   });
 });
+
+describe('useBillingApi - getInvoiceData', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('calls getInvoiceData with correct endpoint and returns data', async () => {
+    const api = setup();
+
+    let res;
+
+    mockGet.mockResolvedValueOnce(mockInvoiceData);
+
+    await act(async () => {
+      res = await api.getInvoiceData(mockInvoiceId1);
+    });
+
+    expect(mockGet).toHaveBeenCalledWith(expectedUrl1);
+    expect(res).toEqual(mockInvoiceData);
+  });
+
+  it('handles API errors correctly', async () => {
+    const api = setup();
+
+    mockGet.mockRejectedValueOnce(mockNetworkError);
+
+    await expect(api.getInvoiceData(mockInvoiceId1)).rejects.toThrow('Network error');
+  });
+
+  it('handles multiple calls correctly', async () => {
+    const api = setup();
+
+    let res1;
+    let res2;
+
+    mockGet.mockResolvedValueOnce(mockResponse1);
+    mockGet.mockResolvedValueOnce(mockResponse2);
+
+    await act(async () => {
+      res1 = await api.getInvoiceData(mockInvoiceId1);
+    });
+
+    await act(async () => {
+      res2 = await api.getInvoiceData(mockInvoiceId2);
+    });
+
+    expect(mockGet).toHaveBeenNthCalledWith(1, expectedUrl1);
+    expect(mockGet).toHaveBeenNthCalledWith(2, expectedUrl2);
+
+    expect(res1).toEqual(mockResponse1);
+    expect(res2).toEqual(mockResponse2);
+  });
+});

app/src/__tests__/services/billingService.test.ts

@@ -2,24 +2,22 @@ import { renderHook } from '@testing-library/react-native';
 
 import { useAuth } from '@/context/AuthContext';
 import { useFilteredNavigation } from '@/hooks/useFilteredNavigation';
-import { canShowNavItem } from '@/utils/navigationPermissions';
+import { hasModuleAccess } from '@/utils/moduleClaims';
 
 // Mock dependencies
 jest.mock('@/context/AuthContext', () => ({
   useAuth: jest.fn(),
 }));
 
-jest.mock('@/utils/navigationPermissions', () => ({
-  canShowNavItem: jest.fn(),
+jest.mock('@/utils/moduleClaims', () => ({
+  hasModuleAccess: jest.fn(),
 }));
 
-jest.mock('@/config/navigation-mapper.json', () => ({}));
-
 describe('useFilteredNavigation', () => {
   const mockItems = [
-    { name: 'home', component: jest.fn() },
-    { name: 'orders', component: jest.fn() },
-    { name: 'billing', component: jest.fn() },
+    { name: 'home', component: jest.fn(), modules: ['new-marketplace'] },
+    { name: 'orders', component: jest.fn(), modules: ['new-marketplace'], roles: ['Client'] },
+    { name: 'billing', component: jest.fn(), modules: ['billing'], roles: ['Client'] },
   ];
 
   beforeEach(() => {
@@ -35,7 +33,7 @@ describe('useFilteredNavigation', () => {
     const { result } = renderHook(() => useFilteredNavigation(mockItems));
 
     expect(result.current).toEqual(mockItems);
-    expect(canShowNavItem).not.toHaveBeenCalled();
+    expect(hasModuleAccess).not.toHaveBeenCalled();
   });
 
   it('should filter items based on permissions', () => {
@@ -44,16 +42,15 @@ describe('useFilteredNavigation', () => {
       accountType: 'Client',
     });
 
-    (canShowNavItem as jest.Mock).mockImplementation((_token, _accountType, navItemId) => {
-      return navItemId === 'home' || navItemId === 'orders';
+    (hasModuleAccess as jest.Mock).mockImplementation((_token, module) => {
+      return module === 'new-marketplace';
     });
 
     const { result } = renderHook(() => useFilteredNavigation(mockItems));
 
     expect(result.current).toHaveLength(2);
     expect(result.current[0].name).toBe('home');
     expect(result.current[1].name).toBe('orders');
-    expect(canShowNavItem).toHaveBeenCalledTimes(3);
   });
 
   it('should return empty array when no items match permissions', () => {
@@ -62,42 +59,37 @@ describe('useFilteredNavigation', () => {
       accountType: 'Client',
     });
 
-    (canShowNavItem as jest.Mock).mockReturnValue(false);
+    (hasModuleAccess as jest.Mock).mockReturnValue(false);
 
     const { result } = renderHook(() => useFilteredNavigation(mockItems));
 
     expect(result.current).toEqual([]);
   });
 
-  it('should return all items when all match permissions', () => {
+  it('should filter by role when user does not have required role', () => {
     (useAuth as jest.Mock).mockReturnValue({
       tokens: { accessToken: 'mock.token' },
-      accountType: 'Client',
+      accountType: 'Operations',
     });
 
-    (canShowNavItem as jest.Mock).mockReturnValue(true);
+    (hasModuleAccess as jest.Mock).mockReturnValue(true);
 
     const { result } = renderHook(() => useFilteredNavigation(mockItems));
 
-    expect(result.current).toEqual(mockItems);
+    expect(result.current).toHaveLength(1);
+    expect(result.current[0].name).toBe('home');
   });
 
-  it('should handle accountType being null', () => {
+  it('should handle items without permissions', () => {
+    const itemsWithoutPerms = [{ name: 'public', component: jest.fn() }];
+
     (useAuth as jest.Mock).mockReturnValue({
       tokens: { accessToken: 'mock.token' },
-      accountType: null,
+      accountType: 'Client',
     });
 
-    (canShowNavItem as jest.Mock).mockReturnValue(true);
+    const { result } = renderHook(() => useFilteredNavigation(itemsWithoutPerms));
 
-    const { result } = renderHook(() => useFilteredNavigation(mockItems));
-
-    expect(result.current).toEqual(mockItems);
-    expect(canShowNavItem).toHaveBeenCalledWith(
-      'mock.token',
-      null,
-      expect.any(String),
-      expect.any(Object),
-    );
+    expect(result.current).toEqual(itemsWithoutPerms);
   });
 });