Do not show block if relaying not enabled at all

src/components/tx/SignOrExecuteForm/ExecuteForm.tsx

@@ -52,13 +52,14 @@ const ExecuteForm = ({
   // Check that the transaction is executable
   const isExecutionLoop = useIsExecutionLoop()
 
-  // We default to relay, but the option is only shown if we canRelay
-  const [executionMethod, setExecutionMethod] = useState(ExecutionMethod.RELAY)
-
   // SC wallets can relay fully signed transactions
-  const [canRelay] = useWalletCanRelay(safeTx)
+  const [canWalletRelay] = useWalletCanRelay(safeTx)
+  // We default to relay
+  const [executionMethod, setExecutionMethod] = useState(
+    canWalletRelay ? ExecutionMethod.RELAY : ExecutionMethod.WALLET,
+  )
   // The transaction can/will be relayed
-  const willRelay = canRelay && executionMethod === ExecutionMethod.RELAY
+  const willRelay = executionMethod === ExecutionMethod.RELAY
   const hasRelays = !!relays?.remaining
 
   // Estimate gas limit
@@ -111,7 +112,7 @@ const ExecuteForm = ({
   return (
     <>
       <form onSubmit={handleSubmit}>
-        <div className={classNames(css.params, { [css.noBottomBorderRadius]: canRelay })}>
+        <div className={classNames(css.params, { [css.noBottomBorderRadius]: canWalletRelay })}>
           <AdvancedParams
             willExecute
             params={advancedParams}
@@ -121,7 +122,7 @@ const ExecuteForm = ({
             willRelay={willRelay}
           />
 
-          {canRelay && (
+          {canWalletRelay && (
             <div className={css.noTopBorder}>
               <ExecutionMethodSelector
                 executionMethod={executionMethod}

src/hooks/useWalletCanRelay.ts

@@ -4,14 +4,18 @@ import useWallet from '@/hooks/wallets/useWallet'
 import { isSmartContractWallet } from '@/utils/wallets'
 import { Errors, logError } from '@/services/exceptions'
 import { type SafeTransaction } from '@safe-global/safe-core-sdk-types'
+import { FEATURES, hasFeature } from '@/utils/chains'
+import { useCurrentChain } from './useChains'
 
 const useWalletCanRelay = (tx: SafeTransaction | undefined) => {
   const { safe } = useSafeInfo()
   const wallet = useWallet()
+  const chain = useCurrentChain()
+  const isFeatureEnabled = chain && hasFeature(chain, FEATURES.RELAYING)
   const hasEnoughSignatures = tx && tx.signatures.size >= safe.threshold
 
   return useAsync(() => {
-    if (!tx || !wallet) return
+    if (!isFeatureEnabled || !tx || !wallet) return
 
     return isSmartContractWallet(wallet)
       .then((isSCWallet) => {
@@ -23,7 +27,7 @@ const useWalletCanRelay = (tx: SafeTransaction | undefined) => {
         logError(Errors._106, err.message)
         return false
       })
-  }, [hasEnoughSignatures, tx, wallet])
+  }, [isFeatureEnabled, hasEnoughSignatures, tx, wallet])
 }
 
 export default useWalletCanRelay