diff --git a/components/brave_wallet_ui/panel/container.tsx b/components/brave_wallet_ui/panel/container.tsx index 695f99c44313..c922f7e4f3e2 100644 --- a/components/brave_wallet_ui/panel/container.tsx +++ b/components/brave_wallet_ui/panel/container.tsx @@ -114,6 +114,13 @@ function Container() { PanelSelectors.signMessageErrorData ) + const signTransactionRequests = useUnsafePanelSelector( + PanelSelectors.signTransactionRequests + ) + const signAllTransactionsRequests = useUnsafePanelSelector( + PanelSelectors.signAllTransactionsRequests + ) + // queries & mutations const { accounts } = useAccountsQuery() const { data: selectedAccount } = useSelectedAccountQuery() @@ -188,7 +195,10 @@ function Container() { if ( selectedAccount && - (selectedPendingTransaction || signMessageData.length) && + (selectedPendingTransaction || + signMessageData.length || + signAllTransactionsRequests.length || + signTransactionRequests.length) && selectedPanel === 'connectHardwareWallet' ) { return ( @@ -289,8 +299,10 @@ function Container() { } if ( - selectedPanel === 'signTransaction' || - selectedPanel === 'signAllTransactions' + (signAllTransactionsRequests.length > 0 || + signTransactionRequests.length > 0) && + (selectedPanel === 'signTransaction' || + selectedPanel === 'signAllTransactions') ) { return (