fetch upstream

.dockerignore

@@ -1,2 +1,7 @@
 **/node_modules
 **/coverage
+**/build
+.DS_Store
+**/.idea
+**/dist
+*Dockerfile*

.env.example

@@ -1,12 +1,14 @@
-# You can leave this empty for rinkeby or use "mainnet"
-REACT_APP_NETWORK=
+# Define environment
+REACT_APP_ENV=
 
 # For all environments
+REACT_APP_GATEWAY_URL=
 REACT_APP_GOOGLE_ANALYTICS=
 REACT_APP_INFURA_TOKEN=
 REACT_APP_IPFS_GATEWAY=https://ipfs.io/ipfs
 REACT_APP_SENTRY_DSN=
 REACT_APP_SAFE_APPS_RPC_INFURA_TOKEN=
+REACT_APP_BEAMER_ID=
 
 # For production environments
 REACT_APP_INTERCOM_ID=
@@ -17,15 +19,21 @@ REACT_APP_COLLECTIBLES_SOURCE=
 REACT_APP_ETHERSCAN_API_KEY=
 REACT_APP_ETHGASSTATION_API_KEY=
 
+# For tx simulation
+REACT_APP_TENDERLY_SIMULATE_ENDPOINT_URL=
+REACT_APP_TENDERLY_PROJECT_NAME=
+REACT_APP_TENDERLY_ORG_NAME=
+
+
 # Versions
 REACT_APP_LATEST_SAFE_VERSION=
 
 # Leave it untouched, version will set using dotenv-expand
 REACT_APP_APP_VERSION=$npm_package_version
 
-# For Apps
-REACT_APP_GNOSIS_APPS_URL=https://safe-apps.staging.gnosisdev.com
-
 # Contracts Addresses
-REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS=0x9e9Bf12b5a66c0f0A7435835e0365477E121B110
+REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS=
+
+# Test mnemonic for Cypress e2e testing
+CYPRESS_MNEMONIC=
 

.eslintignore

@@ -1,13 +1,11 @@
 !.eslintrc.js
 build
 config
-contracts
 flow-typed
 flow-typed/npm
 migrations
 node_modules
 src/assets
-src/config
 test
 *.spec*
 *.test*

.eslintrc.js

@@ -5,6 +5,7 @@ module.exports = {
     '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
+    'plugin:react/jsx-runtime', // Add runtime rules for React 17
   ],
   plugins: ['react-hooks'],
   parserOptions: {
@@ -15,14 +16,24 @@ module.exports = {
     },
   },
   rules: {
+    // Errors:
     'react-hooks/rules-of-hooks': 'error',
-    'react-hooks/exhaustive-deps': 'warn',
-    'react/prop-types': 'off',
-    '@typescript-eslint/camelcase': 'off',
-    '@typescript-eslint/no-var-requires': 'off',
-    '@typescript-eslint/no-empty-function': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
+    'react-hooks/exhaustive-deps': 'error',
+    'react/no-danger': 'error', // Prevent usage of dangerous JSX props
+    'react/self-closing-comp': ['error', { component: true, html: true }],
+    'react/void-dom-elements-no-children': 'error', // No passing of children to void DOM elements
+    'react/jsx-boolean-value': 'error', // Boolean attributes notation in JSX
+    'react/jsx-key': 'error', // Missing iterators/collection literals keys
+    'react/jsx-no-useless-fragment': ['error', { allowExpressions: true }],
     '@typescript-eslint/no-unused-vars': ['error', { ignoreRestSiblings: true }],
+    // Disabled:
+    'react/react-in-jsx-scope': 'off', // React 17+ doesn't require the explicit import of React
+    '@typescript-eslint/no-empty-function': 'off', // Sometimes we use empty functions as context defaults
+    /**
+     * The following was added by legacy devs to suppress warnings
+     */
+    '@typescript-eslint/no-explicit-any': 'off',
+    'react/prop-types': 'off',
   },
   settings: {
     react: {

.github/ISSUE_TEMPLATE/bug-report.md

@@ -4,17 +4,15 @@ about: Create an issue to fix a bug
 ---
 
 <!--
-BEFORE SUBMITTING: Please search to make sure this issue has not been opened already
+BEFORE SUBMITTING: Please search to make sure this issue hasn't been reported already
 -->
 
 ## Description
 
 ## Environment
- - Browser:
+ - Browser: Chrome
  - Wallet: MetaMask
- - Safe:
- - Environment:
-   - production (rinkeby)
+ - Chain: Rinkeby
 
 ## Steps to reproduce
  1. Go to

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,17 +1,24 @@
 ---
 name: Feature request
 about: Create a feature request for the Gnosis Safe
-
 ---
 
-## Overview
+<!--
+
+NB: this repository is ONLY for the React frontend of the Safe app.
+Please make sure your feature request is related specifically to the frontend.
+
+For general technical QUESTIONS about the Safe, we strongly prefer StackExchange:
+https://ethereum.stackexchange.com/questions/tagged/gnosis-safe
 
-## Goals
+Thank you!
+
+-->
+
+## Overview
 
 ## Requirements
 
-## Screens
- - Figma:
- - Zeplin:
+## Designs
 
 ## Links

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,4 +5,6 @@ Resolves #
 
 ## How to test it
 
+## Analytics changes
+
 ## Screenshots

.github/workflows/cla.yml

@@ -10,8 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'CLA Assistant'
-        if: (github.event.comment.body == 'recheckcla' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        # Alpha Release
+        if: github.base_ref != 'main' && ((github.event.comment.body == 'recheckcla' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target')
         uses: gnosis/github-action@master
         # GitHub token, automatically provided to the action
         # (No need to define this secret in the repo settings)
@@ -21,6 +20,6 @@ jobs:
           path-to-signatures: 'signatures/version1/cla.json'
           path-to-cla-document: 'https://github.com/gnosis/safe-react/blob/main/GNOSISCLA.md'
           branch: 'cla-signatures'
-          allowlist: lukasschor,mikheevm,rmeissner,germartinez,davidalbela,Uxio0,dasanra,francovenica,tschubotz,luarx,giacomolicari,gnosis-info,bot*,katspaugh,DaniSomoza
+          allowlist: lukasschor,mikhailxyz,rmeissner,germartinez,davidalbela,Uxio0,dasanra,francovenica,tschubotz,luarx,giacomolicari,gnosis-info,bot*,katspaugh,DaniSomoza,iamacook,yagopv,usame-algan,schmanu
           empty-commit-flag: false
           blockchain-storage-flag: false

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ dev ]
+  schedule:
+    - cron: '37 9 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1