Merge branch 'development' of github.com:gnosis/safe-react into feature/address-book-suggestions

This commit is contained in:
Mati Dastugue 2020-06-25 20:59:37 -03:00
commit c5681f1491
3 changed files with 456 additions and 438 deletions

View File

@ -1,6 +1,6 @@
{
"name": "safe-react",
"version": "2.3.0",
"version": "2.3.1",
"description": "Allowing crypto users manage funds in a safer way",
"website": "https://github.com/gnosis/safe-react#readme",
"bugs": {

View File

@ -18,15 +18,13 @@ export const getTxData = (tx) => {
const { to } = tx.decodedParams.transfer
txData.recipient = to
txData.isTokenTransfer = true
}
if (tx.isCollectibleTransfer) {
} else if (tx.isCollectibleTransfer) {
const { safeTransferFrom, transfer, transferFrom } = tx.decodedParams
const { to, value } = safeTransferFrom || transferFrom || transfer
txData.recipient = to
txData.tokenId = value
txData.isCollectibleTransfer = true
}
if (tx.modifySettingsTx) {
} else if (tx.modifySettingsTx) {
txData.recipient = tx.recipient
txData.modifySettingsTx = true
@ -50,11 +48,12 @@ export const getTxData = (tx) => {
txData.removedOwner = oldOwner
txData.addedOwner = newOwner
}
}
if (tx.multiSendTx) {
} else if (tx.multiSendTx) {
txData.recipient = tx.recipient
txData.data = tx.data
txData.customTx = true
} else {
txData.recipient = tx.recipient
}
} else if (tx.customTx) {
txData.recipient = tx.recipient

881
yarn.lock

File diff suppressed because it is too large Load Diff