Fix import error

Author: sophieqgu

app/scripts/controllers/rewards/rewards-controller.test.ts

@@ -42,7 +42,6 @@ import type {
   SubscriptionDto,
   EstimatePointsDto,
   EstimatedPointsDto,
-  SeasonDtoState,
   DiscoverSeasonsDto,
   SeasonMetadataDto,
   SeasonStateDto,
@@ -64,6 +63,7 @@ import {
   RewardsDataServiceMobileOptinAction,
   RewardsDataServiceValidateReferralCodeAction,
 } from './rewards-data-service-types';
+import { SeasonDtoState } from '../../../../shared/types/rewards';
 
 type AllActions = MessengerActions<RewardsControllerMessenger>;
 

app/scripts/controllers/rewards/rewards-controller.ts

@@ -18,9 +18,6 @@ import {
   type LoginResponseDto,
   type EstimatePointsDto,
   type EstimatedPointsDto,
-  type SeasonDtoState,
-  type SeasonStatusState,
-  type SeasonTierState,
   type SeasonTierDto,
   type SeasonStatusDto,
   type SubscriptionDto,
@@ -38,6 +35,11 @@ import {
 } from './rewards-data-service';
 import { signSolanaRewardsMessage } from './utils/solana-snap';
 import { sortAccounts } from './utils/sortAccounts';
+import {
+  SeasonDtoState,
+  SeasonStatusState,
+  SeasonTierState,
+} from '../../../../shared/types/rewards';
 
 export const DEFAULT_BLOCKED_REGIONS = ['UK'];
 

app/scripts/controllers/rewards/rewards-controller.types.ts

@@ -1,5 +1,10 @@
 import { CaipAccountId, CaipAssetType } from '@metamask/utils';
 import { InternalAccount } from '@metamask/keyring-internal-api';
+import {
+  SeasonDtoState,
+  SeasonRewardType,
+  SeasonStatusState,
+} from '../../../../shared/types/rewards';
 
 export type LoginResponseDto = {
   sessionId: string;
@@ -410,13 +415,6 @@ export type SeasonRewardDto = {
   rewardType: SeasonRewardType;
 };
 
-export enum SeasonRewardType {
-  Generic = 'Generic',
-  PerpsDiscount = 'PerpsDiscount',
-  PointsBoost = 'PointsBoost',
-  AlphaFoxInvite = 'AlphaFoxInvite',
-}
-
 export type SeasonDto = {
   id: string;
   name: string;
@@ -607,68 +605,6 @@ export type ThemeImage = {
   darkModeUrl: string;
 };
 
-export type ClaimRewardDto = {
-  data?: Record<string, string>;
-};
-
-// Serializable versions for state storage (Date objects converted to timestamps)
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type SeasonRewardDtoState = {
-  id: string;
-  name: string;
-  shortDescription: string;
-  longDescription: string;
-  shortUnlockedDescription: string;
-  longUnlockedDescription: string;
-  claimUrl?: string;
-  iconName: string;
-  rewardType: SeasonRewardType;
-};
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type SeasonTierDtoState = {
-  id: string;
-  name: string;
-  pointsNeeded: number;
-  image: {
-    lightModeUrl: string;
-    darkModeUrl: string;
-  };
-  levelNumber: string;
-  rewards: SeasonRewardDtoState[];
-};
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type SeasonDtoState = {
-  id: string;
-  name: string;
-  startDate: number; // timestamp
-  endDate: number; // timestamp
-  tiers: SeasonTierDtoState[];
-  lastFetched?: number;
-};
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type SeasonStatusBalanceDtoState = {
-  total: number;
-  updatedAt?: number; // timestamp
-};
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type SeasonTierState = {
-  currentTier: SeasonTierDtoState;
-  nextTier: SeasonTierDtoState | null;
-  nextTierPointsNeeded: number | null;
-};
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type SeasonStatusState = {
-  season: SeasonDtoState;
-  balance: SeasonStatusBalanceDtoState;
-  tier: SeasonTierState;
-  lastFetched?: number;
-};
-
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type RewardsAccountState = {
   account: CaipAccountId;

shared/types/rewards.ts

@@ -0,0 +1,62 @@
+/**
+ * Shared types for rewards functionality
+ * These types are used across UI and background to avoid import restrictions
+ */
+
+export enum SeasonRewardType {
+  Generic = 'Generic',
+  PerpsDiscount = 'PerpsDiscount',
+  PointsBoost = 'PointsBoost',
+  AlphaFoxInvite = 'AlphaFoxInvite',
+}
+
+export type SeasonRewardDtoState = {
+  id: string;
+  name: string;
+  shortDescription: string;
+  longDescription: string;
+  shortUnlockedDescription: string;
+  longUnlockedDescription: string;
+  claimUrl?: string;
+  iconName: string;
+  rewardType: SeasonRewardType;
+};
+
+export type SeasonTierDtoState = {
+  id: string;
+  name: string;
+  pointsNeeded: number;
+  image: {
+    lightModeUrl: string;
+    darkModeUrl: string;
+  };
+  levelNumber: string;
+  rewards: SeasonRewardDtoState[];
+};
+
+export type SeasonDtoState = {
+  id: string;
+  name: string;
+  startDate: number; // timestamp
+  endDate: number; // timestamp
+  tiers: SeasonTierDtoState[];
+  lastFetched?: number;
+};
+
+export type SeasonStatusBalanceDtoState = {
+  total: number;
+  updatedAt?: number; // timestamp
+};
+
+export type SeasonTierState = {
+  currentTier: SeasonTierDtoState;
+  nextTier: SeasonTierDtoState | null;
+  nextTierPointsNeeded: number | null;
+};
+
+export type SeasonStatusState = {
+  season: SeasonDtoState;
+  balance: SeasonStatusBalanceDtoState;
+  tier: SeasonTierState;
+  lastFetched?: number;
+};

ui/components/app/rewards/RewardsPointsBalance.test.tsx

@@ -5,6 +5,7 @@ import { useSelector } from 'react-redux';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useRewardsContext } from '../../../contexts/rewards';
 import type { RewardsContextValue } from '../../../contexts/rewards';
+import type { SeasonStatusState } from '../../../../shared/types/rewards';
 import { RewardsPointsBalance } from './RewardsPointsBalance';
 
 // Mock dependencies

ui/contexts/rewards/index.tsx

@@ -1,18 +1,18 @@
 import React, { useContext } from 'react';
-import type { SeasonStatusState } from '../../../app/scripts/controllers/rewards/rewards-controller.types';
+import type { SeasonStatusState } from '../../../shared/types/rewards';
 import { useCandidateSubscriptionId } from '../../hooks/rewards/useCandidateSubscriptionId';
 import { useSeasonStatus } from '../../hooks/rewards/useSeasonStatus';
 import { useRewardsEnabled } from '../../hooks/rewards/useRewardsEnabled';
 
-export interface RewardsContextValue {
+export type RewardsContextValue = {
   rewardsEnabled: boolean;
   candidateSubscriptionId: string | null;
   candidateSubscriptionIdError: boolean;
   seasonStatus: SeasonStatusState | null;
   seasonStatusError: string | null;
   seasonStatusLoading: boolean;
   refetchSeasonStatus: () => Promise<void>;
-}
+};
 
 export const RewardsContext = React.createContext<RewardsContextValue>({
   rewardsEnabled: false,

ui/hooks/rewards/useSeasonStatus.test.ts

@@ -6,7 +6,7 @@ import { renderHookWithProvider } from '../../../test/lib/render-helpers';
 import mockState from '../../../test/data/mock-state.json';
 import { useSeasonStatus } from './useSeasonStatus';
 import { useRewardsEnabled } from './useRewardsEnabled';
-import type { SeasonStatusState } from '../../../app/scripts/controllers/rewards/rewards-controller.types';
+import { SeasonStatusState } from '../../../shared/types/rewards';
 
 // Mock dependencies
 jest.mock('../../store/background-connection', () => ({

ui/hooks/rewards/useSeasonStatus.ts

@@ -2,12 +2,9 @@ import { useState, useCallback, useEffect, useRef } from 'react';
 import { useSelector } from 'react-redux';
 import log from 'loglevel';
 import { submitRequestToBackground } from '../../store/background-connection';
-import type {
-  SeasonStatusState,
-  SeasonDtoState,
-} from '../../../app/scripts/controllers/rewards/rewards-controller.types';
 import { getIsUnlocked } from '../../ducks/metamask/metamask';
 import { useRewardsEnabled } from './useRewardsEnabled';
+import { SeasonDtoState, SeasonStatusState } from '../../../shared/types/rewards';
 
 interface UseSeasonStatusOptions {
   subscriptionId: string | null;