add changes

packages/remote-feature-flag-controller/CHANGELOG.md

@@ -11,15 +11,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add override functionality to remote feature flags ([#7271](https://github.com/MetaMask/core/pull/7271))
   - `setFlagOverride(flagName, value)` - Set a local override for a specific feature flag
-  - `clearFlagOverride(flagName)` - Clear the local override for a specific feature flag
-  - `clearAllOverrides()` - Clear all local feature flag overrides
+  - `removeFlagOverride(flagName)` - Clear the local override for a specific feature flag
+  - `clearAllFlagOverrides()` - Clear all local feature flag overrides
 - Add new controller state properties ([#7271](https://github.com/MetaMask/core/pull/7271))
   - `localOverrides` - Local overrides for feature flags that take precedence over remote flags
-  - `rawRemoteFeatureFlags` - Raw flag value for arrays that were processed from arrays to single value
+  - `rawRemoteFeatureFlags` - Raw flag value for all feature flags
 - Export additional controller action types ([#7271](https://github.com/MetaMask/core/pull/7271))
   - `RemoteFeatureFlagControllerSetFlagOverrideAction`
-  - `RemoteFeatureFlagControllerClearFlagOverrideAction`
-  - `RemoteFeatureFlagControllerClearAllOverridesAction`
+  - `RemoteFeatureFlagControllerremoveFlagOverrideAction`
+  - `RemoteFeatureFlagControllerclearAllFlagOverridesAction`
 
 ### Changed
 

packages/remote-feature-flag-controller/src/index.ts

@@ -6,8 +6,8 @@ export type {
   RemoteFeatureFlagControllerGetStateAction,
   RemoteFeatureFlagControllerUpdateRemoteFeatureFlagsAction,
   RemoteFeatureFlagControllerSetFlagOverrideAction,
-  RemoteFeatureFlagControllerClearFlagOverrideAction,
-  RemoteFeatureFlagControllerClearAllOverridesAction,
+  RemoteFeatureFlagControllerRemoveFlagOverrideAction,
+  RemoteFeatureFlagControllerClearAllFlagOverridesAction,
   RemoteFeatureFlagControllerEvents,
   RemoteFeatureFlagControllerStateChangeEvent,
 } from './remote-feature-flag-controller';

packages/remote-feature-flag-controller/src/remote-feature-flag-controller.test.ts

@@ -688,13 +688,13 @@ describe('RemoteFeatureFlagController', () => {
       });
     });
 
-    describe('clearFlagOverride', () => {
+    describe('removeFlagOverride', () => {
       it('removes a specific override', () => {
         const controller = createController();
 
         controller.setFlagOverride('flag1', 'value1');
         controller.setFlagOverride('flag2', 'value2');
-        controller.clearFlagOverride('flag1');
+        controller.removeFlagOverride('flag1');
 
         expect(controller.state.localOverrides).toStrictEqual({
           flag2: 'value2',
@@ -705,29 +705,29 @@ describe('RemoteFeatureFlagController', () => {
         const controller = createController();
 
         controller.setFlagOverride('flag1', 'value1');
-        controller.clearFlagOverride('nonExistentFlag');
+        controller.removeFlagOverride('nonExistentFlag');
 
         expect(controller.state.localOverrides).toStrictEqual({
           flag1: 'value1',
         });
       });
     });
 
-    describe('clearAllOverrides', () => {
+    describe('clearAllFlagOverrides', () => {
       it('removes all overrides', () => {
         const controller = createController();
 
         controller.setFlagOverride('flag1', 'value1');
         controller.setFlagOverride('flag2', 'value2');
-        controller.clearAllOverrides();
+        controller.clearAllFlagOverrides();
 
         expect(controller.state.localOverrides).toStrictEqual({});
       });
 
       it('does not affect state when no overrides exist', () => {
         const controller = createController();
 
-        controller.clearAllOverrides();
+        controller.clearAllFlagOverrides();
 
         expect(controller.state.localOverrides).toStrictEqual({});
       });
@@ -745,7 +745,7 @@ describe('RemoteFeatureFlagController', () => {
 
         await controller.updateRemoteFeatureFlags();
 
-        // Mock different remote response for second fetch
+        // Mock different remote response for updated fetch
         jest
           .spyOn(clientConfigApiService, 'fetchRemoteFeatureFlags')
           .mockResolvedValueOnce({
@@ -769,27 +769,6 @@ describe('RemoteFeatureFlagController', () => {
           remoteFlag: 'updatedRemoteValue',
         });
       });
-
-      it('overrides work with threshold-based feature flags', async () => {
-        const clientConfigApiService = buildClientConfigApiService({
-          remoteFeatureFlags: MOCK_FLAGS_WITH_THRESHOLD,
-        });
-        const controller = createController({
-          clientConfigApiService,
-          getMetaMetricsId: () => MOCK_METRICS_ID,
-        });
-
-        await controller.updateRemoteFeatureFlags();
-
-        // Override the threshold flag
-        controller.setFlagOverride('testFlagForThreshold', 'overriddenValue');
-
-        // Access flag value with override taking precedence
-        const flagValue =
-          controller.state.localOverrides.testFlagForThreshold ??
-          controller.state.remoteFeatureFlags.testFlagForThreshold;
-        expect(flagValue).toBe('overriddenValue');
-      });
     });
   });
 

packages/remote-feature-flag-controller/src/remote-feature-flag-controller.ts

@@ -81,22 +81,22 @@ export type RemoteFeatureFlagControllerSetFlagOverrideAction = {
   handler: RemoteFeatureFlagController['setFlagOverride'];
 };
 
-export type RemoteFeatureFlagControllerClearFlagOverrideAction = {
-  type: `${typeof controllerName}:clearFlagOverride`;
-  handler: RemoteFeatureFlagController['clearFlagOverride'];
+export type RemoteFeatureFlagControllerRemoveFlagOverrideAction = {
+  type: `${typeof controllerName}:removeFlagOverride`;
+  handler: RemoteFeatureFlagController['removeFlagOverride'];
 };
 
-export type RemoteFeatureFlagControllerClearAllOverridesAction = {
-  type: `${typeof controllerName}:clearAllOverrides`;
-  handler: RemoteFeatureFlagController['clearAllOverrides'];
+export type RemoteFeatureFlagControllerClearAllFlagOverridesAction = {
+  type: `${typeof controllerName}:clearAllFlagOverrides`;
+  handler: RemoteFeatureFlagController['clearAllFlagOverrides'];
 };
 
 export type RemoteFeatureFlagControllerActions =
   | RemoteFeatureFlagControllerGetStateAction
   | RemoteFeatureFlagControllerUpdateRemoteFeatureFlagsAction
   | RemoteFeatureFlagControllerSetFlagOverrideAction
-  | RemoteFeatureFlagControllerClearFlagOverrideAction
-  | RemoteFeatureFlagControllerClearAllOverridesAction;
+  | RemoteFeatureFlagControllerRemoveFlagOverrideAction
+  | RemoteFeatureFlagControllerClearAllFlagOverridesAction;
 
 export type RemoteFeatureFlagControllerStateChangeEvent =
   ControllerStateChangeEvent<
@@ -338,7 +338,6 @@ export class RemoteFeatureFlagController extends BaseController<
     this.update((state) => {
       state.localOverrides[flagName] = value;
     });
-    });
   }
 
   /**