Skip to content

fix(perps): use selected EVM account for withdraw confirmation batch #32001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dan437 wants to merge 4 commits into
base: main
Choose a base branch
from
+9 −1
Draft

fix(perps): use selected EVM account for withdraw confirmation batch #32001

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c76ef29
fix(perps): use selected EVM account for withdraw confirmation batch
dan437 Jun 18, 2026
9d7eff7
Merge remote-tracking branch 'origin/main' into conf-1543-perps-withd…
dan437 Jun 18, 2026
f57b4c7
fix(perps): guard withdraw EVM account resolution against partial state
dan437 Jun 18, 2026
6274dd8
fix(perps): resolve withdraw EVM account without throwing on partial …
dan437 Jun 18, 2026
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
10 changes: 9 additions & 1 deletion app/components/UI/Perps/hooks/usePerpsWithdrawConfirmation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useSelector } from 'react-redux';
import { addTransactionBatch } from '../../../../util/transaction-controller';
import { selectDefaultEndpointByChainId } from '../../../../selectors/networkController';
import { selectSelectedInternalAccountAddress } from '../../../../selectors/accountsController';
import { selectSelectedInternalAccountByScope } from '../../../../selectors/multichainAccounts/accounts';
import { generateTransferData } from '../../../../util/transactions';
import { useConfirmNavigation } from '../../../Views/confirmations/hooks/useConfirmNavigation';
import { ConfirmationLoader } from '../../../Views/confirmations/components/confirm/confirm-component';
Expand Down Expand Up @@ -63,7 +64,14 @@ function isUserRejectedError(error: unknown, fallbackMessage: string): boolean {
* CustomAmount / MetaMask Pay experience.
*/
export function usePerpsWithdrawConfirmation() {
const selectedAccount = useSelector(selectSelectedInternalAccountAddress);
// Perps withdraws settle on Arbitrum, so the batch must originate from the
// selected group's EVM account; the globally selected account can be non-EVM.
const selectedAccount = useSelector((state: RootState) => {
const evmAddress = state.engine?.backgroundState?.AccountTreeController
? selectSelectedInternalAccountByScope(state)('eip155:1')?.address
: undefined;
return evmAddress ?? selectSelectedInternalAccountAddress(state);
});
const { navigateToConfirmation } = useConfirmNavigation();
const navigation = useNavigation();
const { showToast, PerpsToastOptions } = usePerpsToasts();
Expand Down
Loading