diff --git a/cypress/support/localstorage_data.js b/cypress/support/localstorage_data.js index 7b0ac24805..3f8541d464 100644 --- a/cypress/support/localstorage_data.js +++ b/cypress/support/localstorage_data.js @@ -7,7 +7,7 @@ const cookieState = { updates: true, analytics: true, terms: true, - termsVersion: CURRENT_COOKIE_TERMS_VERSION + termsVersion: CURRENT_COOKIE_TERMS_VERSION, } export const batchData = { diff --git a/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx b/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx index 0ae70a4613..bff1200c59 100644 --- a/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx +++ b/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx @@ -135,12 +135,6 @@ export const SignOrExecuteForm = ({ {props.children} - {!props.isRejection && ( - Error parsing data}> - {isApproval && } - - )} - + > + {!props.isRejection && ( + Error parsing data}> + {isApproval && } + + )} + {!isCounterfactualSafe && !props.isRejection && } diff --git a/src/components/tx/confirmation-views/index.tsx b/src/components/tx/confirmation-views/index.tsx index 12a46e8cc4..7c09d850d2 100644 --- a/src/components/tx/confirmation-views/index.tsx +++ b/src/components/tx/confirmation-views/index.tsx @@ -8,7 +8,7 @@ import ConfirmationOrder from '../ConfirmationOrder' import useDecodeTx from '@/hooks/useDecodeTx' import type { SafeTransaction } from '@safe-global/safe-core-sdk-types' import { isCustomTxInfo, isGenericConfirmation } from '@/utils/transaction-guards' -import { useMemo } from 'react' +import { type ReactNode, useMemo } from 'react' import TxData from '@/components/transactions/TxDetails/TxData' import type { NarrowConfirmationViewProps } from './types' import SettingsChange from './SettingsChange' @@ -22,6 +22,7 @@ type ConfirmationViewProps = { isApproval?: boolean isCreation?: boolean showMethodCall?: boolean + children?: ReactNode } const getConfirmationViewComponent = ({ txDetails, txInfo }: NarrowConfirmationViewProps) => { @@ -60,6 +61,8 @@ const ConfirmationView = (props: ConfirmationViewProps) => { {decodedData && } + {props.children} +