Merge branch 'main' into codex/headless-plan-pr-links

Author: lorenzosantos

app/components/UI/Perps/routes/index.tsx

@@ -47,7 +47,11 @@ import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
 /* eslint-disable-next-line */
 import { NavigationContext } from '@react-navigation/core';
 import { CONFIRMATION_HEADER_CONFIG } from '../constants/perpsConfig';
-import { clearStackNavigatorOptions } from '../../../../constants/navigation/clearStackNavigatorOptions';
+import {
+  clearNativeStackNavigatorOptions,
+  clearStackNavigatorOptions,
+  transparentModalScreenOptions,
+} from '../../../../constants/navigation/clearStackNavigatorOptions';
 
 const Stack = createNativeStackNavigator<PerpsNavigationParamList>();
 const ModalStack = createStackNavigator();
@@ -73,7 +77,7 @@ function getRedesignedConfirmationsHeaderOptions({
     title: '',
     headerBackVisible: false,
     contentStyle: { backgroundColor: 'transparent' },
-    presentation: 'transparentModal',
+    ...transparentModalScreenOptions,
   };
 }
 
@@ -353,9 +357,9 @@ const PerpsScreenStack = () => {
             name={Routes.PERPS.TPSL}
             component={PerpsTPSLView}
             options={{
+              ...transparentModalScreenOptions,
               title: strings('perps.tpsl.title'),
               headerShown: false,
-              presentation: 'transparentModal',
             }}
           />
 
@@ -411,12 +415,8 @@ const PerpsScreenStack = () => {
             name={Routes.PERPS.MODALS.CLOSE_POSITION_MODALS}
             component={PerpsClosePositionBottomSheetStack}
             options={{
-              headerShown: false,
-              contentStyle: {
-                backgroundColor: 'transparent',
-              },
-              animation: 'none',
-              presentation: 'transparentModal',
+              ...clearNativeStackNavigatorOptions,
+              ...transparentModalScreenOptions,
             }}
           />
 
@@ -425,12 +425,8 @@ const PerpsScreenStack = () => {
             name={Routes.PERPS.MODALS.ROOT}
             component={PerpsModalStack}
             options={{
-              headerShown: false,
-              contentStyle: {
-                backgroundColor: 'transparent',
-              },
-              animation: 'none',
-              presentation: 'transparentModal',
+              ...clearNativeStackNavigatorOptions,
+              ...transparentModalScreenOptions,
             }}
           />
 
@@ -442,7 +438,7 @@ const PerpsScreenStack = () => {
             component={PayWithModal}
             options={{
               headerShown: false,
-              presentation: 'transparentModal',
+              ...transparentModalScreenOptions,
             }}
           />
 

app/components/UI/Rewards/hooks/useCampaignOutcomeToast.test.ts

@@ -146,13 +146,13 @@ function setupDefaults({
   subscriptionId = SUBSCRIPTION_ID,
   outcome = null,
 }: {
-  campaigns?: ReturnType<typeof makeCompletedCampaign>[];
+  campaigns?: ReturnType<typeof makeCompletedCampaign>[] | undefined;
   dismissed?: Record<string, boolean>;
   subscriptionId?: string | null;
   outcome?: BaseCampaignParticipantOutcomeDto | null;
 } = {}) {
   mockUseSelector.mockImplementation((selector) => {
-    if (selector === selectCampaigns) return campaigns;
+    if (selector === selectCampaigns) return campaigns ?? [];
     if (selector === selectDismissedCampaignOutcomeToasts) return dismissed;
     if (selector === selectRewardsSubscriptionId) return subscriptionId;
     return undefined;
@@ -193,6 +193,14 @@ describe('useCampaignOutcomeToast', () => {
       expect(mockShowToast).not.toHaveBeenCalled();
     });
 
+    it('campaigns are missing from persisted state', () => {
+      setupDefaults({ campaigns: undefined });
+      expect(() =>
+        renderHook(() => useCampaignOutcomeToast(mockConfig)),
+      ).not.toThrow();
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+
     it('subscriptionId is missing', () => {
       setupDefaults({
         subscriptionId: null,

app/constants/navigation/clearStackNavigatorOptions.ts

@@ -1,3 +1,4 @@
+import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 import type { StackNavigationOptions } from '@react-navigation/stack';
 
 /** Transparent stack with no transition animation; used for modal-style flows. */
@@ -22,3 +23,30 @@ export const clearStackNavigatorOptionsWithTransitionAnimation: StackNavigationO
     }),
     animationEnabled: false,
   };
+
+/**
+ * Native-stack counterpart to {@link clearStackNavigatorOptions}.
+ * Use with `createNativeStackNavigator` only (`contentStyle` / `animation`, not `cardStyle` / `animationEnabled`).
+ *
+ * Includes `animation: 'none'` — omit this preset on screens where you want the default push/modal animation.
+ */
+export const clearNativeStackNavigatorOptions: NativeStackNavigationOptions = {
+  headerShown: false,
+  contentStyle: {
+    backgroundColor: 'transparent',
+  },
+  animation: 'none',
+};
+
+/**
+ * Per-screen options for overlay-style screens on native stack.
+ * Replaces the JS-stack `cardStyleInterpolator` trick (overlay opacity 0) — native stack keeps the
+ * presenting screen mounted and does not dim it when `presentation: 'transparentModal'` is used.
+ *
+ * Often spread **after** {@link clearNativeStackNavigatorOptions} for fully static overlays.
+ * Skip `clearNativeStackNavigatorOptions` when this screen should keep the default stack animation
+ * (it sets `animation: 'none'`).
+ */
+export const transparentModalScreenOptions: NativeStackNavigationOptions = {
+  presentation: 'transparentModal',
+};

app/core/Engine/controllers/rewards-controller/RewardsController.ts

@@ -52,6 +52,10 @@ import {
   BASE32_REGEX,
   CampaignType,
 } from './types';
+import {
+  defaultRewardsControllerState,
+  getRewardsControllerDefaultState,
+} from './defaultState';
 import type { RewardsControllerMessenger } from '../../messengers/rewards-controller-messenger';
 import {
   storeSubscriptionToken,
@@ -308,36 +312,7 @@ const metadata: StateMetadata<RewardsControllerState> = {
   },
 };
 
-/**
- * Get the default state for the RewardsController
- */
-export const getRewardsControllerDefaultState = (): RewardsControllerState => ({
-  activeAccount: null,
-  accounts: {},
-  subscriptions: {},
-  subscriptionBenefits: {},
-  seasons: {},
-  subscriptionReferralDetails: {},
-  seasonStatuses: {},
-  activeBoosts: {},
-  unlockedRewards: {},
-  pointsEvents: {},
-  offDeviceSubscriptionAccounts: {},
-  campaigns: {},
-  campaignParticipantStatus: {},
-  ondoCampaignLeaderboard: {},
-  ondoCampaignLeaderboardPositions: {},
-  ondoCampaignPortfolio: {},
-  ondoCampaignActivity: {},
-  ondoCampaignDeposits: {},
-  perpsTradingCampaignLeaderboard: {},
-  perpsTradingCampaignLeaderboardPositions: {},
-  perpsTradingCampaignVolume: {},
-  pointsEstimateHistory: [],
-  rewardsEnvUrl: null,
-});
-
-export const defaultRewardsControllerState = getRewardsControllerDefaultState();
+export { defaultRewardsControllerState, getRewardsControllerDefaultState };
 
 type CacheReader<T> = (
   key: string,

app/core/Engine/controllers/rewards-controller/defaultState.ts

@@ -0,0 +1,32 @@
+import type { RewardsControllerState } from './types';
+
+/**
+ * Get the default state for the RewardsController.
+ */
+export const getRewardsControllerDefaultState = (): RewardsControllerState => ({
+  activeAccount: null,
+  accounts: {},
+  subscriptions: {},
+  subscriptionBenefits: {},
+  seasons: {},
+  subscriptionReferralDetails: {},
+  seasonStatuses: {},
+  activeBoosts: {},
+  unlockedRewards: {},
+  pointsEvents: {},
+  offDeviceSubscriptionAccounts: {},
+  campaigns: {},
+  campaignParticipantStatus: {},
+  ondoCampaignLeaderboard: {},
+  ondoCampaignLeaderboardPositions: {},
+  ondoCampaignPortfolio: {},
+  ondoCampaignActivity: {},
+  ondoCampaignDeposits: {},
+  perpsTradingCampaignLeaderboard: {},
+  perpsTradingCampaignLeaderboardPositions: {},
+  perpsTradingCampaignVolume: {},
+  pointsEstimateHistory: [],
+  rewardsEnvUrl: null,
+});
+
+export const defaultRewardsControllerState = getRewardsControllerDefaultState();

app/reducers/rewards/index.test.ts

@@ -2328,6 +2328,27 @@ describe('rewardsReducer', () => {
       );
     });
 
+    it('should default persisted season arrays to empty arrays when absent', () => {
+      const persistedRewardsStateWithoutFields = {
+        ...initialState,
+        seasonTiers: undefined,
+        seasonActivityTypes: undefined,
+        seasonWaysToEarn: undefined,
+      } as unknown as RewardsState;
+      const rehydrateAction = {
+        type: 'persist/REHYDRATE',
+        payload: {
+          rewards: persistedRewardsStateWithoutFields,
+        },
+      };
+
+      const state = rewardsReducer(initialState, rehydrateAction);
+
+      expect(state.seasonTiers).toEqual([]);
+      expect(state.seasonActivityTypes).toEqual([]);
+      expect(state.seasonWaysToEarn).toEqual([]);
+    });
+
     it('should preserve all persisted UI state fields', () => {
       // Arrange
       const persistedRewardsState: RewardsState = {
@@ -2681,6 +2702,21 @@ describe('rewardsReducer', () => {
 
       expect(state.ondoCampaignActivity).toEqual({});
     });
+
+    it('should default campaigns to [] when absent from persisted state (upgrade path)', () => {
+      const persistedRewardsStateWithoutField = {
+        ...initialState,
+        campaigns: undefined,
+      } as unknown as RewardsState;
+      const rehydrateAction = {
+        type: 'persist/REHYDRATE',
+        payload: { rewards: persistedRewardsStateWithoutField },
+      };
+
+      const state = rewardsReducer(initialState, rehydrateAction);
+
+      expect(state.campaigns).toEqual([]);
+    });
   });
 
   describe('unknown actions', () => {
@@ -4623,6 +4659,17 @@ describe('setBenefits', () => {
     expect(state.benefits).toEqual(mockBenefitsPayload.benefits);
   });
 
+  it('sets benefits to empty array when payload benefits are missing', () => {
+    const action = setBenefits({
+      ...mockBenefitsPayload,
+      benefits: undefined,
+    } as unknown as typeof mockBenefitsPayload);
+
+    const state = rewardsReducer(initialState, action);
+
+    expect(state.benefits).toEqual([]);
+  });
+
   it('replaces existing benefits with new payload benefits', () => {
     const stateWithBenefits: RewardsState = {
       ...initialState,

app/reducers/rewards/index.ts

@@ -687,7 +687,7 @@ const rewardsSlice = createSlice({
     },
 
     setBenefits: (state, action: PayloadAction<SubscriptionBenefitsState>) => {
-      state.benefits = action.payload.benefits;
+      state.benefits = action.payload.benefits ?? [];
     },
 
     setBenefitsLoading: (state, action: PayloadAction<boolean>) => {
@@ -897,9 +897,10 @@ const rewardsSlice = createSlice({
               seasonName: action.payload.rewards.seasonName,
               seasonStartDate: action.payload.rewards.seasonStartDate,
               seasonEndDate: action.payload.rewards.seasonEndDate,
-              seasonTiers: action.payload.rewards.seasonTiers,
-              seasonActivityTypes: action.payload.rewards.seasonActivityTypes,
-              seasonWaysToEarn: action.payload.rewards.seasonWaysToEarn,
+              seasonTiers: action.payload.rewards.seasonTiers ?? [],
+              seasonActivityTypes:
+                action.payload.rewards.seasonActivityTypes ?? [],
+              seasonWaysToEarn: action.payload.rewards.seasonWaysToEarn ?? [],
               referralCode: action.payload.rewards.referralCode,
               refereeCount: action.payload.rewards.refereeCount,
               currentTier: action.payload.rewards.currentTier,
@@ -912,7 +913,7 @@ const rewardsSlice = createSlice({
               activeBoosts: action.payload.rewards.activeBoosts,
               pointsEvents: action.payload.rewards.pointsEvents,
               unlockedRewards: action.payload.rewards.unlockedRewards,
-              campaigns: action.payload.rewards.campaigns,
+              campaigns: action.payload.rewards.campaigns ?? [],
               campaignParticipantStatuses:
                 action.payload.rewards.campaignParticipantStatuses ?? {},
               ondoCampaignLeaderboardPositions: