Merge branch 'master' of github.com:gnosis/safe-react into dev-backmerge/2.11.0

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": {
@@ -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",

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 }))

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)
 

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"