chore: update unit tests for removal of ramps selector

Author: nickewansmith

app/components/UI/AssetOverview/Balance/index.test.tsx

@@ -61,6 +61,15 @@ jest.mock('../../Earn/hooks/useMusdConversionTokens', () => ({
   }),
 }));
 
+jest.mock('../../Earn/hooks/useMusdConversionEligibility', () => ({
+  useMusdConversionEligibility: () => ({
+    isEligible: true,
+    isLoading: false,
+    geolocation: 'US',
+    blockedCountries: [],
+  }),
+}));
+
 const mockDAI = {
   address: '0x6b175474e89094c44da98b954eedeac495271d0f',
   aggregators: ['Metamask', 'Coinmarketcap'],

app/components/UI/Earn/hooks/useMusdConversionEligibility.test.ts

@@ -2,11 +2,11 @@ import { renderHook } from '@testing-library/react-hooks';
 import { useMusdConversionEligibility } from './useMusdConversionEligibility';
 
 // Mock the selectors
-const mockSelectGeolocation = jest.fn();
+const mockGetDetectedGeolocation = jest.fn();
 const mockSelectMusdConversionBlockedCountries = jest.fn();
 
-jest.mock('../../../../selectors/rampsController', () => ({
-  selectGeolocation: (state: unknown) => mockSelectGeolocation(state),
+jest.mock('../../../../reducers/fiatOrders', () => ({
+  getDetectedGeolocation: (state: unknown) => mockGetDetectedGeolocation(state),
 }));
 
 jest.mock('../selectors/featureFlags', () => ({
@@ -21,13 +21,13 @@ jest.mock('react-redux', () => ({
 describe('useMusdConversionEligibility', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    mockSelectGeolocation.mockReturnValue(null);
+    mockGetDetectedGeolocation.mockReturnValue(null);
     mockSelectMusdConversionBlockedCountries.mockReturnValue([]);
   });
 
   describe('isEligible', () => {
     it('returns false when geolocation is null (blocks by default for compliance)', () => {
-      mockSelectGeolocation.mockReturnValue(null);
+      mockGetDetectedGeolocation.mockReturnValue(null);
       mockSelectMusdConversionBlockedCountries.mockReturnValue(['GB']);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -36,7 +36,7 @@ describe('useMusdConversionEligibility', () => {
     });
 
     it('returns false when geolocation is null even with empty blocked list', () => {
-      mockSelectGeolocation.mockReturnValue(null);
+      mockGetDetectedGeolocation.mockReturnValue(null);
       mockSelectMusdConversionBlockedCountries.mockReturnValue([]);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -45,7 +45,7 @@ describe('useMusdConversionEligibility', () => {
     });
 
     it('returns true when blockedCountries is empty and geolocation is known', () => {
-      mockSelectGeolocation.mockReturnValue('GB');
+      mockGetDetectedGeolocation.mockReturnValue('GB');
       mockSelectMusdConversionBlockedCountries.mockReturnValue([]);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -54,7 +54,7 @@ describe('useMusdConversionEligibility', () => {
     });
 
     it('returns false when user is in a blocked country', () => {
-      mockSelectGeolocation.mockReturnValue('GB');
+      mockGetDetectedGeolocation.mockReturnValue('GB');
       mockSelectMusdConversionBlockedCountries.mockReturnValue(['GB', 'US']);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -63,7 +63,7 @@ describe('useMusdConversionEligibility', () => {
     });
 
     it('returns false when user country starts with blocked country code', () => {
-      mockSelectGeolocation.mockReturnValue('GB-ENG');
+      mockGetDetectedGeolocation.mockReturnValue('GB-ENG');
       mockSelectMusdConversionBlockedCountries.mockReturnValue(['GB']);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -72,7 +72,7 @@ describe('useMusdConversionEligibility', () => {
     });
 
     it('returns true when user is not in any blocked country', () => {
-      mockSelectGeolocation.mockReturnValue('FR');
+      mockGetDetectedGeolocation.mockReturnValue('FR');
       mockSelectMusdConversionBlockedCountries.mockReturnValue(['GB', 'US']);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -81,7 +81,7 @@ describe('useMusdConversionEligibility', () => {
     });
 
     it('performs case-insensitive comparison for country codes', () => {
-      mockSelectGeolocation.mockReturnValue('gb');
+      mockGetDetectedGeolocation.mockReturnValue('gb');
       mockSelectMusdConversionBlockedCountries.mockReturnValue(['GB']);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -90,7 +90,7 @@ describe('useMusdConversionEligibility', () => {
     });
 
     it('handles US state codes correctly when US is blocked', () => {
-      mockSelectGeolocation.mockReturnValue('US-CA');
+      mockGetDetectedGeolocation.mockReturnValue('US-CA');
       mockSelectMusdConversionBlockedCountries.mockReturnValue(['US']);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -99,7 +99,7 @@ describe('useMusdConversionEligibility', () => {
     });
 
     it('returns true for US user when only UK is blocked', () => {
-      mockSelectGeolocation.mockReturnValue('US-CA');
+      mockGetDetectedGeolocation.mockReturnValue('US-CA');
       mockSelectMusdConversionBlockedCountries.mockReturnValue(['GB']);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -110,7 +110,7 @@ describe('useMusdConversionEligibility', () => {
 
   describe('return values', () => {
     it('returns geolocation from selector', () => {
-      mockSelectGeolocation.mockReturnValue('FR');
+      mockGetDetectedGeolocation.mockReturnValue('FR');
       mockSelectMusdConversionBlockedCountries.mockReturnValue([]);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -120,7 +120,7 @@ describe('useMusdConversionEligibility', () => {
 
     it('returns blockedCountries from selector', () => {
       const blockedCountries = ['GB', 'US'];
-      mockSelectGeolocation.mockReturnValue('FR');
+      mockGetDetectedGeolocation.mockReturnValue('FR');
       mockSelectMusdConversionBlockedCountries.mockReturnValue(
         blockedCountries,
       );
@@ -133,7 +133,7 @@ describe('useMusdConversionEligibility', () => {
 
   describe('isLoading', () => {
     it('returns true when geolocation is null', () => {
-      mockSelectGeolocation.mockReturnValue(null);
+      mockGetDetectedGeolocation.mockReturnValue(null);
       mockSelectMusdConversionBlockedCountries.mockReturnValue([]);
 
       const { result } = renderHook(() => useMusdConversionEligibility());
@@ -142,7 +142,7 @@ describe('useMusdConversionEligibility', () => {
     });
 
     it('returns false when geolocation is available', () => {
-      mockSelectGeolocation.mockReturnValue('US');
+      mockGetDetectedGeolocation.mockReturnValue('US');
       mockSelectMusdConversionBlockedCountries.mockReturnValue([]);
 
       const { result } = renderHook(() => useMusdConversionEligibility());

app/components/UI/Earn/hooks/useMusdConversionEligibility.ts

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
-import { selectGeolocation } from '../../../../selectors/rampsController';
+import { getDetectedGeolocation } from '../../../../reducers/fiatOrders';
 import { selectMusdConversionBlockedCountries } from '../selectors/featureFlags';
 
 /**
@@ -20,14 +20,18 @@ import { selectMusdConversionBlockedCountries } from '../selectors/featureFlags'
  * - blockedCountries: array of blocked country codes from LaunchDarkly
  */
 export const useMusdConversionEligibility = () => {
-  const geolocation = useSelector(selectGeolocation);
+  const geolocation = useSelector(getDetectedGeolocation);
   const blockedCountries = useSelector(selectMusdConversionBlockedCountries);
-
   const isLoading = geolocation === null;
 
+  const userCountry = useMemo(() => {
+    if (geolocation) return geolocation?.toUpperCase().split('-')[0];
+    return null;
+  }, [geolocation]);
+
   const isEligible = useMemo(() => {
     // Block by default when geolocation is unknown for regulatory compliance
-    if (!geolocation) {
+    if (!userCountry) {
       return false;
     }
 
@@ -38,16 +42,16 @@ export const useMusdConversionEligibility = () => {
 
     // Check if user's country starts with any blocked country code
     // Uses startsWith to handle both "GB" and "GB-ENG" formats
-    const userCountry = geolocation.toUpperCase();
+
     return blockedCountries.every(
       (blockedCountry) => !userCountry.startsWith(blockedCountry.toUpperCase()),
     );
-  }, [geolocation, blockedCountries]);
+  }, [userCountry, blockedCountries]);
 
   return {
     isEligible,
     isLoading,
-    geolocation,
+    geolocation: userCountry,
     blockedCountries,
   };
 };