fix eth transfers displaying as modify settings txs, dep bump

This commit is contained in:
mmv 2019-07-15 15:07:28 +04:00
parent 10152f1bfa
commit 4909533048
3 changed files with 1324 additions and 938 deletions

View File

@ -37,9 +37,9 @@
"@welldone-software/why-did-you-render": "3.2.1",
"axios": "0.19.0",
"bignumber.js": "9.0.0",
"connected-react-router": "6.5.0",
"connected-react-router": "6.5.2",
"date-fns": "1.30.1",
"final-form": "4.16.1",
"final-form": "4.17.0",
"history": "^4.7.2",
"immortal-db": "^1.0.2",
"immutable": "^4.0.0-rc.9",
@ -91,7 +91,7 @@
"@storybook/addon-knobs": "5.1.9",
"@storybook/addon-links": "5.1.9",
"@storybook/react": "5.1.9",
"@testing-library/react": "^8.0.1",
"@testing-library/react": "8.0.5",
"autoprefixer": "9.6.1",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "10.0.2",
@ -130,13 +130,13 @@
"storybook-host": "5.1.0",
"storybook-router": "^0.3.3",
"style-loader": "^0.23.1",
"truffle": "5.0.26",
"truffle-contract": "4.0.23",
"truffle-solidity-loader": "0.1.25",
"truffle": "5.0.27",
"truffle-contract": "4.0.24",
"truffle-solidity-loader": "0.1.26",
"uglifyjs-webpack-plugin": "2.1.3",
"webpack": "4.35.3",
"webpack-bundle-analyzer": "3.3.2",
"webpack-cli": "3.3.5",
"webpack-cli": "3.3.6",
"webpack-dev-server": "3.7.2",
"webpack-manifest-plugin": "^2.0.0-rc.2"
}

View File

@ -52,7 +52,7 @@ const buildTransactionFrom = async (safeAddress: string, tx: TxServiceModel, saf
})
}),
)
const modifySettingsTx = tx.to === safeAddress
const modifySettingsTx = tx.to === safeAddress && Number(tx.value) === 0
const isTokenTransfer = await isAddressAToken(tx.to)
const creationTxHash = confirmations.last().hash

2246
yarn.lock

File diff suppressed because it is too large Load Diff