diff --git a/packages/kit-bg/src/providers/ProviderApiWebln.ts b/packages/kit-bg/src/providers/ProviderApiWebln.ts index 3f41cd09160..08daab1e613 100644 --- a/packages/kit-bg/src/providers/ProviderApiWebln.ts +++ b/packages/kit-bg/src/providers/ProviderApiWebln.ts @@ -271,7 +271,10 @@ class ProviderApiWebln extends ProviderApiBase { case 'login': { return this.backgroundApi.serviceDApp.openModal({ request, - screens: [EModalRoutes.SendModal, EModalSendRoutes.LnurlAuth], + screens: [ + EModalRoutes.SignatureConfirmModal, + EModalSignatureConfirmRoutes.LnurlAuth, + ], params: { networkId, accountId, @@ -282,7 +285,10 @@ class ProviderApiWebln extends ProviderApiBase { case 'payRequest': { return this.backgroundApi.serviceDApp.openModal({ request, - screens: [EModalRoutes.SendModal, EModalSendRoutes.LnurlPayRequest], + screens: [ + EModalRoutes.SignatureConfirmModal, + EModalSignatureConfirmRoutes.LnurlPayRequest, + ], params: { networkId, accountId, @@ -300,7 +306,10 @@ class ProviderApiWebln extends ProviderApiBase { case 'withdrawRequest': { return this.backgroundApi.serviceDApp.openModal({ request, - screens: [EModalRoutes.SendModal, EModalSendRoutes.LnurlWithdraw], + screens: [ + EModalRoutes.SignatureConfirmModal, + EModalSignatureConfirmRoutes.LnurlWithdraw, + ], params: { networkId, accountId, diff --git a/packages/kit/src/views/LightningNetwork/pages/Send/LnurlAuthModal.tsx b/packages/kit/src/views/LightningNetwork/pages/Send/LnurlAuthModal.tsx index 6dbe1615758..63f3f2612b5 100644 --- a/packages/kit/src/views/LightningNetwork/pages/Send/LnurlAuthModal.tsx +++ b/packages/kit/src/views/LightningNetwork/pages/Send/LnurlAuthModal.tsx @@ -13,8 +13,8 @@ import DappOpenModalPage from '@onekeyhq/kit/src/views/DAppConnection/pages/Dapp import { OneKeyError } from '@onekeyhq/shared/src/errors'; import { ETranslations } from '@onekeyhq/shared/src/locale'; import type { - EModalSendRoutes, - IModalSendParamList, + EModalSignatureConfirmRoutes, + IModalSignatureConfirmParamList, } from '@onekeyhq/shared/src/routes'; import { EDAppModalPageStatus } from '@onekeyhq/shared/types/dappConnection'; @@ -35,11 +35,18 @@ function LnurlAuthModal() { const intl = useIntl(); const navigation = useAppNavigation(); const route = - useRoute>(); + useRoute< + RouteProp< + IModalSignatureConfirmParamList, + EModalSignatureConfirmRoutes.LnurlAuth + > + >(); const routeParams = route.params; const { isSendFlow } = routeParams; const dAppQuery = - useDappQuery(); + useDappQuery< + IModalSignatureConfirmParamList[EModalSignatureConfirmRoutes.LnurlAuth] + >(); const { $sourceInfo } = dAppQuery; const { accountId, networkId, lnurlDetails } = isSendFlow ? routeParams diff --git a/packages/kit/src/views/LightningNetwork/pages/Send/LnurlPayRequestModal.tsx b/packages/kit/src/views/LightningNetwork/pages/Send/LnurlPayRequestModal.tsx index 7fd4b751d0c..1a6682de3d6 100644 --- a/packages/kit/src/views/LightningNetwork/pages/Send/LnurlPayRequestModal.tsx +++ b/packages/kit/src/views/LightningNetwork/pages/Send/LnurlPayRequestModal.tsx @@ -17,8 +17,8 @@ import type { ITransferInfo } from '@onekeyhq/kit-bg/src/vaults/types'; import { OneKeyError } from '@onekeyhq/shared/src/errors'; import { ETranslations } from '@onekeyhq/shared/src/locale'; import type { - EModalSendRoutes, - IModalSendParamList, + EModalSignatureConfirmRoutes, + IModalSignatureConfirmParamList, } from '@onekeyhq/shared/src/routes'; import { EDAppModalPageStatus } from '@onekeyhq/shared/types/dappConnection'; import type { ILNURLPaymentInfo } from '@onekeyhq/shared/types/lightning'; @@ -41,11 +41,16 @@ function LnurlPayRequestModal() { const intl = useIntl(); const route = useRoute< - RouteProp + RouteProp< + IModalSignatureConfirmParamList, + EModalSignatureConfirmRoutes.LnurlPayRequest + > >(); const routeParams = route.params; const dAppQuery = - useDappQuery(); + useDappQuery< + IModalSignatureConfirmParamList[EModalSignatureConfirmRoutes.LnurlPayRequest] + >(); const { $sourceInfo } = dAppQuery; const { accountId, networkId, lnurlDetails, transfersInfo } = routeParams.isSendFlow ? routeParams : dAppQuery; diff --git a/packages/kit/src/views/LightningNetwork/pages/Send/LnurlWithdrawModal.tsx b/packages/kit/src/views/LightningNetwork/pages/Send/LnurlWithdrawModal.tsx index 9511dee0b33..7202d565637 100644 --- a/packages/kit/src/views/LightningNetwork/pages/Send/LnurlWithdrawModal.tsx +++ b/packages/kit/src/views/LightningNetwork/pages/Send/LnurlWithdrawModal.tsx @@ -12,8 +12,8 @@ import DappOpenModalPage from '@onekeyhq/kit/src/views/DAppConnection/pages/Dapp import { OneKeyError } from '@onekeyhq/shared/src/errors'; import { ETranslations } from '@onekeyhq/shared/src/locale'; import type { - EModalSendRoutes, - IModalSendParamList, + EModalSignatureConfirmRoutes, + IModalSignatureConfirmParamList, } from '@onekeyhq/shared/src/routes'; import { EDAppModalPageStatus } from '@onekeyhq/shared/types/dappConnection'; @@ -34,12 +34,19 @@ import type { RouteProp } from '@react-navigation/core'; function LnurlWithdrawModal() { const intl = useIntl(); const route = - useRoute>(); + useRoute< + RouteProp< + IModalSignatureConfirmParamList, + EModalSignatureConfirmRoutes.LnurlWithdraw + > + >(); const routeParams = route.params; const { isSendFlow } = routeParams; const dAppQuery = - useDappQuery(); + useDappQuery< + IModalSignatureConfirmParamList[EModalSignatureConfirmRoutes.LnurlWithdraw] + >(); const { $sourceInfo } = dAppQuery; const { accountId, networkId, lnurlDetails } = isSendFlow ? routeParams diff --git a/packages/kit/src/views/Send/router/index.ts b/packages/kit/src/views/Send/router/index.ts index d6c88567543..3b88e74f59e 100644 --- a/packages/kit/src/views/Send/router/index.ts +++ b/packages/kit/src/views/Send/router/index.ts @@ -19,34 +19,6 @@ const SendReplaceTx = LazyLoadPage( ), ); -const LnurlPayRequestModal = LazyLoadPage( - () => - import( - '@onekeyhq/kit/src/views/LightningNetwork/pages/Send/LnurlPayRequestModal' - ), -); - -const LnurlWithdrawModal = LazyLoadPage( - () => - import( - '@onekeyhq/kit/src/views/LightningNetwork/pages/Send/LnurlWithdrawModal' - ), -); - -const LnurlAuthModal = LazyLoadPage( - () => - import( - '@onekeyhq/kit/src/views/LightningNetwork/pages/Send/LnurlAuthModal' - ), -); - -const WeblnSendPaymentModal = LazyLoadPage( - () => - import( - '@onekeyhq/kit/src/views/LightningNetwork/pages/Webln/WeblnSendPaymentModal' - ), -); - const TokenSelector = LazyLoadPage( () => import('@onekeyhq/kit/src/views/AssetSelector/pages/TokenSelector'), ); @@ -94,18 +66,7 @@ export const ModalSendStack: IModalFlowNavigatorConfig< name: EModalSendRoutes.SendReplaceTx, component: SendReplaceTx, }, - { - name: EModalSendRoutes.LnurlPayRequest, - component: LnurlPayRequestModal, - }, - { - name: EModalSendRoutes.LnurlWithdraw, - component: LnurlWithdrawModal, - }, - { - name: EModalSendRoutes.LnurlAuth, - component: LnurlAuthModal, - }, + // TODO: The following two pages seem to not be referenced anywhere, consider removing them { name: EModalSendRoutes.SendSelectToken, component: TokenSelector, diff --git a/packages/shared/src/routes/send.ts b/packages/shared/src/routes/send.ts index 9373795224b..06ce17b05fa 100644 --- a/packages/shared/src/routes/send.ts +++ b/packages/shared/src/routes/send.ts @@ -2,7 +2,6 @@ import type { IEncodedTx, IUnsignedTxPro } from '@onekeyhq/core/src/types'; import type { IAccountDeriveInfo, IAccountDeriveTypes, - ITransferInfo, ITransferPayload, } from '@onekeyhq/kit-bg/src/vaults/types'; import type { IDappSourceInfo } from '@onekeyhq/shared/types'; @@ -13,11 +12,6 @@ import type { ITokenSelectorParamList } from './assetSelector'; import type { INetworkAccount } from '../../types/account'; import type { EDeriveAddressActionType } from '../../types/address'; import type { IAccountHistoryTx } from '../../types/history'; -import type { - ILNURLAuthServiceResponse, - ILNURLPayServiceResponse, - ILNURLWithdrawServiceResponse, -} from '../../types/lightning'; import type { EReplaceTxType, ISendTxOnSuccessData } from '../../types/tx'; export enum EModalSendRoutes { @@ -29,12 +23,6 @@ export enum EModalSendRoutes { SendReplaceTx = 'SendReplaceTx', SendSelectToken = 'SendSelectToken', SendSelectDeriveAddress = 'SendSelectDeriveAddress', - - // Lightning Network - LnurlPayRequest = 'LnurlPayRequest', - LnurlWithdraw = 'LnurlWithdraw', - LnurlAuth = 'LnurlAuth', - WeblnSendPayment = 'WeblnSendPayment', } export type IModalSendParamList = { @@ -88,32 +76,6 @@ export type IModalSendParamList = { historyTx: IAccountHistoryTx; onSuccess?: (data: ISendTxOnSuccessData[]) => void; }; - - // Lightning Network - [EModalSendRoutes.LnurlPayRequest]: { - networkId: string; - accountId: string; - transfersInfo: ITransferInfo[]; - lnurlDetails: ILNURLPayServiceResponse; - sourceInfo?: IDappSourceInfo; - onSuccess?: (txs: ISendTxOnSuccessData[]) => void; - onFail?: (error: Error) => void; - onCancel?: () => void; - isSendFlow?: boolean; - }; - [EModalSendRoutes.LnurlWithdraw]: { - networkId: string; - accountId: string; - lnurlDetails: ILNURLWithdrawServiceResponse; - sourceInfo?: IDappSourceInfo; - isSendFlow?: boolean; - }; - [EModalSendRoutes.LnurlAuth]: { - networkId: string; - accountId: string; - lnurlDetails: ILNURLAuthServiceResponse; - isSendFlow: boolean; - }; [EModalSendRoutes.SendSelectDeriveAddress]: { networkId: string; indexedAccountId: string;