Merge branch 'fix/balance-table-sort' of github.com:gnosis/safe-react into fix/balance-table-sort

This commit is contained in:
Mati Dastugue 2020-12-28 14:10:38 -03:00
commit 6369d872f8
3 changed files with 8 additions and 14 deletions

View File

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

View File

@ -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}
/>
)}
</Block>
</Col>
</Row>

View File

@ -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>