diff --git a/src/logic/safe/store/actions/transactions/utils/transactionHelpers.ts b/src/logic/safe/store/actions/transactions/utils/transactionHelpers.ts index b776b71c..fcc32275 100644 --- a/src/logic/safe/store/actions/transactions/utils/transactionHelpers.ts +++ b/src/logic/safe/store/actions/transactions/utils/transactionHelpers.ts @@ -173,12 +173,12 @@ export const calculateTransactionStatus = ( if (tx.isExecuted && tx.isSuccessful) { txStatus = TransactionStatus.SUCCESS + } else if (tx.creationTx) { + txStatus = TransactionStatus.SUCCESS } else if (tx.cancelled || nonce > tx.nonce) { txStatus = TransactionStatus.CANCELLED } else if (tx.confirmations.size === threshold) { txStatus = TransactionStatus.AWAITING_EXECUTION - } else if (tx.creationTx) { - txStatus = TransactionStatus.SUCCESS } else if (!!tx.isPending) { txStatus = TransactionStatus.PENDING } else { diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/TransferDescription.tsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/TransferDescription.tsx index 91a324ca..58a7c2a6 100644 --- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/TransferDescription.tsx +++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/TransferDescription.tsx @@ -26,7 +26,6 @@ const TransferDescription = ({ }: TransferDescriptionProps): ReactElement | null => { const recipientName = useSelector((state) => getNameFromAddressBookSelector(state, recipient)) const [sendModalOpen, setSendModalOpen] = React.useState(false) - const sendModalOpenHandler = () => { setSendModalOpen(true) } diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/index.tsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/index.tsx index 22e8de7e..123f8559 100644 --- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/index.tsx +++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/index.tsx @@ -73,13 +73,11 @@ const ExpandedModuleTx = ({ tx }: { tx: SafeModuleTransaction }): ReactElement = - {recipient && ( - - )} + diff --git a/src/routes/safe/components/Transactions/TxsTable/index.tsx b/src/routes/safe/components/Transactions/TxsTable/index.tsx index 47dc03ea..0e5b2687 100644 --- a/src/routes/safe/components/Transactions/TxsTable/index.tsx +++ b/src/routes/safe/components/Transactions/TxsTable/index.tsx @@ -121,12 +121,9 @@ const TxsTable = (): React.ReactElement => { colSpan={6} style={{ paddingBottom: 0, paddingTop: 0 }} > - } - in={expandedTx === rowId} - timeout="auto" - unmountOnExit - /> + + +