Merge tag 'v1.14.0' into evmos-stg

# Conflicts: # package.json # public/images/logo.svg # src/components/common/CookieBanner/index.tsx # src/components/common/Footer/index.tsx # src/components/common/Header/styles.module.css # src/components/common/MetaTags/index.tsx # src/components/safe-apps/SafeAppsHeader/index.tsx # src/components/sidebar/SidebarFooter/index.tsx # src/pages/address-book.tsx # src/pages/balances/index.tsx # src/pages/balances/nfts.tsx # src/pages/home.tsx # src/pages/new-safe/load.tsx # src/pages/settings/appearance.tsx # src/pages/settings/modules.tsx # src/pages/settings/safe-apps/index.tsx # src/pages/settings/setup.tsx # src/pages/settings/spending-limits.tsx # src/pages/transactions/history.tsx # src/pages/transactions/queue.tsx # src/pages/transactions/tx.tsx # src/pages/welcome.tsx # src/services/ls-migration/config.ts # yarn.lock
aura-nw · Jul 18, 2023 · 3964b72 · 3964b72
2 parents 4260f38 + a409dfc
commit 3964b72
Show file tree

Hide file tree

Showing 516 changed files with 17,667 additions and 5,083 deletions.
diff --git a/.env.example b/.env.example
@@ -23,6 +23,14 @@ NEXT_PUBLIC_BEAMER_ID=
 
 # Wallet-specific variables
 NEXT_PUBLIC_WC_BRIDGE=
+NEXT_PUBLIC_WC_PROJECT_ID=
 
 # E2E tests
-NEXT_PUBLIC_CYPRESS_MNEMONIC=
+NEXT_PUBLIC_CYPRESS_MNEMONIC=
+
+# Safe Gelato relay service
+NEXT_PUBLIC_SAFE_GELATO_RELAY_SERVICE_URL_PRODUCTION=
+NEXT_PUBLIC_SAFE_GELATO_RELAY_SERVICE_URL_STAGING=
+
+# Redefine
+NEXT_PUBLIC_REDEFINE_API=
diff --git a/.github/workflows/build/action.yml b/.github/workflows/build/action.yml
@@ -6,7 +6,7 @@ inputs:
   secrets:
     required: true
 
-  prod:  # id of input
+  prod: # id of input
     description: 'Production build flag'
     required: false
 
@@ -22,6 +22,9 @@ runs:
       run: yarn build && yarn export
       env:
         NEXT_PUBLIC_IS_PRODUCTION: ${{ inputs.prod }}
+        NEXT_PUBLIC_GATEWAY_URL_PRODUCTION: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_GATEWAY_URL_PRODUCTION }}
+        NEXT_PUBLIC_GATEWAY_URL_STAGING: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_GATEWAY_URL_STAGING }}
+        NEXT_PUBLIC_SAFE_VERSION: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SAFE_VERSION }}
         NEXT_PUBLIC_BEAMER_ID: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_BEAMER_ID }}
         NEXT_PUBLIC_GOOGLE_TAG_MANAGER_DEVELOPMENT_AUTH: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_GOOGLE_TAG_MANAGER_DEVELOPMENT_AUTH }}
         NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID }}
@@ -34,4 +37,9 @@ runs:
         NEXT_PUBLIC_TENDERLY_PROJECT_NAME: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_TENDERLY_PROJECT_NAME }}
         NEXT_PUBLIC_TENDERLY_SIMULATE_ENDPOINT_URL: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_TENDERLY_SIMULATE_ENDPOINT_URL }}
         NEXT_PUBLIC_WC_BRIDGE: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_WC_BRIDGE }}
+        NEXT_PUBLIC_WC_PROJECT_ID: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_WC_PROJECT_ID }}
         NEXT_PUBLIC_CYPRESS_MNEMONIC: ${{ inputs.e2e_mnemonic }}
+        NEXT_PUBLIC_SAFE_RELAY_SERVICE_URL_PRODUCTION: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SAFE_GELATO_RELAY_SERVICE_URL_PRODUCTION }}
+        NEXT_PUBLIC_SAFE_RELAY_SERVICE_URL_STAGING: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SAFE_GELATO_RELAY_SERVICE_URL_STAGING }}
+        NEXT_PUBLIC_IS_OFFICIAL_HOST: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_IS_OFFICIAL_HOST }}
+        NEXT_PUBLIC_REDEFINE_API: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_REDEFINE_API }}
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -20,7 +20,7 @@ jobs:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACCESS_TOKEN }}
         with:
           path-to-signatures: 'signatures/version1/cla.json'
-          path-to-document: 'https://safe.global/cla/' # e.g. a CLA or a DCO document
+          path-to-document: 'https://safe.global/cla' # e.g. a CLA or a DCO document
           # branch should not be protected
           branch: 'main'
           # user names of users allowed to contribute without CLA

diff --git a/.github/workflows/deploy-dockerhub.yml b/.github/workflows/deploy-dockerhub.yml
@@ -25,14 +25,14 @@ jobs:
       if: github.ref == 'refs/heads/main'
       run: bash scripts/github/deploy_docker.sh staging
       env:
-        DOCKERHUB_PROJECT: web-core
+        DOCKERHUB_PROJECT: ${{ secrets.DOCKER_PROJECT }}
     - name: Deploy Dockerhub dev
       if: github.ref == 'refs/heads/dev'
       run: bash scripts/github/deploy_docker.sh dev
       env:
-        DOCKERHUB_PROJECT: web-core
+        DOCKERHUB_PROJECT: ${{ secrets.DOCKER_PROJECT }}
     - name: Deploy Dockerhub tag
       if: startsWith(github.ref, 'refs/tags/')
       run: bash scripts/github/deploy_docker.sh ${GITHUB_REF##*/}
       env:
-        DOCKERHUB_PROJECT: web-core
+        DOCKERHUB_PROJECT: ${{ secrets.DOCKER_PROJECT }}
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -11,11 +11,6 @@ jobs:
     env:
       ARCHIVE_NAME: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
       - uses: actions/checkout@v3
 
       - uses: ./.github/workflows/yarn

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -8,6 +8,10 @@ on:
       - dev
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -17,11 +21,6 @@ jobs:
     name: Deploy to dev/staging
 
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
       # Post a PR comment before deploying
       - name: Post a comment while building
         if: github.event.number
@@ -70,14 +69,14 @@ jobs:
         shell: bash
         ## Cut off "refs/heads/" and only allow alphanumeric characters,
         ## e.g. "refs/heads/features/hello-1.2.0" -> "features_hello_1_2_0"
-        run: echo "##[set-output name=branch;]$(echo $GITHUB_HEAD_REF | sed 's/refs\/heads\///' | sed 's/[^a-z0-9]/_/ig')"
+        run: echo "branch=$(echo $GITHUB_HEAD_REF | sed 's/refs\/heads\///' | sed 's/[^a-z0-9]/_/ig')" >> $GITHUB_OUTPUT
         id: extract_branch
 
       # Deploy to S3
       - name: Deploy PR branch
         if: github.event.number
         env:
-          BUCKET: s3://${{ secrets.AWS_REVIEW_BUCKET_NAME }}/webcore/${{ steps.extract_branch.outputs.branch }}
+          BUCKET: s3://${{ secrets.AWS_REVIEW_BUCKET_NAME }}/walletweb/${{ steps.extract_branch.outputs.branch }}
         run: bash ./scripts/github/s3_upload.sh
 
       # Comnment
@@ -90,7 +89,7 @@ jobs:
             ## Branch preview
             ✅  Deploy successful!
 
-            https://${{ steps.extract_branch.outputs.branch }}--webcore.review-web-core.5afe.dev
+            https://${{ steps.extract_branch.outputs.branch }}--walletweb.review-wallet-web.5afe.dev
           message-failure: |
             ## Branch preview
             ❌  Deploy failed!
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -3,16 +3,15 @@ name: e2e
 on:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   e2e:
     runs-on: ubuntu-latest
     name: Smoke E2E tests
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
       - uses: actions/checkout@v3
 
       - uses: ./.github/workflows/yarn

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,15 +1,14 @@
 name: 'Lint'
 on: [pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   eslint:
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
       - uses: actions/checkout@v3
 
       - uses: ./.github/workflows/yarn

diff --git a/.github/workflows/safe-apps-e2e.yml b/.github/workflows/safe-apps-e2e.yml
@@ -4,16 +4,15 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   e2e:
     runs-on: ubuntu-latest
     name: Safe Apps E2E tests
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
       - uses: actions/checkout@v3
 
       - uses: ./.github/workflows/yarn

diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml
@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
         if: github.event.pull_request.merged == true
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
@@ -22,23 +22,20 @@ jobs:
         run: |
           NEW_VERSION=$(node -p 'require("./package.json").version')
           echo "version=v$NEW_VERSION" >> $GITHUB_OUTPUT
-          echo "${{ github.event.pull_request.body }}" > CHANGELOG.md
 
       - name: Create a git tag
         if: github.event.pull_request.merged == true
-        run: git tag $NEW_VERSION && git push --tags
-        env:
-          NEW_VERSION: ${{ steps.version.outputs.version }}
+        run: git tag ${{ steps.version.outputs.version }} && git push --tags
 
       - name: GitHub release
         if: success()
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v1
         id: create_release
         with:
           draft: true
           prerelease: false
-          release_name: ${{ steps.version.outputs.version }}
+          name: ${{ steps.version.outputs.version }}
           tag_name: ${{ steps.version.outputs.version }}
-          body_path: CHANGELOG.md
+          body: ${{ github.event.pull_request.body }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,15 +6,14 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel previous runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
       - uses: actions/checkout@v3
 
       - uses: ./.github/workflows/yarn

diff --git a/.github/workflows/yarn/action.yml b/.github/workflows/yarn/action.yml
@@ -10,7 +10,6 @@ runs:
       with:
         path: '**/node_modules'
         key: web-core-modules-${{ hashFiles('**/yarn.lock') }}
-
     - name: Yarn install
       shell: bash
-      run: yarn install --immutable
+      run: yarn install --frozen-lockfile
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ yalc.lock
 .env
 
 /cypress/videos
+/cypress/screenshots
 /cypress/downloads
 
 /public/sw.js

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Please note we have a Code of Conduct (see below), please follow it in all your
 
 ## CLA
 
-It is a requirement for all contributors to sign the [Contributor License Agreement (CLA)](safe.global/cla/) in order to proceed with their contribution.
+It is a requirement for all contributors to sign the [Contributor License Agreement (CLA)](https://safe.global/cla) in order to proceed with their contribution.
 
 ## Pull Request Process
-Original file line number
+Diff line change
@@ Expand Up @@
     ## CLA
-    It is a requirement for all contributors to sign the [Contributor License Agreement (CLA)](safe.global/cla/) in order to proceed with their contribution.
+    It is a requirement for all contributors to sign the [Contributor License Agreement (CLA)](https://safe.global/cla) in order to proceed with their contribution.
     ## Pull Request Process
@@ Expand Down @@