add migration to remove appUiConfigs key

src/hooks/useMarketsData.ts

@@ -18,6 +18,7 @@ import {
 } from '@/hooks/usePerpetualMarketSparklines';
 
 import { useAppSelector } from '@/state/appTypes';
+import { getFavoritedMarkets } from '@/state/appUiConfigsSelectors';
 import { getAssets } from '@/state/assetsSelectors';
 import { getPerpetualMarkets, getPerpetualMarketsClobIds } from '@/state/perpetualsSelectors';
 
@@ -136,12 +137,7 @@ export const useMarketsData = ({
   const sevenDaysSparklineData = usePerpetualMarketSparklines();
   const featureFlags = useAllStatsigGateValues();
   const unlaunchedMarkets = useMetadataService();
-<<<<<<< HEAD
-=======
-  const shouldHideLaunchableMarkets =
-    useAppSelector(getShouldHideLaunchableMarkets) || hideUnlaunchedMarkets;
   const favoritedMarkets = useAppSelector(getFavoritedMarkets, shallowEqual);
->>>>>>> main
   const hasMarketIds = Object.keys(allPerpetualMarkets).length > 0;
 
   const markets = useMemo(() => {

src/state/_store.ts

@@ -52,7 +52,7 @@ const rootReducer = combineReducers(reducers);
 
 const persistConfig = {
   key: 'root',
-  version: 3,
+  version: 4,
   storage,
   whitelist: [
     'affiliates',

src/state/appUiConfigs.ts

@@ -35,7 +35,6 @@ export interface AppUIConfigsState {
   hasSeenLaunchIncentives: boolean;
   defaultToAllMarketsInPositionsOrdersFills: boolean;
   displayUnit: DisplayUnit;
-  shouldHideLaunchableMarkets: boolean;
   favoritedMarkets: string[];
 }
 
@@ -47,7 +46,6 @@ export const initialState: AppUIConfigsState = {
   hasSeenLaunchIncentives: false,
   defaultToAllMarketsInPositionsOrdersFills: true,
   displayUnit: DisplayUnit.Asset,
-  shouldHideLaunchableMarkets: false,
   favoritedMarkets: [],
 };
 
@@ -70,12 +68,6 @@ export const appUiConfigsSlice = createSlice({
     markLaunchIncentivesSeen: (state: AppUIConfigsState) => {
       state.hasSeenLaunchIncentives = true;
     },
-    setShouldHideLaunchableMarkets: (
-      state: AppUIConfigsState,
-      { payload }: PayloadAction<boolean>
-    ) => {
-      state.shouldHideLaunchableMarkets = payload;
-    },
     setDisplayUnit: (
       state: AppUIConfigsState,
       {
@@ -114,7 +106,6 @@ export const {
   setAppThemeSetting,
   setAppColorMode,
   markLaunchIncentivesSeen,
-  setShouldHideLaunchableMarkets,
   setDisplayUnit,
   favoriteMarket,
   unfavoriteMarket,

src/state/migrations.ts

@@ -5,12 +5,15 @@ import { migration0 } from './migrations/0';
 import { migration1 } from './migrations/1';
 import { migration2 } from './migrations/2';
 import { migration3 } from './migrations/3';
+import { migration4 } from './migrations/4';
 
 export const migrations: MigrationManifest = {
   0: migration0,
   1: migration1,
   2: migration2,
   3: migration3,
+  // @ts-expect-error PersistAppStateV4 is a union of PersistedState and new app state
+  4: migration4,
 } as const;
 
 /*

src/state/migrations/3.ts

@@ -13,11 +13,11 @@ export enum V3AppTheme {
   Light = 'Light',
 }
 
-enum V3AppThemeSystemSetting {
+export enum V3AppThemeSystemSetting {
   System = 'System',
 }
 
-type V3AppThemeSetting = V3AppTheme | V3AppThemeSystemSetting;
+export type V3AppThemeSetting = V3AppTheme | V3AppThemeSystemSetting;
 
 export enum V3AppColorMode {
   GreenUp = 'GreenUp',

src/state/migrations/4.ts

@@ -0,0 +1,28 @@
+import { PersistedState } from 'redux-persist';
+
+import { PersistAppStateV3, V3AppUiConfigs } from './3';
+
+export type V4AppUiConfigs = Omit<V3AppUiConfigs, 'shouldHideLaunchableMarkets'>;
+
+export type PersistAppStateV4 = PersistedState & {
+  appUiConfigs: V4AppUiConfigs;
+};
+
+/**
+ * Deprecate shouldHideLaunchableMarkets from AppUIConfigs state
+ *
+ */
+export function migration4(state: PersistAppStateV3 | undefined): PersistAppStateV4 {
+  if (!state) throw new Error('state must be defined');
+
+  const appUiConfigsCopy = { ...state.appUiConfigs };
+
+  // Remove shouldHideLaunchableMarkets
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { shouldHideLaunchableMarkets, ...restAppUiConfigs } = appUiConfigsCopy;
+
+  return {
+    ...state,
+    appUiConfigs: restAppUiConfigs,
+  };
+}

src/state/migrations/__test__/4.test.ts

@@ -0,0 +1,38 @@
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { PersistAppStateV3, V3AppColorMode, V3AppTheme, V3DisplayUnit } from '../3';
+import { migration4, PersistAppStateV4 } from '../4';
+
+const v3State: PersistAppStateV3 = {
+  _persist: { version: 3, rehydrated: true },
+  appUiConfigs: {
+    appThemeSetting: V3AppTheme.Classic,
+    appColorMode: V3AppColorMode.GreenUp,
+    hasSeenLaunchIncentives: false,
+    defaultToAllMarketsInPositionsOrdersFills: true,
+    displayUnit: V3DisplayUnit.Asset,
+    shouldHideLaunchableMarkets: false,
+  },
+};
+
+const v4State: PersistAppStateV4 = {
+  _persist: { version: 4, rehydrated: true },
+  appUiConfigs: {
+    appThemeSetting: V3AppTheme.Classic,
+    appColorMode: V3AppColorMode.GreenUp,
+    hasSeenLaunchIncentives: false,
+    defaultToAllMarketsInPositionsOrdersFills: true,
+    displayUnit: V3DisplayUnit.Asset,
+  },
+};
+
+describe('migration4', () => {
+  afterEach(() => {
+    localStorage.clear();
+  });
+
+  it('updated appUiConfigs state should not include shouldHideLaunchableMarkets', () => {
+    const result = migration4(v3State);
+    expect(result.appUiConfigs).toMatchObject(v4State.appUiConfigs);
+  });
+});