Merge branch 'master' of https://github.com/gnosis/safe-react into coveralls

# Conflicts:
#	yarn.lock

package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-react",
-  "version": "2.1.1",
+  "version": "2.3.1",
   "description": "Allowing crypto users manage funds in a safer way",
   "website": "https://github.com/gnosis/safe-react#readme",
   "bugs": {

src/routes/safe/components/Apps/utils.ts

@@ -18,7 +18,7 @@ export const staticAppsList: Array<{ url: string; disabled: boolean }> = [
   // request
   { url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmQapdJP6zERqpDKKPECNeMDDgwmGUqbKk1PjHpYj8gfDJ`, disabled: false },
   // Aave
-  { url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmUfgEqdJ5kVjWTQofnDmvxdhDLBAaejiHkhQhfw6aYvBg`, disabled: false },
+  // { url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmUfgEqdJ5kVjWTQofnDmvxdhDLBAaejiHkhQhfw6aYvBg`, disabled: false },
   { url: `${gnosisAppsUrl}/compound`, disabled: false },
   { url: `${gnosisAppsUrl}/tx-builder`, disabled: false },
   { url: `${gnosisAppsUrl}/pool-together`, disabled: false },

src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/utils.ts

@@ -18,15 +18,13 @@ export const getTxData = (tx) => {
       const { to } = tx.decodedParams.transfer
       txData.recipient = to
       txData.isTokenTransfer = true
-    }
-    if (tx.isCollectibleTransfer) {
+    } else if (tx.isCollectibleTransfer) {
       const { safeTransferFrom, transfer, transferFrom } = tx.decodedParams
       const { to, value } = safeTransferFrom || transferFrom || transfer
       txData.recipient = to
       txData.tokenId = value
       txData.isCollectibleTransfer = true
-    }
-    if (tx.modifySettingsTx) {
+    } else if (tx.modifySettingsTx) {
       txData.recipient = tx.recipient
       txData.modifySettingsTx = true
 
@@ -50,11 +48,12 @@ export const getTxData = (tx) => {
         txData.removedOwner = oldOwner
         txData.addedOwner = newOwner
       }
-    }
-    if (tx.multiSendTx) {
+    } else if (tx.multiSendTx) {
       txData.recipient = tx.recipient
       txData.data = tx.data
       txData.customTx = true
+    } else {
+      txData.recipient = tx.recipient
     }
   } else if (tx.customTx) {
     txData.recipient = tx.recipient