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

Merge pull request #1310 from gnosis/dev-backmerge/2.11.0 

Backmerge: Release 2.11.0 to development
This commit is contained in:
Mikhail Mikheev 2020-09-01 14:58:25 +04:00 committed by GitHub
parent f7d4cfe112 0fbc5f6500
commit 6f036f9844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "safe-react", "name": "safe-react",
"version": "2.10.2", "version": "2.11.0",
"description": "Allowing crypto users manage funds in a safer way", "description": "Allowing crypto users manage funds in a safer way",
"website": "https://github.com/gnosis/safe-react#readme", "website": "https://github.com/gnosis/safe-react#readme",
"bugs": { "bugs": {
@ -166,7 +166,7 @@
"dependencies": { "dependencies": {
"@gnosis.pm/safe-apps-sdk": "https://github.com/gnosis/safe-apps-sdk.git#development", "@gnosis.pm/safe-apps-sdk": "https://github.com/gnosis/safe-apps-sdk.git#development",
"@gnosis.pm/safe-contracts": "1.1.1-dev.2", "@gnosis.pm/safe-contracts": "1.1.1-dev.2",
"@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#development", "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#1bf397f",
"@gnosis.pm/util-contracts": "2.0.6", "@gnosis.pm/util-contracts": "2.0.6",
"@ledgerhq/hw-transport-node-hid": "5.19.1", "@ledgerhq/hw-transport-node-hid": "5.19.1",
"@material-ui/core": "4.11.0", "@material-ui/core": "4.11.0",

2
src/logic/safe/store/actions/createTransaction.ts
View File

@ -212,7 +212,7 @@ const createTransaction = (
await tx await tx
.send(sendParams) .send(sendParams)
.once('transactionHash', async (hash) => { .once('transactionHash', async (hash) => {
onUserConfirm(safeTxHash) onUserConfirm?.(safeTxHash)
try { try {
txHash = hash txHash = hash
dispatch(closeSnackbarAction({ key: beforeExecutionKey })) dispatch(closeSnackbarAction({ key: beforeExecutionKey }))

4
src/logic/safe/store/actions/processTransaction.ts
View File

@ -105,9 +105,9 @@ const processTransaction = ({ approveAndExecute, notifiedTransaction, safeAddres
const txToMock: TxToMock = { const txToMock: TxToMock = {
...txArgs, ...txArgs,
confirmations: [], // this is used to determine if a tx is pending or not. See `calculateTransactionStatus` helper confirmations: txArgs.confirmations, // this is used to determine if a tx is pending or not. See `calculateTransactionStatus` helper
value: txArgs.valueInWei, value: txArgs.valueInWei,
submissionDate: new Date().toISOString(), submissionDate: txArgs.submissionDate,
} }
const mockedTx = await mockTransaction(txToMock, safeAddress, state) const mockedTx = await mockTransaction(txToMock, safeAddress, state)

5
yarn.lock
View File

@ -1502,9 +1502,9 @@
solc "0.5.14" solc "0.5.14"
truffle "^5.1.21" truffle "^5.1.21"
"@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#development": "@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#1bf397f":
version "0.2.0" version "0.2.0"
resolved "https://github.com/gnosis/safe-react-components.git#920a6d303f401819f959923023bbe28c4b222797" resolved "https://github.com/gnosis/safe-react-components.git#1bf397f2bc48ba48906824137943f0bb5804c99c"
dependencies: dependencies:
classnames "^2.2.6" classnames "^2.2.6"
polished "3.6.5" polished "3.6.5"
@ -20143,7 +20143,6 @@ websocket@^1.0.31:
dependencies: dependencies:
debug "^2.2.0" debug "^2.2.0"
es5-ext "^0.10.50" es5-ext "^0.10.50"
gulp "^4.0.2"
nan "^2.14.0" nan "^2.14.0"
typedarray-to-buffer "^3.1.5" typedarray-to-buffer "^3.1.5"
yaeti "^0.0.6" yaeti "^0.0.6"