Merge b71bf95 into c6ae498

protofire · Mar 14, 2022 · c59c3aa · c59c3aa
2 parents c6ae498 + b71bf95
commit c59c3aa
Show file tree

Hide file tree

Showing 192 changed files with 4,077 additions and 2,181 deletions.
diff --git a/.env.example b/.env.example
@@ -8,6 +8,7 @@ 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=

diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -21,6 +21,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,iamacook,yagopv,usame-algan,InoMurko
+          allowlist: lukasschor,mikheevm,rmeissner,germartinez,davidalbela,Uxio0,dasanra,francovenica,tschubotz,luarx,giacomolicari,gnosis-info,bot*,katspaugh,DaniSomoza,iamacook,yagopv,usame-algan
           empty-commit-flag: false
           blockchain-storage-flag: false
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -91,6 +91,7 @@ jobs:
           REACT_APP_SAFE_APPS_RPC_INFURA_TOKEN: ${{ secrets.REACT_APP_SAFE_APPS_RPC_INFURA_TOKEN }}
           REACT_APP_PORTIS_ID: ${{ secrets.REACT_APP_PORTIS_ID }}
           REACT_APP_INTERCOM_ID: ${{ secrets.REACT_APP_INTERCOM_ID }}
+          REACT_APP_BEAMER_ID: ${{ secrets.REACT_APP_BEAMER_ID }}
           REACT_APP_IPFS_GATEWAY: ${{ secrets.REACT_APP_IPFS_GATEWAY }}
 
       - name: Configure AWS credentials

diff --git a/.github/workflows/mint.yml b/.github/workflows/mint.yml
@@ -0,0 +1,34 @@
+name: Mint PR NFT
+
+on:
+  workflow_dispatch:
+    inputs:
+      prNumber:
+        description: 'PR number'
+        required: true
+
+jobs:
+  mint:
+    environment: Manual
+    name: Mint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mint
+        uses: web3actions/tx@d3833db41e58cb4e7f329027ad30211a22e1c5e5
+        with:
+          rpc-node: ${{ secrets.RPC_NODE}}
+          wallet-key: ${{ secrets.WALLET_KEY }}
+          contract: ${{ secrets.CONTRACT_ADDRESS }}
+          function: "mint(address _to, uint256 _tokenId, string _uri)"
+          inputs: '[ "${{ secrets.WALLET_ADDRESS }}", ${{ github.event.inputs.prNumber }}, "https://github.com/gnosis/safe-react/pull/${{ github.event.inputs.prNumber }}" ]'
+          value: "0"
+
+      - name: Set success comment
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          issue-number: ${{ github.event.inputs.prNumber }}
+          body: |
+            [<img alt="GitMint NFT preview" width="200" src="https://gitsvg.katspaugh.workers.dev/?svg=1&url=https://github.com/gnosis/safe-react/pull/${{ github.event.inputs.prNumber }}" />](https://blockscout.com/xdai/mainnet/token/${{ secrets.CONTRACT_ADDRESS }}/instance/${{ github.event.inputs.prNumber }})
+
+            Thank you for your contribution! Please, let us know your Ethereum address to receive [this NFT on Gnosis Chain](https://epor.io/tokens/${{ secrets.CONTRACT_ADDRESS }}/${{ github.event.inputs.prNumber }}?network=xDai).
+            Cheers! 🏆
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ Please see the [transaction](docs/transactions.md) notes for more information ab
 
 ## Getting Started
 
-These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See [Deployment](#deployment) for notes on how to deploy the project on a live system.
+These instructions will help you get a copy of the project up and running on your local machine for development and testing purposes. See [Deployment](#deployment) for notes on how to deploy the project on a live system.
 
 ### Prerequisites
 
@@ -88,7 +88,7 @@ docker-compose build && docker-compose up
 
 ### Building
 
-Te get a complete bundle using the current configuration use:
+To get a complete bundle using the current configuration use:
 
 ```
 yarn build

diff --git a/docs/release-procedure.md b/docs/release-procedure.md
@@ -15,10 +15,24 @@ git log origin/main..origin/dev --pretty=format:'* %s'
 ### QA
 * The QA team do regression testing on this branch
 * If issues are found, bugfixes are merged into this branch
-* Once the QA is done, we push the branch to `main`
-* `main` is automatically deployed to staging – some extra QA can be done there if needed
+* Once the QA is done, proceed to the next step
 
 ### Tag & release
+Wait for all the checks on GitHub to pass.
+* Switch to the main branch and make sure it's up to date:
+```
+git checkout main
+git fetch --all
+git reset --hard origin/main
+```
+* Pull from the release branch:
+```
+git pull origin release/3.15.0
+```
+* Push to main:
+```
+git push origin main
+```
 * Create and push a new version tag :
 ```
 git tag v3.15.0

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "safe-react",
-  "version": "3.19.0",
+  "version": "3.21.0",
   "description": "Allowing crypto users manage funds in a safer way",
   "website": "https://github.com/gnosis/safe-react#readme",
   "homepage": "/",
@@ -87,10 +87,11 @@
     "@ethersproject/hash": "^5.5.0",
     "@gnosis.pm/safe-apps-sdk": "6.2.0",
     "@gnosis.pm/safe-apps-sdk-v1": "npm:@gnosis.pm/safe-apps-sdk@0.4.2",
-    "@gnosis.pm/safe-core-sdk": "^1.3.0",
+    "@gnosis.pm/safe-core-sdk": "^2.0.0",
     "@gnosis.pm/safe-deployments": "^1.8.0",
-    "@gnosis.pm/safe-react-components": "^0.9.7",
-    "@gnosis.pm/safe-react-gateway-sdk": "2.8.3",
+    "@gnosis.pm/safe-react-components": "^0.9.8",
+    "@gnosis.pm/safe-react-gateway-sdk": "^2.10.0",
+    "@gnosis.pm/safe-web3-lib": "^1.0.0",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.0",
     "@material-ui/lab": "4.0.0-alpha.60",
@@ -101,7 +102,7 @@
     "abi-decoder": "^2.4.0",
     "axios": "0.21.4",
     "bignumber.js": "9.0.1",
-    "bnc-onboard": "~1.35.3",
+    "bnc-onboard": "^1.37.3",
     "classnames": "^2.2.6",
     "currency-flags": "3.2.1",
     "date-fns": "^2.20.2",
@@ -140,13 +141,14 @@
     "reselect": "^4.0.0",
     "semver": "^7.3.2",
     "styled-components": "^5.3.0",
-    "web3": "1.6.0",
-    "web3-core": "^1.6.0",
-    "web3-eth-contract": "^1.6.0",
-    "web3-utils": "^1.6.0"
+    "ua-parser-js": "^1.0.2",
+    "web3": "1.7.0",
+    "web3-core": "^1.7.0",
+    "web3-eth-contract": "^1.7.0",
+    "web3-utils": "^1.7.0"
   },
   "devDependencies": {
-    "@gnosis.pm/safe-core-sdk-types": "^0.1.1",
+    "@gnosis.pm/safe-core-sdk-types": "1.0.0",
     "@rescripts/cli": "^0.0.16",
     "@sentry/cli": "^1.67.2",
     "@storybook/addon-actions": "^6.3.8",
@@ -169,6 +171,7 @@
     "@types/react-router-dom": "^5.1.9",
     "@types/redux-actions": "^2.6.2",
     "@types/styled-components": "^5.1.11",
+    "@types/ua-parser-js": "^0.7.36",
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "@typescript-eslint/parser": "^4.31.1",
     "concurrently": "^6.0.0",

diff --git a/public/resources/logo.svg b/public/resources/logo.svg
diff --git a/public/resources/logo_120x120.png b/public/resources/logo_120x120.png
diff --git a/src/components/AppLayout/Footer/Footer.test.tsx b/src/components/AppLayout/Footer/Footer.test.tsx
@@ -1,5 +1,4 @@
 import Footer from './index'
-import CookiesBanner from 'src/components/CookiesBanner'
 import { render, fireEvent, screen } from 'src/utils/test-utils'
 
 describe('<Footer>', () => {
@@ -82,23 +81,6 @@ describe('<Footer>', () => {
     expect(cookiePolicyLinkNode).toHaveAttribute('target', '_blank')
   })
 
-  it('Should show preference cookies banner form when clicks on Preferences Link', () => {
-    render(
-      <>
-        <Footer />
-        <CookiesBanner />
-      </>,
-    )
-
-    expect(screen.queryByTestId('cookies-banner-form')).not.toBeInTheDocument()
-
-    const preferencesCookiesNode = screen.getByText('Preferences')
-
-    fireEvent.click(preferencesCookiesNode)
-
-    expect(screen.queryByTestId('cookies-banner-form')).toBeInTheDocument()
-  })
-
   it('Should show the current Safe React version if its defined in environment variables', () => {
     process.env.REACT_APP_APP_VERSION = '1.1.1'
 

diff --git a/src/components/AppLayout/Header/components/Layout.tsx b/src/components/AppLayout/Header/components/Layout.tsx
@@ -1,5 +1,4 @@
 import ClickAwayListener from '@material-ui/core/ClickAwayListener'
-import Grow from '@material-ui/core/Grow'
 import List from '@material-ui/core/List'
 import Popper from '@material-ui/core/Popper'
 import { withStyles } from '@material-ui/core/styles'
@@ -72,25 +71,22 @@ const styles = () => ({
 })
 
 const WalletPopup = ({ anchorEl, providerDetails, classes, open, onClose }) => {
+  if (!open) {
+    return null
+  }
   return (
     <Popper
       anchorEl={anchorEl}
       className={classes.popper}
-      open={open}
+      open
       placement="bottom"
       popperOptions={{ positionFixed: true }}
     >
-      {({ TransitionProps }) => (
-        <Grow {...TransitionProps}>
-          <>
-            <ClickAwayListener mouseEvent="onClick" onClickAway={onClose} touchEvent={false}>
-              <List className={classes.root} component="div">
-                {providerDetails}
-              </List>
-            </ClickAwayListener>
-          </>
-        </Grow>
-      )}
+      <ClickAwayListener mouseEvent="onClick" onClickAway={onClose} touchEvent={false}>
+        <List className={classes.root} component="div">
+          {providerDetails}
+        </List>
+      </ClickAwayListener>
     </Popper>
   )
 }

diff --git a/src/components/AppLayout/Header/components/ProviderDetails/ConnectDetails.tsx b/src/components/AppLayout/Header/components/ProviderDetails/ConnectDetails.tsx
@@ -1,51 +1,55 @@
-import { withStyles } from '@material-ui/core/styles'
 import { ReactElement } from 'react'
+import { withStyles } from '@material-ui/core/styles'
+import { Card } from '@gnosis.pm/safe-react-components'
+import styled from 'styled-components'
 
 import ConnectButton from 'src/components/ConnectButton'
-
 import Block from 'src/components/layout/Block'
 import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
 import { KeyRing } from 'src/components/AppLayout/Header/components/KeyRing'
-import { Card } from '@gnosis.pm/safe-react-components'
-import styled from 'styled-components'
+// import { isPairingSupported } from 'src/logic/wallets/pairing/utils'
+// import { wrapInSuspense } from 'src/utils/wrapInSuspense'
+// We need lazy import because the component imports static css that should only be applied if the component is rendered
+// const PairingDetails = lazy(() => import('src/components/AppLayout/Header/components/ProviderDetails/PairingDetails'))
 
 const styles = () => ({
-  logo: {
-    justifyContent: 'center',
-  },
-  text: {
-    letterSpacing: '-0.6px',
+  header: {
+    letterSpacing: '0.4px',
     flexGrow: 1,
     textAlign: 'center',
+    fontWeight: 600,
+    fontSize: '18px',
   },
-  connect: {
+  centerText: {
     textAlign: 'center',
-    marginTop: '60px',
   },
-  connectText: {
-    letterSpacing: '1px',
+  justifyCenter: {
+    justifyContent: 'center',
   },
-  img: {
-    margin: '0px 2px',
+  appStore: {
+    height: '35px',
   },
 })
 
 const StyledCard = styled(Card)`
   padding: 20px;
+  max-width: 240px;
 `
+
 const ConnectDetails = ({ classes }): ReactElement => (
   <StyledCard>
     <Row align="center" margin="lg">
-      <Paragraph className={classes.text} noMargin size="xl" weight="bolder">
+      <Paragraph className={classes.header} noMargin>
         Connect a Wallet
       </Paragraph>
     </Row>
 
-    <Row className={classes.logo}>
+    <Row className={classes.justifyCenter} margin="lg">
       <KeyRing center circleSize={60} dotRight={20} dotSize={20} dotTop={50} keySize={28} mode="error" />
     </Row>
-    <Block className={classes.connect}>
+
+    <Block className={classes.centerText}>
       <ConnectButton data-testid="heading-connect-btn" />
     </Block>
   </StyledCard>