Merge pull request #1738 from gnosis/fix/modal-close

Fix - Send Again modal close on its own

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 {

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)
   }

src/routes/safe/components/Transactions/TxsTable/ExpandedTx/index.tsx

@@ -73,13 +73,11 @@ const ExpandedModuleTx = ({ tx }: { tx: SafeModuleTransaction }): ReactElement =
           </Block>
           <Hairline />
           <Block className={cn(classes.txDataContainer, classes.incomingTxBlock)}>
-            {recipient && (
-              <TransferDescription
-                amountWithSymbol={amountWithSymbol}
-                isTokenTransfer={!sameAddress(amountWithSymbol, NOT_AVAILABLE)}
-                recipient={recipient}
-              />
-            )}
+            <TransferDescription
+              amountWithSymbol={amountWithSymbol}
+              isTokenTransfer={!sameAddress(amountWithSymbol, NOT_AVAILABLE)}
+              recipient={recipient}
+            />
           </Block>
         </Col>
       </Row>

src/routes/safe/components/Transactions/TxsTable/index.tsx

@@ -121,12 +121,9 @@ const TxsTable = (): React.ReactElement => {
                       colSpan={6}
                       style={{ paddingBottom: 0, paddingTop: 0 }}
                     >
-                      <Collapse
-                        component={() => <ExpandedTx row={row} />}
-                        in={expandedTx === rowId}
-                        timeout="auto"
-                        unmountOnExit
-                      />
+                      <Collapse in={expandedTx === rowId} unmountOnExit>
+                        <ExpandedTx row={row} />
+                      </Collapse>
                     </TableCell>
                   </TableRow>
                 </React.Fragment>