From 34c64db53006c6a1e916c111c72c43b3b021ebdb Mon Sep 17 00:00:00 2001 From: nicosampler Date: Thu, 27 Aug 2020 12:37:19 -0300 Subject: [PATCH 1/5] update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bcb633ca..9dda1120 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "safe-react", - "version": "2.10.2", + "version": "2.11.0", "description": "Allowing crypto users manage funds in a safer way", "website": "https://github.com/gnosis/safe-react#readme", "bugs": { From e0151a42d9643f672b4f8550b884e29a02a3989d Mon Sep 17 00:00:00 2001 From: nicosampler Date: Thu, 27 Aug 2020 14:12:02 -0300 Subject: [PATCH 2/5] update safe-react-components version --- package.json | 2 +- yarn.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9dda1120..ca210c8e 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,7 @@ "dependencies": { "@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-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", "@ledgerhq/hw-transport-node-hid": "5.19.1", "@material-ui/core": "4.11.0", diff --git a/yarn.lock b/yarn.lock index 30007e3e..1a75bcdf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1502,9 +1502,9 @@ solc "0.5.14" 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" - resolved "https://github.com/gnosis/safe-react-components.git#920a6d303f401819f959923023bbe28c4b222797" + resolved "https://github.com/gnosis/safe-react-components.git#1bf397f2bc48ba48906824137943f0bb5804c99c" dependencies: classnames "^2.2.6" polished "3.6.5" @@ -20143,7 +20143,6 @@ websocket@^1.0.31: dependencies: debug "^2.2.0" es5-ext "^0.10.50" - gulp "^4.0.2" nan "^2.14.0" typedarray-to-buffer "^3.1.5" yaeti "^0.0.6" From d1438d704bd9c6c54a7ece1690e5758ba2739c49 Mon Sep 17 00:00:00 2001 From: Mikhail Mikheev Date: Fri, 28 Aug 2020 18:09:10 +0400 Subject: [PATCH 3/5] fix onUserConfirm invoke --- src/logic/safe/store/actions/createTransaction.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/safe/store/actions/createTransaction.ts b/src/logic/safe/store/actions/createTransaction.ts index e9048207..6f0424a7 100644 --- a/src/logic/safe/store/actions/createTransaction.ts +++ b/src/logic/safe/store/actions/createTransaction.ts @@ -212,7 +212,7 @@ const createTransaction = ( await tx .send(sendParams) .once('transactionHash', async (hash) => { - onUserConfirm(safeTxHash) + onUserConfirm?.(safeTxHash) try { txHash = hash dispatch(closeSnackbarAction({ key: beforeExecutionKey })) From 4f32f77ef9ad1495dfc3e5131b3f890420e64023 Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Date: Mon, 31 Aug 2020 12:22:24 +0200 Subject: [PATCH 4/5] Update idle safe app (#1290) Co-authored-by: Mikhail Mikheev --- src/routes/safe/components/Apps/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/safe/components/Apps/utils.ts b/src/routes/safe/components/Apps/utils.ts index b1545364..187f3be0 100644 --- a/src/routes/safe/components/Apps/utils.ts +++ b/src/routes/safe/components/Apps/utils.ts @@ -27,7 +27,7 @@ export const staticAppsList: Array<{ url: string; disabled: boolean }> = [ // Compound { url: `${gnosisAppsUrl}/compound`, disabled: false }, // Idle - { url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmUoqmq8jw98VwTSf7aTQeBCfPKicQgcJL5k2Bch9QT8BJ`, disabled: false }, + { url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmTpbdjjMxgjvuGDN62tLEF3qPSk8GBLAYGR9fMM6ftWKi`, disabled: false }, // request { url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmTBBaiDQyGa17DJ7DdviyHbc51fTVgf6Z5PW5w2YUTkgR`, disabled: false }, // Sablier From e000bc6d0bedc900ab29a314da6f26702550e796 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Mon, 31 Aug 2020 15:14:51 +0400 Subject: [PATCH 5/5] use submissionDate/confirmations from current tx in processTransaction --- src/logic/safe/store/actions/processTransaction.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/logic/safe/store/actions/processTransaction.ts b/src/logic/safe/store/actions/processTransaction.ts index 95818590..0791584c 100644 --- a/src/logic/safe/store/actions/processTransaction.ts +++ b/src/logic/safe/store/actions/processTransaction.ts @@ -105,9 +105,9 @@ const processTransaction = ({ approveAndExecute, notifiedTransaction, safeAddres const txToMock: TxToMock = { ...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, - submissionDate: new Date().toISOString(), + submissionDate: txArgs.submissionDate, } const mockedTx = await mockTransaction(txToMock, safeAddress, state)