@@ -52,6 +52,7 @@ import {
52
52
getMemoizedUnapprovedTemplatedConfirmations ,
53
53
///: END:ONLY_INCLUDE_IF
54
54
getNetworkConfigurationIdByChainId ,
55
+ isSolanaAccount ,
55
56
} from '../../../selectors' ;
56
57
import Tooltip from '../../ui/tooltip' ;
57
58
///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
@@ -170,6 +171,9 @@ const CoinButtons = ({
170
171
171
172
const isExternalServicesEnabled = useSelector ( getUseExternalServices ) ;
172
173
174
+ const isSolanaAccountWithoutExternalServices =
175
+ ! isExternalServicesEnabled && isSolanaAccount ( account ) ;
176
+
173
177
const buttonTooltips = {
174
178
buyButton : [
175
179
///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
@@ -463,7 +467,11 @@ const CoinButtons = ({
463
467
< IconButton
464
468
className = { `${ classPrefix } -overview__button` }
465
469
iconButtonClassName = { iconButtonClassName }
466
- disabled = { ! isBridgeChain || ! isSigningEnabled }
470
+ disabled = {
471
+ ! isSwapsChain ||
472
+ ! isSigningEnabled ||
473
+ isSolanaAccountWithoutExternalServices
474
+ }
467
475
data-testid = { `${ classPrefix } -overview-bridge` }
468
476
Icon = {
469
477
< Icon
@@ -491,7 +499,7 @@ const CoinButtons = ({
491
499
size = { IconSize . Sm }
492
500
/>
493
501
}
494
- disabled = { ! isSigningEnabled }
502
+ disabled = { ! isSigningEnabled || isSolanaAccountWithoutExternalServices }
495
503
label = { t ( 'send' ) }
496
504
onClick = { handleSendOnClick }
497
505
tooltipRender = { ( contents : React . ReactElement ) =>
0 commit comments