Release v1.1.0

.github/workflows/deploy.yml

@@ -1,10 +1,12 @@
 name: Deploy to dev/staging
 
 on:
+  pull_request:
+
   push:
     branches:
-      - main
       - dev
+      - main
 
 jobs:
   deploy:
@@ -46,27 +48,33 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
 
+      # Staging
       - name: Deploy to the staging S3
         if: github.ref == 'refs/heads/main'
-        run: |
-          cd out
-
-          aws s3 sync . s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/current
-          aws s3 sync . s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/current --delete
-
-          for file in $(find . -name '*.html' | sed 's|^\./||'); do
-              aws s3 cp ${file%} s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/current/${file%.*} --content-type 'text/html'
-          done
+        env:
+          BUCKET: s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/current
+        run: bash ./scripts/github/s3_upload.sh
 
+      # Dev
       - name: Deploy to the dev S3
         if: github.ref == 'refs/heads/dev'
-        run: |
-          cd out
-
-          aws s3 sync . s3://${{ secrets.AWS_DEVELOPMENT_BUCKET_NAME }}
-          aws s3 sync . s3://${{ secrets.AWS_DEVELOPMENT_BUCKET_NAME }} --delete
+        env:
+          BUCKET: s3://${{ secrets.AWS_DEVELOPMENT_BUCKET_NAME }}
+        run: bash ./scripts/github/s3_upload.sh
 
-          for file in $(find . -name '*.html' | sed 's|^\./||'); do
-              aws s3 cp ${file%} s3://${{ secrets.AWS_DEVELOPMENT_BUCKET_NAME }}/${file%.*} --content-type 'text/html'
-          done
+      # PRs
+      - name: Deploy PR branch
+        if: github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/main'
+        env:
+          BUCKET: s3://${{ secrets.AWS_REVIEW_BUCKET_NAME }}/webcore/pr${{ github.event.number }}
+        run: bash ./scripts/github/s3_upload.sh
 
+      - name: 'Post the deployment links in the PR'
+        if: success() && github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/main'
+        uses: mshick/add-pr-comment@v1
+        with:
+          message: |
+            ## Branch preview
+            https://pr${{ github.event.number }}--webcore.review-react-br.5afe.dev
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token-user-login: 'github-actions[bot]'

.github/workflows/release.yml

@@ -45,20 +45,11 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
 
-      # Script to upload release files.
-      # First it uploads new files, so both the previous version and the new one co-exist and there’s no downtime.
-      # Then it uploads a second time, with --delete, to delete the old files.
-      # Finally, it uploads HTML files w/o the `.html` extension so that URLs like `/balances` work.
+      # Script to upload release files
       - name: 'Upload release build files for production'
-        run: |
-          cd out
-
-          aws s3 sync . s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/releases/${{ github.event.release.tag_name }}
-          aws s3 sync . s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/releases/${{ github.event.release.tag_name }} --delete
-
-          for file in $(find . -name '*.html' | sed 's|^\./||'); do
-              aws s3 cp ${file%} s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/releases/${{ github.event.release.tag_name }}/${file%.*} --content-type 'text/html'
-          done
+        env:
+          BUCKET: s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/releases/${{ github.event.release.tag_name }}
+        run: bash ./scripts/github/s3_upload.sh
 
       # Script to prepare production deployments
       - run: bash ./scripts/github/prepare_production_deployment.sh

cypress/e2e/smoke/create_tx.cy.js → cypress/e2e/create_tx.cy.js

@@ -15,8 +15,13 @@ describe('Queue a transaction on 1/N', () => {
   })
 
   it('should create and queue a transaction', () => {
+    // Assert that "New transaction" button is visible
+    cy.contains('New transaction', {
+      timeout: 60_000, // `lastWallet` takes a while initialize in CI
+    }).should('be.visible')
+
     // Open the new transaction modal
-    cy.contains('New transaction', { timeout: 10000 }).click()
+    cy.contains('New transaction').click()
 
     // Modal is open
     cy.contains('h2', 'New transaction').should('be.visible')
@@ -30,20 +35,21 @@ describe('Queue a transaction on 1/N', () => {
 
     // Insert amount
     cy.get('input[name="amount"]').type(`${sendValue}`)
-
-    cy.contains('Next').click()
   })
 
   it('should create a queued transaction', () => {
-    // Spy the /estimations request
-    cy.intercept('POST', '/**/multisig-transactions/estimations').as('estimations')
+    // Wait for /estimations response
+    cy.intercept('POST', '/**/multisig-transactions/estimations').as('EstimationRequest')
+
+    cy.contains('Next').click()
+
+    cy.wait('@EstimationRequest', {
+      timeout: 30_000, // EstimationRequest takes a while in CI
+    })
 
     // Alias for New transaction modal
     cy.contains('h2', 'Review transaction').parents('div').as('modal')
 
-    // Wait for /estimations response
-    cy.wait('@estimations', { timeout: 30_000 })
-
     // Estimation is loaded
     cy.get('button[type="submit"]').should('not.be.disabled')
 
@@ -97,17 +103,17 @@ describe('Queue a transaction on 1/N', () => {
     cy.get('@modal').within(() => {
       cy.get('input[type="checkbox"]').should('not.exist')
     })
+  })
 
+  it('should click the notification and see the transaction queued', () => {
     cy.contains('Submit').click()
 
-    // Spy the /propose request and give it an alias
-    cy.intercept('POST', '/**/propose').as('propose')
-
     // Wait for the /propose request
-    cy.wait('@propose', { timeout: 30_000 })
-  })
+    cy.intercept('POST', '/**/propose').as('ProposeTx')
+    cy.wait('@ProposeTx', {
+      timeout: 30_000, // ProposeTx takes a while in CI
+    })
 
-  it('should click the notification and see the transaction queued', () => {
     // Click on the notification
     cy.contains('View transaction').click()
 

cypress/e2e/safe-apps/apps_list.cy.js

@@ -8,8 +8,11 @@ describe('The Safe Apps list', () => {
 
   describe('When searching apps', () => {
     it('should filter the list by app name', () => {
-      cy.findByRole('textbox').type('walletconnect')
-      cy.findAllByRole('link', { name: /logo/i }).should('have.length', 1)
+      // Wait for /safe-apps response
+      cy.intercept('GET', '/**/safe-apps').then(() => {
+        cy.findByRole('textbox').type('walletconnect')
+        cy.findAllByRole('link', { name: /logo/i }).should('have.length', 1)
+      })
     })
 
     it('should filter the list by app description', () => {

package.json

@@ -3,7 +3,7 @@
   "homepage": "https://github.com/safe-global/web-core",
   "license": "MIT",
   "type": "module",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -39,11 +39,11 @@
     "@emotion/server": "^11.10.0",
     "@emotion/styled": "^11.10.0",
     "@gnosis.pm/safe-apps-sdk": "^7.8.0",
-    "@gnosis.pm/safe-core-sdk": "^3.1.1",
-    "@gnosis.pm/safe-deployments": "^1.15.0",
-    "@gnosis.pm/safe-ethers-lib": "^1.6.1",
+    "@gnosis.pm/safe-core-sdk": "^3.2.0",
+    "@gnosis.pm/safe-deployments": "^1.17.0",
+    "@gnosis.pm/safe-ethers-lib": "^1.7.0",
     "@gnosis.pm/safe-modules-deployments": "^1.0.0",
-    "@gnosis.pm/safe-react-gateway-sdk": "^3.4.5",
+    "@gnosis.pm/safe-react-gateway-sdk": "^3.4.6",
     "@mui/icons-material": "^5.8.4",
     "@mui/material": "^5.9.3",
     "@mui/x-date-pickers": "^5.0.0-beta.6",
@@ -65,7 +65,7 @@
     "classnames": "^2.3.1",
     "date-fns": "^2.29.2",
     "ethereum-blockies-base64": "^1.0.2",
-    "ethers": "^5.6.8",
+    "ethers": "5.7.2",
     "exponential-backoff": "^3.1.0",
     "fuse.js": "^6.6.2",
     "js-cookie": "^3.0.1",
@@ -84,7 +84,7 @@
     "semver": "^7.3.7"
   },
   "devDependencies": {
-    "@gnosis.pm/safe-core-sdk-types": "^1.6.1",
+    "@gnosis.pm/safe-core-sdk-types": "^1.7.0",
     "@next/bundle-analyzer": "^12.2.4",
     "@sentry/types": "^7.8.1",
     "@svgr/webpack": "^6.3.1",