Merge branch 'moonbase-stg' into dev

.github/workflows/deploy.yml

@@ -17,7 +17,6 @@ env:
   REPO_NAME_ALPHANUMERIC: safereact
   STAGING_BUCKET_NAME: ${{ secrets.STAGING_BUCKET_NAME }}
   REACT_APP_SENTRY_DSN: ${{ secrets.SENTRY_DSN_MAINNET }}
-  REACT_APP_GOOGLE_ANALYTICS: ${{ secrets.REACT_APP_GOOGLE_ANALYTICS_ID_MAINNET }}
   REACT_APP_ETHERSCAN_API_KEY: ${{ secrets.REACT_APP_ETHERSCAN_API_KEY }}
   REACT_APP_ETHGASSTATION_API_KEY: ${{ secrets.REACT_APP_ETHGASSTATION_API_KEY }}
 
@@ -93,6 +92,9 @@ jobs:
           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 }}
+          REACT_APP_GOOGLE_TAG_MANAGER_ID: ${{ secrets.REACT_APP_GOOGLE_TAG_MANAGER_ID }}
+          REACT_APP_GOOGLE_TAG_MANAGER_LIVE_AUTH: ${{ secrets.REACT_APP_GOOGLE_TAG_MANAGER_LIVE_AUTH }}
+          REACT_APP_GOOGLE_TAG_MANAGER_DEVELOPMENT_AUTH: ${{ secrets.REACT_APP_GOOGLE_TAG_MANAGER_DEVELOPMENT_AUTH }}
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1

cypress.json

@@ -0,0 +1,3 @@
+{
+  "baseUrl": "http://localhost:3000/app"
+}

cypress/integration/landing.spec.js

@@ -0,0 +1,31 @@
+describe('Landing page', () => {
+  it('redirects to welcome page', () => {
+    cy.visit('/')
+
+    cy.url().should('include', '/app/welcome')
+  })
+
+  it('features discoverability cookies', () => {
+    cy.visit('/')
+
+    cy.findByTestId('cookies-banner-form').contains('We use cookies to provide you with the best experience')
+
+    cy.findByTestId('cookies-banner-form').contains('Accept selection').click()
+
+    cy.findByTestId('cookies-banner-form').should('not.exist')
+
+    cy.contains("What's new").click()
+
+    cy.findByTestId('cookies-banner-form').contains('We use cookies to provide you with the best experience')
+    cy.findByTestId('cookies-banner-form').contains('Please accept the community support & updates cookies.')
+
+    cy.findByTestId('cookies-banner-form').contains('Community support & updates').click()
+    cy.findByTestId('cookies-banner-form').contains('Accept selection').click()
+    cy.findByTestId('cookies-banner-form').should('not.exist')
+
+    // Open the features discoverability section
+    cy.wait(3000) // TODO: wait for Beamer cookies to be set
+    cy.contains("What's new").click()
+    cy.get('#beamerOverlay .iframeCointaner').should('exist')
+  })
+})

cypress/support/index.js

@@ -0,0 +1 @@
+import '@testing-library/cypress/add-commands'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-react",
-  "version": "3.21.0",
+  "version": "3.24.1",
   "description": "Allowing crypto users manage funds in a safer way",
   "website": "https://github.com/gnosis/safe-react#readme",
   "homepage": "/",
@@ -35,14 +35,14 @@
     "prettier": "prettier './src/**/*.{js,jsx,ts,tsx}'",
     "start": "rescripts start",
     "start:docker": "docker-compose build && docker-compose up",
-    "test": "REACT_APP_ENV=test rescripts test --env=jsdom",
+    "test": "cross-env REACT_APP_ENV=test rescripts test --env=jsdom",
     "test:coverage": "REACT_APP_ENV=test yarn test --coverage --watchAll=false",
     "test:ci": "REACT_APP_ENV=test yarn test --ci --coverage --json --watchAll=false --testLocationInResults --runInBand --outputFile=jest.results.json",
     "update-mocks": "./scripts/update-mocks.sh",
-    "storybook": "start-storybook -p 9009 -s public",
-    "build-storybook": "build-storybook -s public",
     "sentry-upload-sourcemaps": "sentry-cli --auth-token $SENTRY_AUTH_TOKEN releases -o $SENTRY_ORG -p $SENTRY_PROJECT files $npm_package_version upload-sourcemaps ./build/static/js/",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "cypress:open": "cypress open",
+    "cypress:run": "cypress run"
   },
   "lint-staged": {
     "src/**/*.{js,jsx,ts,tsx}": [
@@ -85,12 +85,12 @@
   },
   "dependencies": {
     "@ethersproject/hash": "^5.5.0",
-    "@gnosis.pm/safe-apps-sdk": "6.2.0",
+    "@gnosis.pm/safe-apps-sdk": "7.3.0",
     "@gnosis.pm/safe-apps-sdk-v1": "npm:@gnosis.pm/safe-apps-sdk@0.4.2",
     "@gnosis.pm/safe-core-sdk": "^2.0.0",
     "@gnosis.pm/safe-deployments": "^1.8.0",
-    "@gnosis.pm/safe-react-components": "^0.9.8",
-    "@gnosis.pm/safe-react-gateway-sdk": "^2.10.0",
+    "@gnosis.pm/safe-react-components": "^1.1.2",
+    "@gnosis.pm/safe-react-gateway-sdk": "^2.10.2",
     "@gnosis.pm/safe-web3-lib": "^1.0.0",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.0",
@@ -103,6 +103,7 @@
     "axios": "0.21.4",
     "bignumber.js": "9.0.1",
     "bnc-onboard": "^1.37.3",
+    "caniuse-lite": "^1.0.30001332",
     "classnames": "^2.2.6",
     "currency-flags": "3.2.1",
     "date-fns": "^2.20.2",
@@ -127,13 +128,14 @@
     "react-dom": "17.0.2",
     "react-final-form": "^6.5.3",
     "react-final-form-listeners": "^1.0.2",
-    "react-ga": "3.3.0",
+    "react-gtm-module": "^2.0.11",
     "react-intersection-observer": "^8.32.0",
     "react-papaparse": "^3.16.1",
     "react-qr-reader": "^2.2.1",
     "react-redux": "7.2.4",
     "react-router-dom": "5.2.0",
     "react-scripts": "^4.0.1",
+    "react-virtuoso": "^2.8.2",
     "redux": "4.1.1",
     "redux-actions": "^2.6.5",
     "redux-localstorage-simple": "^2.4.1",
@@ -151,11 +153,7 @@
     "@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",
-    "@storybook/addon-links": "^6.3.8",
-    "@storybook/addons": "^6.3.8",
-    "@storybook/preset-create-react-app": "^3.1.5",
-    "@storybook/react": "6.0.0",
+    "@testing-library/cypress": "^8.0.2",
     "@testing-library/jest-dom": "^5.11.10",
     "@testing-library/react": "^12.1.2",
     "@testing-library/react-hooks": "^7.0.2",
@@ -167,6 +165,7 @@
     "@types/node": "^16.9.1",
     "@types/react": "^17.0.21",
     "@types/react-dom": "^17.0.9",
+    "@types/react-gtm-module": "^2.0.1",
     "@types/react-redux": "^7.1.18",
     "@types/react-router-dom": "^5.1.9",
     "@types/redux-actions": "^2.6.2",
@@ -176,6 +175,7 @@
     "@typescript-eslint/parser": "^4.31.1",
     "concurrently": "^6.0.0",
     "cross-env": "^7.0.3",
+    "cypress": "^9.5.1",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
     "eslint": "^7.32.0",