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

tx descriptions for settings

This commit is contained in:
mmv 2019-07-11 15:48:50 +04:00
parent db1f2ab77f
commit f01bedf87b
2 changed files with 82 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/routes/safe/components/TransactionsNew/TxsTable/ExpandedTx/TxDescription/index.jsx
View File

@ -27,35 +27,83 @@ type Props = {
tx: Transaction,
}
type TransferDescProps = {
value: string,
symbol: string,
recipient: string,
}
type DescriptionDescProps = {
removedOwner?: string,
addedOwner?: string,
newThreshold?: string,
}
type AddressLinkProps = {
address: string
}
const RinkebyAddressLink = ({ address }: AddressLinkProps) => (
<a href={getEtherScanLink(address, 'rinkeby')} target="_blank" rel="noopener noreferrer">
{shortVersionOf(address, 4)}
<OpenInNew style={openIconStyle} />
</a>
)
const TransferDescription = ({ value = '', symbol, recipient }: TransferDescProps) => (
<Paragraph noMargin>
<Bold>
Send
{' '}
{value}
{' '}
{symbol}
{' '}
to:
</Bold>
<br />
<RinkebyAddressLink address={recipient} />
</Paragraph>
)
const SettingsDescription = ({ removedOwner, addedOwner, newThreshold }: DescriptionDescProps) => (
<>
{newThreshold && (
<Paragraph>
<Bold>Change required confirmations:</Bold>
<br />
{newThreshold}
</Paragraph>
)}
{removedOwner && (
<Paragraph>
<Bold>Remove owner:</Bold>
<br />
<RinkebyAddressLink address={removedOwner} />
</Paragraph>
)}
{addedOwner && (
<Paragraph>
<Bold>Add owner:</Bold>
<br />
<RinkebyAddressLink address={addedOwner} />
</Paragraph>
)}
</>
)
const TxDescription = ({ tx, classes }: Props) => {
const {
recipient, value, modifySettingsTx, replacedOwner, removedOwner, addedOwner, newThreshold,
recipient, value, modifySettingsTx, removedOwner, addedOwner, newThreshold,
} = getTxData(tx)
return (
<Block className={classes.txDataContainer}>
<Paragraph noMargin>
{modifySettingsTx ? (
<Bold>Modify Safe Settings</Bold>
) : (
<>
<Bold>
Send
{' '}
{value}
{' '}
{tx.symbol}
{' '}
to:
</Bold>
<br />
<a href={getEtherScanLink(recipient, 'rinkeby')} target="_blank" rel="noopener noreferrer">
{shortVersionOf(recipient, 4)}
<OpenInNew style={openIconStyle} />
</a>
</>
)}
</Paragraph>
{modifySettingsTx ? (
<SettingsDescription removedOwner={removedOwner} newThreshold={newThreshold} addedOwner={addedOwner} />
) : (
<TransferDescription value={value} symbol={tx.symbol} recipient={recipient} />
)}
</Block>
)
}

13
src/routes/safe/components/TransactionsNew/TxsTable/ExpandedTx/TxDescription/utils.js
View File

@ -5,7 +5,16 @@ import { getWeb3 } from '~/logic/wallets/getWeb3'
const web3 = getWeb3()
const { toBN, fromWei } = web3.utils
export const getTxData = (tx: Transaction) => {
type DecodedTxData = {
recipient: string,
value?: string,
modifySettingsTx?: boolean,
removedOwner?: string,
newThreshold?: string,
addedOwner?: string,
}
export const getTxData = (tx: Transaction): DecodedTxData => {
const txData = {}
if (tx.isTokenTransfer && tx.decodedParams) {
@ -29,7 +38,7 @@ export const getTxData = (tx: Transaction) => {
txData.addedOwner = tx.decodedParams.args[1]
txData.newThreshold = tx.decodedParams.args[1]
} else if (tx.decodedParams.methodName === 'swapOwner') {
txData.replacedOwner = tx.decodedParams.args[0]
txData.addedOwner = tx.decodedParams.args[0]
txData.removedOwner = tx.decodedParams.args[1]
txData.newThreshold = tx.decodedParams.args[2]
}