Merge branch 'development' into 2.5.2-dev-master-backmerge

.gitignore

@@ -1,5 +1,5 @@
 node_modules/
-build/
+./build
 .DS_Store
 yarn-error.log
 .env*

package.json

@@ -151,28 +151,29 @@
     "@gnosis.pm/safe-contracts": "1.1.1-dev.2",
     "@gnosis.pm/safe-react-components": "^0.1.3",
     "@gnosis.pm/util-contracts": "2.0.6",
-    "@ledgerhq/hw-transport-node-hid": "5.16.0",
+    "@ledgerhq/hw-transport-node-hid": "5.19.0",
-    "@material-ui/core": "4.10.1",
+    "@material-ui/core": "4.11.0",
     "@material-ui/icons": "4.9.1",
     "@material-ui/lab": "4.0.0-alpha.39",
-    "@openzeppelin/contracts": "3.0.2",
+    "@openzeppelin/contracts": "3.1.0",
     "async-sema": "^3.1.0",
     "axios": "0.19.2",
     "bignumber.js": "9.0.0",
-    "bnc-onboard": "1.10.0",
+    "bnc-onboard": "1.10.2",
     "classnames": "^2.2.6",
     "concurrently": "^5.2.0",
     "connected-react-router": "6.8.0",
     "currency-flags": "2.1.2",
     "date-fns": "2.14.0",
     "electron-is-dev": "^1.1.0",
-    "electron-log": "4.2.1",
+    "electron-log": "4.2.2",
-    "electron-settings": "^4.0.0",
+    "electron-settings": "4.0.2",
     "electron-updater": "4.3.1",
     "eth-sig-util": "^2.5.3",
     "ethereum-blockies-base64": "^1.0.2",
+    "exponential-backoff": "^3.0.1",
     "express": "^4.17.1",
-    "final-form": "^4.20.0",
+    "final-form": "4.20.1",
     "final-form-calculate": "^1.3.1",
     "history": "4.10.1",
     "immortal-db": "^1.0.2",
@@ -182,9 +183,9 @@
     "material-ui-search-bar": "^1.0.0-beta.13",
     "notistack": "https://github.com/gnosis/notistack.git#v0.9.4",
     "open": "^7.0.3",
-    "polished": "3.6.4",
+    "polished": "3.6.5",
     "qrcode.react": "1.0.0",
-    "query-string": "6.13.0",
+    "query-string": "6.13.1",
     "react": "16.13.1",
     "react-dom": "16.13.1",
     "react-final-form": "^6.5.0",
@@ -204,20 +205,20 @@
     "semver": "7.3.2",
     "styled-components": "^5.0.1",
     "truffle-contract": "4.0.31",
-    "web3": "1.2.8"
+    "web3": "1.2.9"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "5.9.0",
+    "@testing-library/jest-dom": "5.11.0",
-    "@testing-library/react": "10.2.1",
+    "@testing-library/react": "10.4.3",
     "@testing-library/user-event": "11.3.1",
     "@types/jest": "^25.2.1",
-    "@types/node": "14.0.12",
+    "@types/node": "14.0.14",
     "@types/react": "^16.9.32",
     "@types/react-dom": "^16.9.6",
     "@types/styled-components": "^5.1.0",
-    "@typescript-eslint/eslint-plugin": "3.2.0",
+    "@typescript-eslint/eslint-plugin": "3.5.0",
-    "@typescript-eslint/parser": "3.2.0",
+    "@typescript-eslint/parser": "3.5.0",
-    "autoprefixer": "9.8.0",
+    "autoprefixer": "9.8.4",
     "cross-env": "^7.0.2",
     "dotenv": "^8.2.0",
     "dotenv-expand": "^5.1.0",
@@ -226,19 +227,19 @@
     "electron-notarize": "0.3.0",
     "eslint": "6.8.0",
     "eslint-config-prettier": "6.11.0",
-    "eslint-plugin-import": "2.21.1",
+    "eslint-plugin-import": "2.22.0",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-prettier": "^3.1.2",
-    "eslint-plugin-react": "^7.18.3",
+    "eslint-plugin-react": "7.20.3",
-    "eslint-plugin-sort-destructure-keys": "1.3.4",
+    "eslint-plugin-sort-destructure-keys": "1.3.5",
     "ethereumjs-abi": "0.6.8",
     "husky": "^4.2.2",
-    "lint-staged": "10.2.9",
+    "lint-staged": "10.2.11",
     "node-sass": "^4.14.1",
     "prettier": "2.0.5",
     "react-app-rewired": "^2.1.6",
-    "truffle": "5.1.29",
+    "truffle": "5.1.33",
-    "typescript": "^3.9.5",
+    "typescript": "3.9.6",
     "wait-on": "5.0.1",
     "web3-eth-contract": "^1.2.9",
     "web3-utils": "^1.2.8"

src/config/index.ts

@@ -1,5 +1,6 @@
+import { checksumAddress } from 'src/utils/checksumAddress';
 import { ensureOnce } from 'src/utils/singleton'
-import { ETHEREUM_NETWORK, getWeb3 } from 'src/logic/wallets/getWeb3'
+import { ETHEREUM_NETWORK } from 'src/logic/wallets/getWeb3'
 import {
   RELAY_API_URL,
   SIGNATURES_VIA_METAMASK,
@@ -90,7 +91,7 @@ export const getSafeLastVersion = () => process.env.REACT_APP_LATEST_SAFE_VERSIO
 
 export const buildSafeCreationTxUrl = (safeAddress) => {
   const host = getTxServiceHost()
-  const address = getWeb3().utils.toChecksumAddress(safeAddress)
+  const address = checksumAddress(safeAddress)
   const base = getSafeCreationTxUri(address)
 
   return `${host}${base}`

src/logic/collectibles/sources/OpenSea.ts

@@ -4,6 +4,58 @@ import { ETHEREUM_NETWORK } from 'src/logic/wallets/getWeb3'
 import NFTIcon from 'src/routes/safe/components/Balances/assets/nft_icon.png'
 import { OPENSEA_API_KEY } from 'src/utils/constants'
 
+export interface OpenSeaAssetContract {
+  address: string
+  name: string
+  image_url: string
+  symbol: string
+}
+
+export interface OpenSeaCollection {
+  name: string
+  slug: string
+}
+
+export interface OpenSeaAsset {
+  asset_contract: OpenSeaAssetContract
+  background_color: string
+  collection: OpenSeaCollection
+  description: string
+  image_thumbnail_url: string
+  name: string
+  token_id: string
+}
+
+export type OpenSeaAssets = Array<OpenSeaAsset>
+
+export interface NFTAsset {
+  address: string
+  assetContract: OpenSeaAssetContract
+  collection: OpenSeaCollection
+  description: string
+  image: string
+  name: string
+  numberOfTokens: number
+  slug: string
+  symbol: string
+}
+export type NFTAssets = Record<string, NFTAsset>
+
+export interface NFTToken {
+  assetAddress: string
+  color: string
+  description: string
+  image: string
+  name: string
+  tokenId: number | string
+}
+export type NFTTokens = Array<NFTToken>
+
+export interface Collectibles {
+  nftAssets: NFTAssets
+  nftTokens: NFTTokens
+}
+
 class OpenSea {
   _rateLimit = async () => {}
 
@@ -29,7 +81,7 @@ class OpenSea {
     this._rateLimit = RateLimit(options.rps, { timeUnit: 60 * 1000, uniformDistribution: true })
   }
 
-  static extractAssets(assets) {
+  static extractAssets(assets: OpenSeaAssets): NFTAssets {
     const extractNFTAsset = (asset) => ({
       address: asset.asset_contract.address,
       assetContract: asset.asset_contract,
@@ -59,7 +111,7 @@ class OpenSea {
     }, {})
   }
 
-  static extractTokens(assets) {
+  static extractTokens(assets: OpenSeaAssets): NFTTokens {
     return assets.map((asset) => ({
       assetAddress: asset.asset_contract.address,
       color: asset.background_color,
@@ -70,7 +122,7 @@ class OpenSea {
     }))
   }
 
-  static extractCollectiblesInfo(assetResponseJson) {
+  static extractCollectiblesInfo(assetResponseJson: { assets: OpenSeaAssets }): Collectibles {
     return {
       nftAssets: OpenSea.extractAssets(assetResponseJson.assets),
       nftTokens: OpenSea.extractTokens(assetResponseJson.assets),
@@ -82,9 +134,9 @@ class OpenSea {
    * for the provided Safe Address in the specified Network
    * @param {string} safeAddress
    * @param {string} network
-   * @returns {Promise<{ nftAssets: Map<string, NFTAsset>, nftTokens: Array<NFTToken> }>}
+   * @returns {Promise<Collectibles>}
    */
-  async fetchAllUserCollectiblesByCategoryAsync(safeAddress, network) {
+  async fetchAllUserCollectiblesByCategoryAsync(safeAddress: string, network: string): Promise<Collectibles> {
     // eslint-disable-next-line no-underscore-dangle
     const metadataSourceUrl = this._endpointsUrls[network]
     const url = `${metadataSourceUrl}/assets/?owner=${safeAddress}`

src/logic/collectibles/sources/index.ts

@@ -2,9 +2,12 @@ import MockedOpenSea from 'src/logic/collectibles/sources/MockedOpenSea'
 import OpenSea from 'src/logic/collectibles/sources/OpenSea'
 import { COLLECTIBLES_SOURCE } from 'src/utils/constants'
 
-const sources = {
+const SOURCES = {
   opensea: new OpenSea({ rps: 4 }),
   mockedopensea: new MockedOpenSea({ rps: 4 }),
 }
 
-export const getConfiguredSource = () => sources[COLLECTIBLES_SOURCE.toLowerCase()]
+type Sources = typeof SOURCES
+
+export const getConfiguredSource = (): Sources['opensea'] | Sources['mockedopensea'] =>
+  SOURCES[COLLECTIBLES_SOURCE.toLowerCase()]

src/logic/collectibles/store/actions/fetchCollectibles.ts

@@ -3,18 +3,21 @@ import { batch } from 'react-redux'
 import { getNetwork } from 'src/config'
 import { getConfiguredSource } from 'src/logic/collectibles/sources'
 import { addNftAssets, addNftTokens } from 'src/logic/collectibles/store/actions/addCollectibles'
-import { safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
+import { Dispatch } from 'redux'
 
-const fetchCollectibles = () => async (dispatch, getState) => {
+const fetchCollectibles = (safeAddress: string) => async (dispatch: Dispatch): Promise<void> => {
-  const network = getNetwork()
+  try {
-  const safeAddress = safeParamAddressFromStateSelector(getState()) || ''
+    const network = getNetwork()
-  const source = getConfiguredSource()
+    const source = getConfiguredSource()
-  const collectibles = await source.fetchAllUserCollectiblesByCategoryAsync(safeAddress, network)
+    const collectibles = await source.fetchAllUserCollectiblesByCategoryAsync(safeAddress, network)
 
-  batch(() => {
+    batch(() => {
-    dispatch(addNftAssets(collectibles.nftAssets))
+      dispatch(addNftAssets(collectibles.nftAssets))
-    dispatch(addNftTokens(collectibles.nftTokens))
+      dispatch(addNftTokens(collectibles.nftTokens))
-  })
+    })
+  } catch (error) {
+    console.log('Error fetching collectibles:', error)
+  }
 }
 
 export default fetchCollectibles

src/logic/collectibles/store/selectors/index.ts

@@ -1,11 +1,13 @@
 import { List } from 'immutable'
 import { createSelector } from 'reselect'
+import { NFTAssets, NFTTokens } from 'src/logic/collectibles/sources/OpenSea'
 
+import { AppReduxState } from 'src/store'
 import { NFT_ASSETS_REDUCER_ID, NFT_TOKENS_REDUCER_ID } from 'src/logic/collectibles/store/reducer/collectibles'
 import { safeActiveAssetsSelector } from 'src/routes/safe/store/selectors'
 
-export const nftAssetsSelector = (state) => state[NFT_ASSETS_REDUCER_ID]
+export const nftAssetsSelector = (state: AppReduxState): NFTAssets => state[NFT_ASSETS_REDUCER_ID]
-export const nftTokensSelector = (state) => state[NFT_TOKENS_REDUCER_ID]
+export const nftTokensSelector = (state: AppReduxState): NFTTokens => state[NFT_TOKENS_REDUCER_ID]
 
 export const nftAssetsListSelector = createSelector(nftAssetsSelector, (assets) => {
   return assets ? List(Object.entries(assets).map((item) => item[1])) : List([])

src/logic/tokens/store/actions/fetchSafeTokens.ts

@@ -11,12 +11,18 @@ import { makeToken } from 'src/logic/tokens/store/model/token'
 import { TOKEN_REDUCER_ID } from 'src/logic/tokens/store/reducer/tokens'
 import updateSafe from 'src/routes/safe/store/actions/updateSafe'
 import { SAFE_REDUCER_ID } from 'src/routes/safe/store/reducer/safe'
+import { Dispatch } from 'redux'
+import { backOff } from 'exponential-backoff'
+import { AppReduxState } from 'src/store'
 
 const humanReadableBalance = (balance, decimals) => new BigNumber(balance).times(`1e-${decimals}`).toFixed()
 const noFunc = () => {}
 const updateSafeValue = (address) => (valueToUpdate) => updateSafe({ address, ...valueToUpdate })
 
-const fetchSafeTokens = (safeAddress) => async (dispatch, getState) => {
+const fetchSafeTokens = (safeAddress: string) => async (
+  dispatch: Dispatch,
+  getState: () => AppReduxState,
+): Promise<void> => {
   try {
     const state = getState()
     const safe = state[SAFE_REDUCER_ID].getIn([SAFE_REDUCER_ID, safeAddress])
@@ -26,7 +32,7 @@ const fetchSafeTokens = (safeAddress) => async (dispatch, getState) => {
       return
     }
 
-    const result = await fetchTokenCurrenciesBalances(safeAddress)
+    const result = await backOff(() => fetchTokenCurrenciesBalances(safeAddress))
     const currentEthBalance = safe.get('ethBalance')
     const safeBalances = safe.get('balances')
     const alreadyActiveTokens = safe.get('activeTokens')
@@ -95,8 +101,6 @@ const fetchSafeTokens = (safeAddress) => async (dispatch, getState) => {
   } catch (err) {
     console.error('Error fetching active token list', err)
   }
-
-  return null
 }
 
 export default fetchSafeTokens

src/routes/load/container/Load.tsx

@@ -10,7 +10,6 @@ import selector from './selector'
 import Page from 'src/components/layout/Page'
 import { getGnosisSafeInstanceAt } from 'src/logic/contracts/safeContracts'
 import { SAFES_KEY, saveSafes } from 'src/logic/safe/utils'
-import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import { getNamesFrom, getOwnersFrom } from 'src/routes/open/utils/safeDataExtractor'
 import { SAFELIST_ADDRESS } from 'src/routes/routes'
 import { buildSafe } from 'src/routes/safe/store/actions/fetchSafe'
@@ -19,6 +18,7 @@ import { loadFromStorage } from 'src/utils/storage'
 import { Dispatch } from 'redux'
 import { SafeOwner } from '../../safe/store/models/safe'
 import { List } from 'immutable'
+import { checksumAddress } from 'src/utils/checksumAddress'
 
 export const loadSafe = async (
   safeName: string,
@@ -39,14 +39,15 @@ export const loadSafe = async (
 
 class Load extends React.Component<any> {
   onLoadSafeSubmit = async (values) => {
+    let safeAddress = values[FIELD_LOAD_ADDRESS]
+    if (safeAddress) {
+      return
+    }
+
     try {
       const { addSafe } = this.props
-      const web3 = getWeb3()
       const safeName = values[FIELD_LOAD_NAME]
-      let safeAddress = values[FIELD_LOAD_ADDRESS]
+      safeAddress = checksumAddress(safeAddress)
-      if (safeAddress) {
-        safeAddress = web3.utils.toChecksumAddress(safeAddress)
-      }
       const ownerNames = getNamesFrom(values)
 
       const gnosisSafe = await getGnosisSafeInstanceAt(safeAddress)

src/routes/safe/components/Balances/index.tsx

@@ -47,7 +47,7 @@ const Balances = (props) => {
   const address = useSelector(safeParamAddressFromStateSelector)
   const featuresEnabled = useSelector(safeFeaturesEnabledSelector)
 
-  useFetchTokens()
+  useFetchTokens(address)
 
   useEffect(() => {
     const erc721Enabled = featuresEnabled && featuresEnabled.includes('ERC721')

src/routes/safe/container/hooks/useCheckForUpdates.tsx

@@ -1,31 +0,0 @@
-import { useEffect } from 'react'
-import { batch, useDispatch, useSelector } from 'react-redux'
-
-import fetchCollectibles from 'src/logic/collectibles/store/actions/fetchCollectibles'
-import fetchSafeTokens from 'src/logic/tokens/store/actions/fetchSafeTokens'
-import fetchEtherBalance from 'src/routes/safe/store/actions/fetchEtherBalance'
-import { checkAndUpdateSafe } from 'src/routes/safe/store/actions/fetchSafe'
-import fetchTransactions from 'src/routes/safe/store/actions/transactions/fetchTransactions'
-import { safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
-import { TIMEOUT } from 'src/utils/constants'
-
-export const useCheckForUpdates = () => {
-  const dispatch = useDispatch()
-  const safeAddress = useSelector(safeParamAddressFromStateSelector)
-  useEffect(() => {
-    if (safeAddress) {
-      const collectiblesInterval = setInterval(() => {
-        batch(() => {
-          dispatch(fetchEtherBalance(safeAddress))
-          dispatch(fetchSafeTokens(safeAddress))
-          dispatch(fetchTransactions(safeAddress))
-          dispatch(fetchCollectibles)
-          dispatch(checkAndUpdateSafe(safeAddress))
-        })
-      }, TIMEOUT * 3)
-      return () => {
-        clearInterval(collectiblesInterval)
-      }
-    }
-  }, [dispatch, safeAddress])
-}

src/routes/safe/container/hooks/useFetchTokens.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import { batch, useDispatch, useSelector } from 'react-redux'
+import { batch, useDispatch } from 'react-redux'
 import { useLocation } from 'react-router-dom'
 
 import fetchCollectibles from 'src/logic/collectibles/store/actions/fetchCollectibles'
@@ -8,11 +8,9 @@ import activateAssetsByBalance from 'src/logic/tokens/store/actions/activateAsse
 import fetchSafeTokens from 'src/logic/tokens/store/actions/fetchSafeTokens'
 import { fetchTokens } from 'src/logic/tokens/store/actions/fetchTokens'
 import { COINS_LOCATION_REGEX, COLLECTIBLES_LOCATION_REGEX } from 'src/routes/safe/components/Balances'
-import { safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
 
-export const useFetchTokens = (): void => {
+export const useFetchTokens = (safeAddress: string): void => {
   const dispatch = useDispatch()
-  const address: string | null = useSelector(safeParamAddressFromStateSelector)
   const location = useLocation()
 
   useMemo(() => {
@@ -20,17 +18,17 @@ export const useFetchTokens = (): void => {
       batch(() => {
         // fetch tokens there to get symbols for tokens in TXs list
         dispatch(fetchTokens())
-        dispatch(fetchCurrencyValues(address))
+        dispatch(fetchCurrencyValues(safeAddress))
-        dispatch(fetchSafeTokens(address))
+        dispatch(fetchSafeTokens(safeAddress))
       })
     }
 
     if (COLLECTIBLES_LOCATION_REGEX.test(location.pathname)) {
       batch(() => {
-        dispatch(fetchCollectibles()).then(() => {
+        dispatch(fetchCollectibles(safeAddress)).then(() => {
-          dispatch(activateAssetsByBalance(address))
+          dispatch(activateAssetsByBalance(safeAddress))
         })
       })
     }
-  }, [address, dispatch, location])
+  }, [dispatch, location.pathname, safeAddress])
 }

src/routes/safe/container/hooks/useSafeScheduledUpdates.tsx

@@ -0,0 +1,46 @@
+import { useEffect, useRef } from 'react'
+import { batch, useDispatch } from 'react-redux'
+
+import fetchCollectibles from 'src/logic/collectibles/store/actions/fetchCollectibles'
+import fetchSafeTokens from 'src/logic/tokens/store/actions/fetchSafeTokens'
+import fetchEtherBalance from 'src/routes/safe/store/actions/fetchEtherBalance'
+import { checkAndUpdateSafe } from 'src/routes/safe/store/actions/fetchSafe'
+import fetchTransactions from 'src/routes/safe/store/actions/transactions/fetchTransactions'
+import { TIMEOUT } from 'src/utils/constants'
+
+export const useSafeScheduledUpdates = (safeAddress: string): void => {
+  const dispatch = useDispatch()
+  const timer = useRef<number>(null)
+
+  useEffect(() => {
+    // using this variable to prevent setting a timeout when the component is already unmounted or the effect
+    // has to run again
+    let mounted = true
+    const fetchSafeData = async (address: string): Promise<void> => {
+      await batch(async () => {
+        await Promise.all([
+          dispatch(fetchEtherBalance(address)),
+          dispatch(fetchSafeTokens(address)),
+          dispatch(fetchTransactions(address)),
+          dispatch(fetchCollectibles(address)),
+          dispatch(checkAndUpdateSafe(address)),
+        ])
+      })
+
+      if (mounted) {
+        timer.current = setTimeout(() => {
+          fetchSafeData(safeAddress)
+        }, TIMEOUT * 3)
+      }
+    }
+
+    if (safeAddress) {
+      fetchSafeData(safeAddress)
+
+      return () => {
+        mounted = false
+        clearTimeout(timer.current)
+      }
+    }
+  }, [dispatch, safeAddress])
+}

src/routes/safe/container/index.tsx

@@ -7,7 +7,7 @@ import Page from 'src/components/layout/Page'
 import Layout from 'src/routes/safe/components/Layout'
 import { safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
 import { useLoadSafe } from './hooks/useLoadSafe'
-import { useCheckForUpdates } from './hooks/useCheckForUpdates'
+import { useSafeScheduledUpdates } from './hooks/useSafeScheduledUpdates'
 
 const INITIAL_STATE = {
   sendFunds: {
@@ -17,12 +17,12 @@ const INITIAL_STATE = {
   showReceive: false,
 }
 
-const SafeView = () => {
+const SafeView = (): JSX.Element => {
   const [state, setState] = useState(INITIAL_STATE)
   const safeAddress = useSelector(safeParamAddressFromStateSelector)
 
   useLoadSafe(safeAddress)
-  useCheckForUpdates()
+  useSafeScheduledUpdates(safeAddress)
 
   const onShow = (action) => () => {
     setState((prevState) => ({

src/routes/safe/store/actions/fetchEtherBalance.ts

@@ -1,12 +1,18 @@
 import { getBalanceInEtherOf } from 'src/logic/wallets/getWeb3'
 import updateSafe from 'src/routes/safe/store/actions/updateSafe'
 import { SAFE_REDUCER_ID } from 'src/routes/safe/store/reducer/safe'
+import { Dispatch } from 'redux'
+import { backOff } from 'exponential-backoff'
+import { AppReduxState } from 'src/store'
 
-const fetchEtherBalance = (safeAddress) => async (dispatch, getState) => {
+const fetchEtherBalance = (safeAddress: string) => async (
+  dispatch: Dispatch,
+  getState: () => AppReduxState,
+): Promise<void> => {
   try {
     const state = getState()
     const ethBalance = state[SAFE_REDUCER_ID].getIn([SAFE_REDUCER_ID, safeAddress, 'ethBalance'])
-    const newEthBalance = await getBalanceInEtherOf(safeAddress)
+    const newEthBalance = await backOff(() => getBalanceInEtherOf(safeAddress))
     if (newEthBalance !== ethBalance) {
       dispatch(updateSafe({ address: safeAddress, ethBalance: newEthBalance }))
     }

src/routes/safe/store/actions/fetchSafe.ts

@@ -14,6 +14,7 @@ import { makeOwner } from 'src/routes/safe/store/models/owner'
 
 import { checksumAddress } from 'src/utils/checksumAddress'
 import { SafeOwner } from '../models/safe'
+import { Dispatch } from 'redux'
 
 const buildOwnersFrom = (
   safeOwners,
@@ -71,7 +72,7 @@ export const buildSafe = async (safeAdd, safeName, latestMasterContractVersion?:
   return safe
 }
 
-export const checkAndUpdateSafe = (safeAdd) => async (dispatch) => {
+export const checkAndUpdateSafe = (safeAdd: string) => async (dispatch: Dispatch): Promise<void> => {
   const safeAddress = checksumAddress(safeAdd)
   // Check if the owner's safe did change and update them
   const safeParams = ['getThreshold', 'nonce', 'getOwners']

src/routes/safe/store/actions/transactions/fetchTransactions/index.ts

@@ -7,28 +7,39 @@ import { loadOutgoingTransactions } from './loadOutgoingTransactions'
 
 import { addOrUpdateCancellationTransactions } from 'src/routes/safe/store/actions/transactions/addOrUpdateCancellationTransactions'
 import { addOrUpdateTransactions } from 'src/routes/safe/store/actions/transactions/addOrUpdateTransactions'
+import { Dispatch } from 'redux'
+import { backOff } from 'exponential-backoff'
 
 const noFunc = () => {}
 
-export default (safeAddress: string) => async (dispatch) => {
+export default (safeAddress: string) => async (dispatch: Dispatch): Promise<void> => {
-  const transactions = await loadOutgoingTransactions(safeAddress)
+  try {
+    const transactions = await backOff(() => loadOutgoingTransactions(safeAddress))
 
-  if (transactions) {
+    if (transactions) {
-    const { cancel, outgoing } = transactions
+      const { cancel, outgoing } = transactions
-    const updateCancellationTxs = cancel.size
+      const updateCancellationTxs = cancel.size
-      ? addOrUpdateCancellationTransactions({ safeAddress, transactions: cancel })
+        ? addOrUpdateCancellationTransactions({ safeAddress, transactions: cancel })
-      : noFunc
+        : noFunc
-    const updateOutgoingTxs = outgoing.size ? addOrUpdateTransactions({ safeAddress, transactions: outgoing }) : noFunc
+      const updateOutgoingTxs = outgoing.size
+        ? addOrUpdateTransactions({
+            safeAddress,
+            transactions: outgoing,
+          })
+        : noFunc
 
-    batch(() => {
+      batch(() => {
-      dispatch(updateCancellationTxs)
+        dispatch(updateCancellationTxs)
-      dispatch(updateOutgoingTxs)
+        dispatch(updateOutgoingTxs)
-    })
+      })
-  }
+    }
 
-  const incomingTransactions = await loadIncomingTransactions(safeAddress)
+    const incomingTransactions = await loadIncomingTransactions(safeAddress)
 
-  if (incomingTransactions.get(safeAddress).size) {
+    if (incomingTransactions.get(safeAddress).size) {
-    dispatch(addIncomingTransactions(incomingTransactions))
+      dispatch(addIncomingTransactions(incomingTransactions))
+    }
+  } catch (error) {
+    console.log('Error fetching transactions:', error)
   }
 }

src/routes/safe/store/reducer/safe.ts

@@ -14,6 +14,7 @@ import { UPDATE_SAFE } from 'src/routes/safe/store/actions/updateSafe'
 import { makeOwner } from 'src/routes/safe/store/models/owner'
 import makeSafe from 'src/routes/safe/store/models/safe'
 import { checksumAddress } from 'src/utils/checksumAddress'
+import { SafeReducerMap } from './types/safe'
 
 export const SAFE_REDUCER_ID = 'safes'
 export const DEFAULT_SAFE_INITIAL_STATE = 'NOT_ASKED'
@@ -43,13 +44,17 @@ export const buildSafe = (storedSafe) => {
 
 export default handleActions(
   {
-    [UPDATE_SAFE]: (state, action) => {
+    [UPDATE_SAFE]: (state: SafeReducerMap, action) => {
       const safe = action.payload
       const safeAddress = safe.address
 
-      return state.updateIn([SAFE_REDUCER_ID, safeAddress], (prevSafe) => prevSafe.merge(safe))
+      return state.updateIn(
+        [SAFE_REDUCER_ID, safeAddress],
+        makeSafe({ name: 'LOADED SAFE', address: safeAddress }),
+        (prevSafe) => prevSafe.merge(safe),
+      )
     },
-    [ACTIVATE_TOKEN_FOR_ALL_SAFES]: (state, action) => {
+    [ACTIVATE_TOKEN_FOR_ALL_SAFES]: (state: SafeReducerMap, action) => {
       const tokenAddress = action.payload
 
       return state.withMutations((map) => {
@@ -64,7 +69,7 @@ export default handleActions(
           })
       })
     },
-    [ADD_SAFE]: (state, action) => {
+    [ADD_SAFE]: (state: SafeReducerMap, action) => {
       const { safe } = action.payload
 
       // if you add a new Safe it needs to be set as a record
@@ -77,12 +82,12 @@ export default handleActions(
 
       return state.setIn([SAFE_REDUCER_ID, safe.address], makeSafe(safe))
     },
-    [REMOVE_SAFE]: (state, action) => {
+    [REMOVE_SAFE]: (state: SafeReducerMap, action) => {
       const safeAddress = action.payload
 
       return state.deleteIn([SAFE_REDUCER_ID, safeAddress])
     },
-    [ADD_SAFE_OWNER]: (state, action) => {
+    [ADD_SAFE_OWNER]: (state: SafeReducerMap, action) => {
       const { ownerAddress, ownerName, safeAddress } = action.payload
 
       return state.updateIn([SAFE_REDUCER_ID, safeAddress], (prevSafe) =>
@@ -91,7 +96,7 @@ export default handleActions(
         }),
       )
     },
-    [REMOVE_SAFE_OWNER]: (state, action) => {
+    [REMOVE_SAFE_OWNER]: (state: SafeReducerMap, action) => {
       const { ownerAddress, safeAddress } = action.payload
 
       return state.updateIn([SAFE_REDUCER_ID, safeAddress], (prevSafe) =>
@@ -100,7 +105,7 @@ export default handleActions(
         }),
       )
     },
-    [REPLACE_SAFE_OWNER]: (state, action) => {
+    [REPLACE_SAFE_OWNER]: (state: SafeReducerMap, action) => {
       const { oldOwnerAddress, ownerAddress, ownerName, safeAddress } = action.payload
 
       return state.updateIn([SAFE_REDUCER_ID, safeAddress], (prevSafe) =>
@@ -111,7 +116,7 @@ export default handleActions(
         }),
       )
     },
-    [EDIT_SAFE_OWNER]: (state, action) => {
+    [EDIT_SAFE_OWNER]: (state: SafeReducerMap, action) => {
       const { ownerAddress, ownerName, safeAddress } = action.payload
 
       return state.updateIn([SAFE_REDUCER_ID, safeAddress], (prevSafe) => {
@@ -131,3 +136,5 @@ export default handleActions(
     latestMasterContractVersion: '',
   }),
 )
+
+export * from './types/safe.d'

src/routes/safe/store/reducer/types/safe.d.ts

@@ -0,0 +1,19 @@
+import { SafeRecord } from 'src/routes/safe/store/models/safe'
+import { Map } from 'immutable'
+
+export type SafesMap = Map<string, SafeRecord>
+
+export interface SafeReducerState {
+  defaultSafe: 'NOT_ASKED' | string | undefined
+  safes: SafesMap
+  latestMasterContractVersion: string
+}
+
+interface SafeReducerStateSerialized extends SafeReducerState {
+  safes: Record<string, SafeRecordProps>
+}
+
+export interface SafeReducerMap extends Map<string, any> {
+  toJS(): SafeReducerStateSerialized
+  get<K extends keyof SafeReducerState>(key: K): SafeReducerState[K]
+}

src/routes/safe/store/selectors/index.ts

@@ -1,20 +1,20 @@
 import { List, Map, Set } from 'immutable'
 import { matchPath } from 'react-router-dom'
 import { createSelector } from 'reselect'
-
-import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import { SAFELIST_ADDRESS, SAFE_PARAM_ADDRESS } from 'src/routes/routes'
 
 import { CANCELLATION_TRANSACTIONS_REDUCER_ID } from 'src/routes/safe/store/reducer/cancellationTransactions'
 import { INCOMING_TRANSACTIONS_REDUCER_ID } from 'src/routes/safe/store/reducer/incomingTransactions'
-import { SAFE_REDUCER_ID } from 'src/routes/safe/store/reducer/safe'
+import { SAFE_REDUCER_ID, SafesMap } from 'src/routes/safe/store/reducer/safe'
 import { TRANSACTIONS_REDUCER_ID } from 'src/routes/safe/store/reducer/transactions'
+import { AppReduxState } from 'src/store'
 
 import { checksumAddress } from 'src/utils/checksumAddress'
+import { SafeRecord } from 'src/routes/safe/store/models/safe'
 
-const safesStateSelector = (state) => state[SAFE_REDUCER_ID]
+const safesStateSelector = (state: AppReduxState) => state[SAFE_REDUCER_ID]
 
-export const safesMapSelector = (state) => state[SAFE_REDUCER_ID].get('safes')
+export const safesMapSelector = (state: AppReduxState): SafesMap => state[SAFE_REDUCER_ID].get('safes')
 
 export const safesListSelector = createSelector(safesMapSelector, (safes) => safes.toList())
 
@@ -26,18 +26,17 @@ export const latestMasterContractVersionSelector = createSelector(safesStateSele
   safeState.get('latestMasterContractVersion'),
 )
 
-const transactionsSelector = (state) => state[TRANSACTIONS_REDUCER_ID]
+const transactionsSelector = (state: AppReduxState) => state[TRANSACTIONS_REDUCER_ID]
 
-const cancellationTransactionsSelector = (state) => state[CANCELLATION_TRANSACTIONS_REDUCER_ID]
+const cancellationTransactionsSelector = (state: AppReduxState) => state[CANCELLATION_TRANSACTIONS_REDUCER_ID]
 
-const incomingTransactionsSelector = (state) => state[INCOMING_TRANSACTIONS_REDUCER_ID]
+const incomingTransactionsSelector = (state: AppReduxState) => state[INCOMING_TRANSACTIONS_REDUCER_ID]
 
-export const safeParamAddressFromStateSelector = (state): string | null => {
+export const safeParamAddressFromStateSelector = (state: AppReduxState): string | null => {
   const match = matchPath(state.router.location.pathname, { path: `${SAFELIST_ADDRESS}/:safeAddress` })
 
   if (match) {
-    const web3 = getWeb3()
+    return checksumAddress(match.params.safeAddress)
-    return web3.utils.toChecksumAddress(match.params.safeAddress)
   }
 
   return null
@@ -64,7 +63,7 @@ export const safeTransactionsSelector = createSelector(
   },
 )
 
-export const addressBookQueryParamsSelector = (state) => {
+export const addressBookQueryParamsSelector = (state: AppReduxState): string | null => {
   const { location } = state.router
   let entryAddressToEditOrCreateNew = null
   if (location && location.query) {
@@ -116,20 +115,26 @@ export const safeSelector = createSelector(safesMapSelector, safeParamAddressFro
   return safe
 })
 
-export const safeActiveTokensSelector = createSelector(safeSelector, (safe) => {
+export const safeActiveTokensSelector = createSelector(
-  if (!safe) {
+  safeSelector,
-    return List()
+  (safe): Set<string> => {
-  }
+    if (!safe) {
+      return Set()
+    }
 
-  return safe.activeTokens
+    return safe.activeTokens
-})
+  },
+)
 
-export const safeActiveAssetsSelector = createSelector(safeSelector, (safe) => {
+export const safeActiveAssetsSelector = createSelector(
-  if (!safe) {
+  safeSelector,
-    return List()
+  (safe): Set<string> => {
-  }
+    if (!safe) {
-  return safe.activeAssets
+      return Set()
-})
+    }
+    return safe.activeAssets
+  },
+)
 
 export const safeActiveAssetsListSelector = createSelector(safeActiveAssetsSelector, (safeList) => {
   if (!safeList) {
@@ -154,20 +159,21 @@ export const safeBlacklistedAssetsSelector = createSelector(safeSelector, (safe)
   return safe.blacklistedAssets
 })
 
-export const safeActiveAssetsSelectorBySafe = (safeAddress, safes) => safes.get(safeAddress).get('activeAssets')
+export const safeActiveAssetsSelectorBySafe = (safeAddress: string, safes: SafesMap) =>
+  safes.get(safeAddress).get('activeAssets')
 
 export const safeBlacklistedAssetsSelectorBySafe = (safeAddress, safes) =>
   safes.get(safeAddress).get('blacklistedAssets')
 
 export const safeBalancesSelector = createSelector(safeSelector, (safe) => {
   if (!safe) {
-    return List()
+    return Map()
   }
 
   return safe.balances
 })
 
-export const safeFieldSelector = (field) => (safe) => safe?.[field]
+export const safeFieldSelector = (field: string) => (safe: SafeRecord) => safe?.[field]
 
 export const safeNameSelector = createSelector(safeSelector, safeFieldSelector('name'))
 

src/store/index.ts

@@ -1,6 +1,6 @@
-import { connectRouter, routerMiddleware } from 'connected-react-router'
+import { connectRouter, routerMiddleware, RouterState } from 'connected-react-router'
 import { createHashHistory } from 'history'
-import { applyMiddleware, combineReducers, compose, createStore } from 'redux'
+import { applyMiddleware, CombinedState, combineReducers, compose, createStore } from 'redux'
 import thunk from 'redux-thunk'
 
 import addressBookMiddleware from 'src/logic/addressBook/store/middleware/addressBookMiddleware'
@@ -27,8 +27,12 @@ import cancellationTransactions, {
 import incomingTransactions, {
   INCOMING_TRANSACTIONS_REDUCER_ID,
 } from 'src/routes/safe/store/reducer/incomingTransactions'
-import safe, { SAFE_REDUCER_ID } from 'src/routes/safe/store/reducer/safe'
+import safe, { SAFE_REDUCER_ID, SafeReducerMap } from 'src/routes/safe/store/reducer/safe'
 import transactions, { TRANSACTIONS_REDUCER_ID } from 'src/routes/safe/store/reducer/transactions'
+import { Map } from 'immutable'
+import { NFTAssets, NFTTokens } from '../logic/collectibles/sources/OpenSea'
+import { ProviderRecord } from '../logic/wallets/store/model/provider'
+import { Token } from 'src/logic/tokens/store/model/token'
 
 export const history = createHashHistory({ hashType: 'slash' })
 
@@ -63,6 +67,23 @@ const reducers = combineReducers({
   [CURRENT_SESSION_REDUCER_ID]: currentSession,
 })
 
+export type AppReduxState = CombinedState<{
+  [PROVIDER_REDUCER_ID]?: ProviderRecord
+  [SAFE_REDUCER_ID]: SafeReducerMap
+  [NFT_ASSETS_REDUCER_ID]?: NFTAssets
+  [NFT_TOKENS_REDUCER_ID]?: NFTTokens
+  [TOKEN_REDUCER_ID]?: Map<string, Token>
+  [TRANSACTIONS_REDUCER_ID]: Map<string, any>
+  [CANCELLATION_TRANSACTIONS_REDUCER_ID]: Map<string, any>
+  [INCOMING_TRANSACTIONS_REDUCER_ID]: Map<string, any>
+  [NOTIFICATIONS_REDUCER_ID]: Map<string, any>
+  [CURRENCY_VALUES_KEY]: Map<string, any>
+  [COOKIES_REDUCER_ID]: Map<string, any>
+  [ADDRESS_BOOK_REDUCER_ID]: Map<string, any>
+  [CURRENT_SESSION_REDUCER_ID]: Map<string, any>
+  router: RouterState
+}>
+
 export const store: any = createStore(reducers, finalCreateStore)
 
 export const aNewStore = (localState?: any) => createStore(reducers, localState, finalCreateStore)

src/utils/checksumAddress.ts

@@ -1,6 +1,6 @@
 import { getWeb3 } from 'src/logic/wallets/getWeb3'
 
-export const checksumAddress = (address) => {
+export const checksumAddress = (address: string): string => {
   if (!address) return null
   return getWeb3().utils.toChecksumAddress(address)
 }