status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(Fix) Native Coin transfer not shown (#1670) 

* allow to display native coin transfers in the expanded view

* fix issue with fragment being passed to material-ui menu
This commit is contained in:
Fernando 2020-11-30 13:10:42 -03:00 committed by GitHub
parent 8d73ebd177
commit 76ef99fa96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/routes/safe/components/AddressBook/EllipsisTransactionDetails/index.tsx
View File

@ -63,12 +63,14 @@ export const EllipsisTransactionDetails = ({
<div className={classes.container} role="menu" tabIndex={0}> <div className={classes.container} role="menu" tabIndex={0}>
<MoreHorizIcon onClick={handleClick} onKeyDown={handleClick} /> <MoreHorizIcon onClick={handleClick} onKeyDown={handleClick} />
<Menu anchorEl={anchorEl} id="simple-menu" keepMounted onClose={closeMenuHandler} open={Boolean(anchorEl)}> <Menu anchorEl={anchorEl} id="simple-menu" keepMounted onClose={closeMenuHandler} open={Boolean(anchorEl)}>
{sendModalOpenHandler ? ( {sendModalOpenHandler
<> ? [
<MenuItem onClick={sendModalOpenHandler}>Send Again</MenuItem> <MenuItem key="send-again-button" onClick={sendModalOpenHandler}>
<Divider /> Send Again
</> </MenuItem>,
) : null} <Divider key="divider" />,
]
: null}
{knownAddress ? ( {knownAddress ? (
<MenuItem onClick={addOrEditEntryHandler}>Edit Address book Entry</MenuItem> <MenuItem onClick={addOrEditEntryHandler}>Edit Address book Entry</MenuItem>
) : ( ) : (

4
src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/index.tsx
View File

@ -45,7 +45,9 @@ const TxDescription = ({ tx }: { tx: Transaction }): React.ReactElement => {
{tx.type === TransactionTypes.SETTINGS && <SettingsDescriptionTx tx={tx} />} {tx.type === TransactionTypes.SETTINGS && <SettingsDescriptionTx tx={tx} />}
{tx.type === TransactionTypes.CUSTOM && <CustomDescriptionTx tx={tx} />} {tx.type === TransactionTypes.CUSTOM && <CustomDescriptionTx tx={tx} />}
{tx.type === TransactionTypes.UPGRADE && <UpgradeDescriptionTx tx={tx} />} {tx.type === TransactionTypes.UPGRADE && <UpgradeDescriptionTx tx={tx} />}
{[TransactionTypes.TOKEN, TransactionTypes.COLLECTIBLE].includes(tx.type) && <TransferDescriptionTx tx={tx} />} {[TransactionTypes.TOKEN, TransactionTypes.COLLECTIBLE, TransactionTypes.OUTGOING].includes(tx.type) && (
<TransferDescriptionTx tx={tx} />
)}
</Block> </Block>
) )
} }