Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.

(Fix) Native Coin transfer not shown #1670

Merged
dasanra merged 2 commits into from
Nov 30, 2020
Merged

(Fix) Native Coin transfer not shown #1670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e026178
allow to display native coin transfers in the expanded view
fernandomg Nov 30, 2020
7992e56
fix issue with fragment being passed to material-ui menu
fernandomg Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/routes/safe/components/AddressBook/EllipsisTransactionDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,14 @@ export const EllipsisTransactionDetails = ({
<div className={classes.container} role="menu" tabIndex={0}>
<MoreHorizIcon onClick={handleClick} onKeyDown={handleClick} />
<Menu anchorEl={anchorEl} id="simple-menu" keepMounted onClose={closeMenuHandler} open={Boolean(anchorEl)}>
{sendModalOpenHandler ? (
<>
<MenuItem onClick={sendModalOpenHandler}>Send Again</MenuItem>
<Divider />
</>
) : null}
{sendModalOpenHandler
? [
<MenuItem key="send-again-button" onClick={sendModalOpenHandler}>
Send Again
</MenuItem>,
<Divider key="divider" />,
]
: null}
{knownAddress ? (
<MenuItem onClick={addOrEditEntryHandler}>Edit Address book Entry</MenuItem>
) : (
Expand Down
4 changes: 3 additions & 1 deletion src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ const TxDescription = ({ tx }: { tx: Transaction }): React.ReactElement => {
{tx.type === TransactionTypes.SETTINGS && <SettingsDescriptionTx tx={tx} />}
{tx.type === TransactionTypes.CUSTOM && <CustomDescriptionTx 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>
)
}
Expand Down