From 2bd73c3443560f2e0619d3183279b0e7b9ae76df Mon Sep 17 00:00:00 2001
From: Daniel Sanchez <daniel.sanchez@gnosis.pm>
Date: Mon, 1 Feb 2021 12:32:08 +0100
Subject: [PATCH 1/6] Set v2.19.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eb592303..3e6b3123 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "safe-react",
-  "version": "2.18.1",
+  "version": "2.19.0",
   "description": "Allowing crypto users manage funds in a safer way",
   "website": "https://github.com/gnosis/safe-react#readme",
   "bugs": {

From 4bf1a74b330597beb56cb124e41885a58b6ec62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Longoni?= <agustin.longoni@altoros.com>
Date: Mon, 1 Feb 2021 16:02:14 -0300
Subject: [PATCH 2/6] fix 'Advanced options' presentation in modal

---
 .../components/Settings/ManageOwners/AddOwnerModal/index.tsx     | 1 -
 .../components/Settings/ManageOwners/RemoveOwnerModal/index.tsx  | 1 -
 .../components/Settings/ManageOwners/ReplaceOwnerModal/index.tsx | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/index.tsx b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/index.tsx
index c3121921..37a3427c 100644
--- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/index.tsx
@@ -21,7 +21,6 @@ import ThresholdForm from './screens/ThresholdForm'
 const styles = createStyles({
   biggerModalWindow: {
     width: '775px',
-    minHeight: '500px',
     height: 'auto',
   },
 })
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.tsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.tsx
index 575046d3..6a5e8f86 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.tsx
@@ -18,7 +18,6 @@ import { TxParameters } from 'src/routes/safe/container/hooks/useTransactionPara
 const styles = createStyles({
   biggerModalWindow: {
     width: '775px',
-    minHeight: '500px',
     height: 'auto',
   },
 })
diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.tsx b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.tsx
index 6e0e9600..a1d6c7db 100644
--- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.tsx
@@ -21,7 +21,6 @@ import { TxParameters } from 'src/routes/safe/container/hooks/useTransactionPara
 const styles = createStyles({
   biggerModalWindow: {
     width: '775px',
-    minHeight: '500px',
     height: 'auto',
   },
 })

From 42821c11d253401080535082d6df021be00a82b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Longoni?= <agustin.longoni@altoros.com>
Date: Mon, 1 Feb 2021 19:20:15 -0300
Subject: [PATCH 3/6] Avoids changing the transaction fee message while loading
 the estimation

---
 src/components/TransactionsFees/index.tsx     |  3 +++
 .../RemoveOwnerModal/screens/Review/index.tsx | 22 ++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/TransactionsFees/index.tsx b/src/components/TransactionsFees/index.tsx
index c5e54f19..09187210 100644
--- a/src/components/TransactionsFees/index.tsx
+++ b/src/components/TransactionsFees/index.tsx
@@ -21,6 +21,9 @@ export const TransactionFees = ({
   txEstimationExecutionStatus,
 }: TransactionFailTextProps): React.ReactElement | null => {
   let transactionAction
+  if (txEstimationExecutionStatus === EstimationStatus.LOADING) {
+    return null
+  }
   if (isCreation) {
     transactionAction = 'create'
   } else if (isExecution) {
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.tsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.tsx
index ece059c9..36ec7e79 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.tsx
@@ -216,16 +216,18 @@ export const ReviewRemoveOwnerModal = ({
             isTransactionExecution={isExecution}
           />
 
-          <Block className={classes.gasCostsContainer}>
-            <TransactionFees
-              gasCostFormatted={gasCostFormatted}
-              isExecution={isExecution}
-              isCreation={isCreation}
-              isOffChainSignature={isOffChainSignature}
-              txEstimationExecutionStatus={txEstimationExecutionStatus}
-            />
-          </Block>
-          <Hairline />
+          {txEstimationExecutionStatus === EstimationStatus.LOADING ? null : (
+            <Block className={classes.gasCostsContainer}>
+              <TransactionFees
+                gasCostFormatted={gasCostFormatted}
+                isExecution={isExecution}
+                isCreation={isCreation}
+                isOffChainSignature={isOffChainSignature}
+                txEstimationExecutionStatus={txEstimationExecutionStatus}
+              />
+              <Hairline />
+            </Block>
+          )}
           <Row align="center" className={classes.buttonRow}>
             <Button minHeight={42} minWidth={140} onClick={onClickBack}>
               Back

From 29559859d21a1567b9c622cc042f7c064acd26b3 Mon Sep 17 00:00:00 2001
From: Daniel Sanchez <daniel.sanchez@gnosis.pm>
Date: Tue, 2 Feb 2021 11:38:48 +0100
Subject: [PATCH 4/6] Fix multisend enconding when adding a new spender to
 allowance module

---
 src/index.tsx                                         |  2 +-
 .../Settings/SpendingLimit/NewLimitModal/Review.tsx   | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/index.tsx b/src/index.tsx
index 0e1f8204..64a80101 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -26,7 +26,7 @@ Sentry.init({
   dsn: SENTRY_DSN,
   release: `safe-react@${process.env.REACT_APP_APP_VERSION}`,
   integrations: [new Integrations.BrowserTracing()],
-  sampleRate: 0.2,
+  sampleRate: 0.01,
 })
 
 const root = document.getElementById('root')
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index 8e62a497..5fbce640 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -120,6 +120,8 @@ const calculateSpendingLimitsTxData = (
     if (transactions.length === 0) {
       spendingLimitTxData = setSpendingLimitTx({ spendingLimitArgs, safeAddress })
     } else {
+      const encodedTxForMultisend = setSpendingLimitMultiSendTx({ spendingLimitArgs, safeAddress })
+      transactions.push(encodedTxForMultisend)
       spendingLimitTxData = spendingLimitMultiSendTx({ transactions, safeAddress })
     }
 
@@ -193,7 +195,7 @@ export const ReviewSpendingLimits = ({ onBack, onClose, txToken, values }: Revie
       ethGasLimit: ethGasLimit || gasLimit,
     }
     if (safeAddress) {
-      const { spendingLimitTxData, transactions, spendingLimitArgs } = calculateSpendingLimitsTxData(
+      const { spendingLimitTxData } = calculateSpendingLimitsTxData(
         safeAddress,
         spendingLimits,
         existentSpendingLimit,
@@ -201,12 +203,7 @@ export const ReviewSpendingLimits = ({ onBack, onClose, txToken, values }: Revie
         values,
         advancedOptionsTxParameters,
       )
-      // if there's no tx for enable module or adding a delegate, then we avoid using multiSend Tx
-      if (transactions.length === 0) {
-        dispatch(createTransaction(spendingLimitTxData))
-        return
-      }
-      transactions.push(setSpendingLimitMultiSendTx({ spendingLimitArgs, safeAddress }))
+
       dispatch(createTransaction(spendingLimitTxData))
     }
   }

From 306ea4a14ba8da47e3bda399a30f1683f026661e Mon Sep 17 00:00:00 2001
From: Agustin Pane <agustin.pane@gmail.com>
Date: Tue, 2 Feb 2021 12:39:54 -0300
Subject: [PATCH 5/6] Check that the estimation of the node is bigger than 0
 before returning

---
 src/logic/safe/transactions/gas.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/logic/safe/transactions/gas.ts b/src/logic/safe/transactions/gas.ts
index bcee4537..c7e54e0b 100644
--- a/src/logic/safe/transactions/gas.ts
+++ b/src/logic/safe/transactions/gas.ts
@@ -182,15 +182,17 @@ const calculateMinimumGasForTransaction = async (
     const amountOfGasToTryTx = txGasEstimation + dataGasEstimation + additionalGas
     console.info(`Estimating transaction creation with gas amount: ${amountOfGasToTryTx}`)
     try {
-      await getGasEstimationTxResponse({
+      const estimation = await getGasEstimationTxResponse({
         to: safeAddress,
         from: safeAddress,
         data: estimateData,
         gasPrice: 0,
         gas: amountOfGasToTryTx,
       })
-      console.info(`Gas estimation successfully finished with gas amount: ${amountOfGasToTryTx}`)
-      return amountOfGasToTryTx
+      if (estimation > 0) {
+        console.info(`Gas estimation successfully finished with gas amount: ${amountOfGasToTryTx}`)
+        return amountOfGasToTryTx
+      }
     } catch (error) {
       console.log(`Error trying to estimate gas with amount: ${amountOfGasToTryTx}`)
     }

From 7921a8d9f31a36cb1546bc18fb283348b948b944 Mon Sep 17 00:00:00 2001
From: Daniel Sanchez <daniel.sanchez@gnosis.pm>
Date: Tue, 2 Feb 2021 22:16:38 +0100
Subject: [PATCH 6/6] Set v2.19.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3e6b3123..af48d2d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "safe-react",
-  "version": "2.19.0",
+  "version": "2.19.1",
   "description": "Allowing crypto users manage funds in a safer way",
   "website": "https://github.com/gnosis/safe-react#readme",
   "bugs": {