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

WA-238 Including only the txHash in the redux store of confirmations

This commit is contained in:
apanizo 2018-05-24 17:27:11 +02:00
parent 38953cfcb7
commit cbf29c10e0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/safe/component/NoRights/index.jsx
View File

@ -12,7 +12,7 @@ const NoRights = () => (
<Row> <Row>
<Col xs={12} center="xs" sm={10} smOffset={2} start="sm" margin="md"> <Col xs={12} center="xs" sm={10} smOffset={2} start="sm" margin="md">
<Paragraph size="lg"> <Paragraph size="lg">
<Bold>You do not have rights to operate with this safe. Pleave visit the Safe List.</Bold> <Bold>Impossible load Safe, check its address and ownership</Bold>
</Paragraph> </Paragraph>
</Col> </Col>
<Col xs={12} center="xs" sm={10} smOffset={2} start="sm" margin="md"> <Col xs={12} center="xs" sm={10} smOffset={2} start="sm" margin="md">

4
src/routes/safe/component/Transactions/transactions.js
View File

@ -96,11 +96,11 @@ export const createTransaction = async (
if (hasOneOwner(safe)) { if (hasOneOwner(safe)) {
const txHash = await gnosisSafe.execTransactionIfApproved(txDestination, valueInWei, '0x', CALL, nonce, { from: user, gas: '5000000' }) const txHash = await gnosisSafe.execTransactionIfApproved(txDestination, valueInWei, '0x', CALL, nonce, { from: user, gas: '5000000' })
const executedConfirmations: List<Confirmation> = buildExecutedConfirmationFrom(safe.get('owners'), user) const executedConfirmations: List<Confirmation> = buildExecutedConfirmationFrom(safe.get('owners'), user)
return storeTransaction(txName, nonce, txDestination, txValue, user, executedConfirmations, txHash, safeAddress, safe.get('confirmations')) return storeTransaction(txName, nonce, txDestination, txValue, user, executedConfirmations, txHash.tx, safeAddress, safe.get('confirmations'))
} }
const txConfirmationHash = await gnosisSafe.approveTransactionWithParameters(txDestination, valueInWei, '0x', CALL, nonce, { from: user, gas: '5000000' }) const txConfirmationHash = await gnosisSafe.approveTransactionWithParameters(txDestination, valueInWei, '0x', CALL, nonce, { from: user, gas: '5000000' })
const confirmations: List<Confirmation> = buildConfirmationsFrom(safe.get('owners'), user, txConfirmationHash) const confirmations: List<Confirmation> = buildConfirmationsFrom(safe.get('owners'), user, txConfirmationHash.tx)
return storeTransaction(txName, nonce, txDestination, txValue, user, confirmations, '', safeAddress, safe.get('confirmations')) return storeTransaction(txName, nonce, txDestination, txValue, user, confirmations, '', safeAddress, safe.get('confirmations'))
} }