Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions app/components/UI/Earn/Earn.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@ export interface GasImpactModalParams {
chainId: string;
}

/** Earn screens parameters */
export interface EarnScreensParams {
screen?: string;
params?: {
token?: Record<string, unknown>;
};
}

/**
* Lending deposit confirmation parameters
* Matches LendingDepositViewRouteParams in EarnLendingDepositConfirmationView
Expand Down
8 changes: 6 additions & 2 deletions app/components/UI/Earn/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ import {
clearNativeStackNavigatorOptions,
transparentModalScreenOptions,
} from '../../../../constants/navigation/clearStackNavigatorOptions';
import type {
EarnModalsNavigationParamList,
EarnScreensStackParamList,
} from '../types/navigation';

const Stack = createNativeStackNavigator();
const ModalStack = createNativeStackNavigator();
const Stack = createNativeStackNavigator<EarnScreensStackParamList>();
const ModalStack = createNativeStackNavigator<EarnModalsNavigationParamList>();

const EarnScreenStack = () => {
const emptyNavHeaderOptions = useEmptyNavHeaderForConfirmations();
Expand Down
48 changes: 48 additions & 0 deletions app/components/UI/Earn/types/navigation.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import type { NavigatorScreenParams } from '@react-navigation/native';
import type { ConfirmationParams } from '../../../Views/confirmations/components/confirm/confirm-component';
import type { EarnMusdConversionEducationViewRouteParams } from '../Views/EarnMusdConversionEducationView';
import type {
LendingDepositConfirmationParams,
LendingMaxWithdrawalModalParams,
LendingWithdrawalConfirmationParams,
} from '../Earn.types';

/**
* Param list for screens inside the Earn screen stack (`EarnScreenStack`).
*/
// ParamListBase requires `type`; `interface` cannot satisfy it.
// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
export type EarnScreensStackParamList = {
EarnLendingDepositConfirmation: LendingDepositConfirmationParams | undefined;
EarnLendingWithdrawalConfirmation:
| LendingWithdrawalConfirmationParams
| undefined;
EarnMusdConversionEducation:
| EarnMusdConversionEducationViewRouteParams
| undefined;
RedesignedConfirmations: ConfirmationParams | undefined;
};

/**
* Param list for screens inside the Earn modal stack (`EarnModalStack`).
*/
// ParamListBase requires `type`; `interface` cannot satisfy it.
// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
export type EarnModalsNavigationParamList = {
EarnLendingMaxWithdrawalModal: LendingMaxWithdrawalModalParams | undefined;
EarnLendingLearnMoreModal: undefined;
RedesignedConfirmations: ConfirmationParams | undefined;
};

/**
* Feature-level Earn navigation params for nested `EarnScreens` / `EarnModals` entry.
*/
// Intersection (`&`) requires `type`; `interface` cannot express this.
// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
export type EarnNavigationParamList = EarnScreensStackParamList &
EarnModalsNavigationParamList & {
EarnScreens: NavigatorScreenParams<EarnScreensStackParamList> | undefined;
EarnModals:
| NavigatorScreenParams<EarnModalsNavigationParamList>
| undefined;
};
27 changes: 11 additions & 16 deletions app/core/NavigationService/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,12 @@ import type {
LearnMoreModalParams,
MaxInputModalParams,
GasImpactModalParams,
EarnScreensParams,
LendingDepositConfirmationParams,
LendingWithdrawalConfirmationParams,
LendingMaxWithdrawalModalParams,
} from '../../components/UI/Earn/Earn.types';
import type { EarnTokenListViewRouteParams } from '../../components/UI/Earn/components/EarnTokenList';
import type { EarnMusdConversionEducationViewRouteParams } from '../../components/UI/Earn/Views/EarnMusdConversionEducationView';
import type {
EarnModalsNavigationParamList,
EarnScreensStackParamList,
} from '../../components/UI/Earn/types/navigation';

// Modal params
import type {
Expand Down Expand Up @@ -879,17 +878,13 @@ export type RootStackParamList = {
EarnTokenList: EarnTokenListViewRouteParams | undefined;

// Earn routes
EarnScreens: EarnScreensParams | undefined;
EarnLendingDepositConfirmation: LendingDepositConfirmationParams | undefined;
EarnLendingWithdrawalConfirmation:
| LendingWithdrawalConfirmationParams
| undefined;
EarnMusdConversionEducation:
| EarnMusdConversionEducationViewRouteParams
| undefined;
EarnModals: NestedNavigationParams | undefined;
EarnLendingMaxWithdrawalModal: LendingMaxWithdrawalModalParams | undefined;
EarnLendingLearnMoreModal: undefined;
EarnScreens: NavigatorScreenParams<EarnScreensStackParamList> | undefined;
EarnLendingDepositConfirmation: EarnScreensStackParamList['EarnLendingDepositConfirmation'];
EarnLendingWithdrawalConfirmation: EarnScreensStackParamList['EarnLendingWithdrawalConfirmation'];
EarnMusdConversionEducation: EarnScreensStackParamList['EarnMusdConversionEducation'];
EarnModals: NavigatorScreenParams<EarnModalsNavigationParamList> | undefined;
EarnLendingMaxWithdrawalModal: EarnModalsNavigationParamList['EarnLendingMaxWithdrawalModal'];
EarnLendingLearnMoreModal: EarnModalsNavigationParamList['EarnLendingLearnMoreModal'];

// Full screen confirmation routes
RedesignedConfirmations: undefined;
Expand Down
Loading