chore: address feedback, default to GB blocked, resolve conflict

Author: nickewansmith

app/components/UI/Earn/constants/musd.ts

@@ -41,3 +41,9 @@ export const MUSD_TOKEN_ASSET_ID_BY_CHAIN: Record<Hex, string> = {
 
 export const MUSD_CURRENCY = 'MUSD';
 export const MUSD_CONVERSION_APY = 3;
+
+/**
+ * Default blocked countries for mUSD conversion when no remote or env config is available.
+ * This is a safety fallback to ensure geo-blocking is always active.
+ */
+export const DEFAULT_MUSD_BLOCKED_COUNTRIES = ['GB'];

app/components/UI/Earn/selectors/featureFlags/index.test.ts

@@ -1843,7 +1843,7 @@ describe('Earn Feature Flag Selectors', () => {
       expect(result).toEqual(['GB', 'US']);
     });
 
-    it('returns empty array when remote flag is undefined', () => {
+    it('returns default blocked countries when remote flag is undefined', () => {
       const state = {
         engine: {
           backgroundState: {
@@ -1857,10 +1857,10 @@ describe('Earn Feature Flag Selectors', () => {
 
       const result = selectMusdConversionBlockedCountries(state);
 
-      expect(result).toEqual([]);
+      expect(result).toEqual(['GB']);
     });
 
-    it('returns empty array when blockedRegions is not an array', () => {
+    it('returns default blocked countries when blockedRegions is not an array', () => {
       const state = {
         engine: {
           backgroundState: {
@@ -1878,10 +1878,10 @@ describe('Earn Feature Flag Selectors', () => {
 
       const result = selectMusdConversionBlockedCountries(state);
 
-      expect(result).toEqual([]);
+      expect(result).toEqual(['GB']);
     });
 
-    it('returns empty array when flag is null', () => {
+    it('returns default blocked countries when flag is null', () => {
       const state = {
         engine: {
           backgroundState: {
@@ -1897,10 +1897,10 @@ describe('Earn Feature Flag Selectors', () => {
 
       const result = selectMusdConversionBlockedCountries(state);
 
-      expect(result).toEqual([]);
+      expect(result).toEqual(['GB']);
     });
 
-    it('returns empty array when flag has wrong structure', () => {
+    it('returns default blocked countries when flag has wrong structure', () => {
       const state = {
         engine: {
           backgroundState: {
@@ -1916,10 +1916,10 @@ describe('Earn Feature Flag Selectors', () => {
 
       const result = selectMusdConversionBlockedCountries(state);
 
-      expect(result).toEqual([]);
+      expect(result).toEqual(['GB']);
     });
 
-    it('returns empty array when RemoteFeatureFlagController is undefined', () => {
+    it('returns default blocked countries when RemoteFeatureFlagController is undefined', () => {
       const state = {
         engine: {
           backgroundState: {
@@ -1930,7 +1930,7 @@ describe('Earn Feature Flag Selectors', () => {
 
       const result = selectMusdConversionBlockedCountries(state);
 
-      expect(result).toEqual([]);
+      expect(result).toEqual(['GB']);
     });
 
     describe('local env var fallback', () => {
@@ -2018,7 +2018,7 @@ describe('Earn Feature Flag Selectors', () => {
         expect(result).toEqual(['GB', 'US']);
       });
 
-      it('returns empty array when env var is empty string', () => {
+      it('returns default blocked countries when env var is empty string', () => {
         process.env.MM_MUSD_CONVERSION_GEO_BLOCKED_COUNTRIES = '';
 
         const state = {
@@ -2034,7 +2034,7 @@ describe('Earn Feature Flag Selectors', () => {
 
         const result = selectMusdConversionBlockedCountries(state);
 
-        expect(result).toEqual([]);
+        expect(result).toEqual(['GB']);
       });
 
       it('filters out empty entries from env var', () => {

app/components/UI/Earn/selectors/featureFlags/index.ts

@@ -8,6 +8,7 @@ import {
   getWildcardTokenListFromConfig,
   WildcardTokenList,
 } from '../../utils/wildcardTokenList';
+import { DEFAULT_MUSD_BLOCKED_COUNTRIES } from '../../constants/musd';
 
 export const selectPooledStakingEnabledFlag = createSelector(
   selectRemoteFeatureFlags,
@@ -273,7 +274,7 @@ export const parseBlockedCountriesEnv = (envValue?: string): string[] => {
  * - Remote: { "blockedRegions": ["GB", "US"] } - Block users in GB and US
  * - Local env: "GB,US,FR"                        - Block users in GB, US, and FR
  *
- * If both remote and local are unavailable or invalid, returns [] (no geo-blocking).
+ * If both remote and local are unavailable or invalid, defaults to blocking Great Britain.
  */
 export const selectMusdConversionBlockedCountries = createSelector(
   selectRemoteFeatureFlags,
@@ -289,8 +290,13 @@ export const selectMusdConversionBlockedCountries = createSelector(
     }
 
     // Fallback to local env var
-    return parseBlockedCountriesEnv(
+    const envBlockedCountries = parseBlockedCountriesEnv(
       process.env.MM_MUSD_CONVERSION_GEO_BLOCKED_COUNTRIES,
     );
+
+    // If env var is also empty, use default blocked countries
+    return envBlockedCountries.length > 0
+      ? envBlockedCountries
+      : DEFAULT_MUSD_BLOCKED_COUNTRIES;
   },
 );