Release v3.2.0

.eslintrc.js

@@ -1,10 +1,10 @@
 module.exports = {
   parser: '@typescript-eslint/parser',
   extends: [
-    'plugin:react/recommended',
-    'plugin:@typescript-eslint/recommended',
-    'prettier/@typescript-eslint',
-    'plugin:prettier/recommended',
+    'plugin:react/recommended', // React recommended rules plugin
+    'plugin:@typescript-eslint/recommended', // Plugin to use typescript with eslint
+    'prettier', // Add prettier rules to eslint
+    'plugin:prettier/recommended', // Plugin to use prettier rules with eslint
   ],
   plugins: ['react-hooks'],
   parserOptions: {

.github/workflows/deploy-ewc.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   REPO_NAME_ALPHANUMERIC: safereact
-  REACT_APP_NETWORK: 'ewc'
+  REACT_APP_NETWORK: 'energy_web_chain'
   STAGING_BUCKET_NAME: ${{ secrets.STAGING_EWC_BUCKET_NAME }}
   REACT_APP_SENTRY_DSN: ${{ secrets.SENTRY_DSN_EWC }}
   REACT_APP_GOOGLE_ANALYTICS: ${{ secrets.REACT_APP_GOOGLE_ANALYTICS_ID_EWC }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-react",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "Allowing crypto users manage funds in a safer way",
   "website": "https://github.com/gnosis/safe-react#readme",
   "bugs": {
@@ -161,21 +161,21 @@
     "@gnosis.pm/safe-apps-sdk": "1.0.3",
     "@gnosis.pm/safe-apps-sdk-v1": "npm:@gnosis.pm/[email protected]",
     "@gnosis.pm/safe-contracts": "1.1.1-dev.2",
-    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#fb1a523",
+    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#f610327",
     "@gnosis.pm/util-contracts": "2.0.6",
-    "@ledgerhq/hw-transport-node-hid-singleton": "5.41.0",
+    "@ledgerhq/hw-transport-node-hid-singleton": "5.45.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.11.0",
     "@material-ui/lab": "4.0.0-alpha.57",
     "@openzeppelin/contracts": "3.1.0",
-    "@sentry/react": "^5.30.0",
-    "@sentry/tracing": "^5.30.0",
+    "@sentry/react": "^6.2.1",
+    "@sentry/tracing": "^6.2.1",
     "@truffle/contract": "^4.3.0",
     "@unstoppabledomains/resolution": "^1.17.0",
     "async-sema": "^3.1.0",
     "axios": "0.21.1",
     "bignumber.js": "9.0.1",
-    "bnc-onboard": "1.19.2",
+    "bnc-onboard": "~1.20.0",
     "classnames": "^2.2.6",
     "concurrently": "^5.3.0",
     "connected-react-router": "6.8.0",
@@ -186,13 +186,13 @@
     "electron-is-dev": "^1.2.0",
     "electron-log": "^4.3.0",
     "electron-settings": "^4.0.2",
-    "electron-updater": "4.3.5",
+    "electron-updater": "4.3.8",
     "eth-sig-util": "^2.5.3",
     "ethereum-blockies-base64": "^1.0.2",
     "ethereumjs-abi": "0.6.8",
     "exponential-backoff": "^3.1.0",
     "express": "^4.17.1",
-    "final-form": "^4.20.1",
+    "final-form": "^4.20.2",
     "final-form-calculate": "^1.3.2",
     "history": "4.10.1",
     "immortal-db": "^1.1.0",
@@ -207,7 +207,7 @@
     "notistack": "https://github.com/gnosis/notistack.git#v0.9.4",
     "object-hash": "^2.1.1",
     "qrcode.react": "1.0.1",
-    "query-string": "6.13.8",
+    "query-string": "6.14.1",
     "react": "16.13.1",
     "react-device-detect": "^1.15.0",
     "react-dom": "16.13.1",
@@ -233,50 +233,50 @@
     "web3-utils": "^1.2.11"
   },
   "devDependencies": {
-    "@rescripts/cli": "^0.0.15",
-    "@sentry/cli": "^1.62.0",
+    "@rescripts/cli": "^0.0.16",
+    "@sentry/cli": "^1.63.1",
     "@storybook/addon-actions": "^5.3.19",
     "@storybook/addon-links": "^5.3.19",
     "@storybook/addons": "^5.3.19",
     "@storybook/preset-create-react-app": "^3.1.5",
     "@storybook/react": "^5.3.19",
     "@testing-library/jest-dom": "^5.11.6",
     "@testing-library/react": "^11.2.2",
-    "@typechain/web3-v1": "^2.0.0",
+    "@typechain/web3-v1": "^2.2.0",
     "@types/history": "4.6.2",
     "@types/jest": "^26.0.16",
     "@types/lodash.get": "^4.4.6",
     "@types/lodash.memoize": "^4.1.6",
-    "@types/node": "^14.14.10",
-    "@types/react": "^16.9.55",
+    "@types/node": "^14.14.30",
+    "@types/react": "^16.14.5",
     "@types/react-dom": "^16.9.9",
     "@types/react-redux": "^7.1.11",
     "@types/react-router-dom": "^5.1.6",
     "@types/redux-actions": "^2.6.1",
     "@types/styled-components": "^5.1.4",
-    "@typescript-eslint/eslint-plugin": "^4.14.0",
-    "@typescript-eslint/parser": "^4.14.0",
+    "@typescript-eslint/eslint-plugin": "^4.17.0",
+    "@typescript-eslint/parser": "^4.17.0",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-expand": "^5.1.0",
     "electron": "^9.4.0",
-    "electron-builder": "22.9.1",
+    "electron-builder": "22.10.5",
     "electron-notarize": "1.0.0",
     "eslint": "^7.17.0",
-    "eslint-config-prettier": "^7.2.0",
+    "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
-    "husky": "^4.3.0",
+    "husky": "~4.3.8",
     "lint-staged": "^10.5.2",
-    "patch-package": "^6.2.2",
+    "patch-package": "^6.4.6",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.2.0",
     "sass": "^1.32.0",
     "typechain": "^4.0.0",
-    "typescript": "4.1.3",
+    "typescript": "4.2.3",
     "wait-on": "5.2.1"
   }
 }

src/components/App/ReceiveModal.tsx

@@ -94,7 +94,7 @@ const ReceiveModal = ({ onClose, safeAddress, safeName }: Props): ReactElement =
     <>
       <Row align="center" className={classes.heading} grow>
         <Paragraph noMargin size="xl" weight="bolder">
-          Receive funds
+          Receive assets
         </Paragraph>
         <IconButton disableRipple onClick={onClose}>
           <Close className={classes.close} />
@@ -106,7 +106,7 @@ const ReceiveModal = ({ onClose, safeAddress, safeName }: Props): ReactElement =
       </Paragraph>
       <Paragraph className={classes.annotation} noMargin size="lg">
         This is the address of your Safe. Deposit funds by scanning the QR code or copying the address below. Only send{' '}
-        {networkInfo.nativeCoin.name} and ERC-20 tokens to this address!
+        {networkInfo.nativeCoin.name} and assets to this address (e.g. ETH, ERC20, ERC721)!
       </Paragraph>
       <Col layout="column" middle="xs">
         <Paragraph className={classes.safeName} noMargin size="lg" weight="bold">

src/components/AppLayout/Sidebar/SafeHeader/index.tsx

@@ -171,7 +171,7 @@ const SafeHeader = ({
         <StyledButton size="md" disabled={!granted} color="primary" variant="contained" onClick={onNewTransactionClick}>
           <FixedIcon type="arrowSentWhite" />
           <Text size="lg" color="white">
-            New Transaction
+            New transaction
           </Text>
         </StyledButton>
       </Container>

src/components/CookiesBanner/index.tsx

@@ -129,6 +129,10 @@ const CookiesBanner = (): ReactElement => {
         }
         setLocalAnalytics(acceptedAnalytics)
         setLocalNecessary(acceptedNecessary)
+
+        if (acceptedAnalytics && !isDesktop) {
+          loadGoogleAnalytics()
+        }
       }
     }
     fetchCookiesFromStorage()
@@ -162,10 +166,6 @@ const CookiesBanner = (): ReactElement => {
     dispatch.current(openCookieBanner({ cookieBannerOpen: false }))
   }
 
-  if (showAnalytics && !isDesktop) {
-    loadGoogleAnalytics()
-  }
-
   if (showIntercom) {
     loadIntercom()
   }

src/components/Stepper/index.tsx

@@ -11,6 +11,7 @@ import Controls from './Controls'
 import GnoForm from 'src/components/forms/GnoForm'
 import Hairline from 'src/components/layout/Hairline'
 import { history } from 'src/store'
+import { LoadFormValues } from 'src/routes/load/container/Load'
 
 const transitionProps = {
   timeout: {
@@ -20,7 +21,7 @@ const transitionProps = {
 }
 
 export interface StepperPageFormProps {
-  values: Record<string, string>
+  values: LoadFormValues
   errors: Record<string, string>
   form: FormApi
 }

src/config/networks/energy_web_chain.ts

@@ -55,7 +55,6 @@ const mainnet: NetworkConfig = {
     WALLETS.PORTIS,
     WALLETS.TORUS,
     WALLETS.TRUST,
-    WALLETS.WALLET_CONNECT,
     WALLETS.WALLET_LINK,
     WALLETS.AUTHEREUM,
     WALLETS.LATTICE,

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

@@ -16,10 +16,6 @@ export const nftAssetsListSelector = createSelector(nftAssets, (assets): NFTAsse
   return assets ? Object.values(assets) : []
 })
 
-export const nftAssetsListAddressesSelector = createSelector(nftAssetsListSelector, (assets): string[] => {
-  return Array.from(new Set(assets.map((nftAsset) => nftAsset.address)))
-})
-
 export const availableNftAssetsAddresses = createSelector(nftTokensSelector, (userNftTokens): string[] => {
   return Array.from(new Set(userNftTokens.map((nftToken) => nftToken.assetAddress)))
 })