Merge remote-tracking branch 'origin/dev' into feat/safe-pass-ofac-check

.env.example

@@ -38,8 +38,8 @@ NEXT_PUBLIC_FIREBASE_VAPID_KEY_PRODUCTION=
 NEXT_PUBLIC_FIREBASE_OPTIONS_STAGING=
 NEXT_PUBLIC_FIREBASE_VAPID_KEY_STAGING=
 
-# Redefine
-NEXT_PUBLIC_REDEFINE_API=
+# Blockaid
+NEXT_PUBLIC_BLOCKAID_CLIENT_ID
 
 # Social Login
 NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_STAGING=

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

.github/workflows/build/action.yml

@@ -51,11 +51,12 @@ runs:
         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 }}
+        NEXT_PUBLIC_BLOCKAID_CLIENT_ID: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_BLOCKAID_CLIENT_ID }}
         NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_STAGING: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_STAGING }}
         NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_PRODUCTION: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_PRODUCTION }}
         NEXT_PUBLIC_FIREBASE_OPTIONS_PRODUCTION: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_FIREBASE_OPTIONS_PRODUCTION }}
         NEXT_PUBLIC_FIREBASE_OPTIONS_STAGING: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_FIREBASE_OPTIONS_STAGING }}
         NEXT_PUBLIC_FIREBASE_VAPID_KEY_PRODUCTION: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_FIREBASE_VAPID_KEY_PRODUCTION }}
         NEXT_PUBLIC_FIREBASE_VAPID_KEY_STAGING: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_FIREBASE_VAPID_KEY_STAGING }}
         NEXT_PUBLIC_SPINDL_SDK_KEY: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SPINDL_SDK_KEY }}
+        NEXT_PUBLIC_ECOSYSTEM_ID_ADDRESS: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_ECOSYSTEM_ID_ADDRESS }}

.github/workflows/cla.yml

@@ -13,7 +13,7 @@ jobs:
       - name: 'CLA Assistant'
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Beta Release
-        uses: contributor-assistant/github-action@v2.2.0
+        uses: contributor-assistant/github-action@v2.5.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret
@@ -24,7 +24,7 @@ jobs:
           # branch should not be protected
           branch: 'main'
           # user names of users allowed to contribute without CLA
-          allowlist: lukasschor,rmeissner,germartinez,Uxio0,dasanra,francovenica,tschubotz,luarx,DaniSomoza,iamacook,yagopv,usame-algan,schmanu,DiogoSoaress,JagoFigueroa,fmrsabino,mike10ca,jmealy,compojoom,TanyaEfremova,bot*
+          allowlist: clovisdasilvaneto,lukasschor,rmeissner,germartinez,Uxio0,dasanra,francovenica,tschubotz,luarx,DaniSomoza,iamacook,yagopv,usame-algan,schmanu,DiogoSoaress,JagoFigueroa,fmrsabino,mike10ca,jmealy,compojoom,TanyaEfremova,bot*
 
           # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
           # enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)

.github/workflows/deploy-dev.yml

@@ -43,10 +43,10 @@ jobs:
           secrets: ${{ toJSON(secrets) }}
           if: startsWith(github.ref, 'refs/heads/main')
 
-      - uses: ./.github/workflows/build-storybook
+      #- uses: ./.github/workflows/build-storybook
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE }}
           aws-region: ${{ secrets.AWS_REGION }}

.github/workflows/deploy-dockerhub.yml

@@ -27,7 +27,7 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
     - name: Deploy Main
       if: github.ref == 'refs/heads/main'
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         push: true
         tags: safeglobal/safe-wallet-web:staging
@@ -38,7 +38,7 @@ jobs:
         cache-to: type=gha,mode=max
     - name: Deploy Develop
       if: github.ref == 'refs/heads/dev'
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         push: true
         tags: safeglobal/safe-wallet-web:dev
@@ -49,7 +49,7 @@ jobs:
         cache-to: type=gha,mode=max
     - name: Deploy Tag
       if: (github.event_name == 'release' && github.event.action == 'released')
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         push: true
         tags: |

.github/workflows/deploy-production.yml

@@ -33,7 +33,7 @@ jobs:
         run: sha256sum "$ARCHIVE_NAME".tar.gz > ${{ env.ARCHIVE_NAME }}-sha256-checksum.txt
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE }}
           aws-region: ${{ secrets.AWS_REGION }}

.github/workflows/e2e-hp-ondemand.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Python setup
         if: always()
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

.github/workflows/e2e-ondemand.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Python setup
         if: always()
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

.github/workflows/e2e-prod-ondemand.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Python setup
         if: always()
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

.github/workflows/nextjs-bundle-analysis.yml

@@ -32,7 +32,7 @@ jobs:
         run: npx -p nextjs-bundle-analysis report
 
       - name: Upload bundle
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bundle
           path: .next/analyze/__bundle_analysis.json

.github/workflows/tag-release.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: GitHub release
         if: steps.version.outputs.version
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         id: create_release
         with:
           draft: true

README.md

@@ -5,7 +5,9 @@
 ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/safe-global/safe-wallet-web)
 [![GitPOAP Badge](https://public-api.gitpoap.io/v1/repo/safe-global/safe-wallet-web/badge)](https://www.gitpoap.io/gh/safe-global/safe-wallet-web)
 
-The default Safe web interface.
+Safe{Wallet} is a smart contract wallet for Ethereum and other EVM chains. Based on Gnosis Safe multisig contracts.
+
+This repository is the frontend of the Safe{Wallet} app.
 
 ## Contributing
 

cypress/e2e/pages/create_tx.pages.js

@@ -59,6 +59,7 @@ const editBtnStr = 'Edit'
 const executionParamsStr = 'Execution parameters'
 const noLaterStr = 'No, later'
 const signBtnStr = 'Sign'
+const confirmBtnStr = 'Confirm'
 const expandAllBtnStr = 'Expand all'
 const collapseAllBtnStr = 'Collapse all'
 export const messageNestedStr = `"nestedString": "Test message 3 off-chain"`
@@ -484,7 +485,6 @@ export function openExecutionParamsModal() {
 
 export function verifyAndSubmitExecutionParams() {
   cy.contains(executionParamsStr).parents('form').as('Paramsform')
-
   const arrayNames = ['Wallet nonce', 'Max priority fee (Gwei)', 'Max fee (Gwei)', 'Gas limit']
   arrayNames.forEach((element) => {
     cy.get('@Paramsform').find('label').contains(`${element}`).next().find('input').should('not.be.disabled')
@@ -505,6 +505,10 @@ export function clickOnSignTransactionBtn() {
   cy.get('button').contains(signBtnStr).click()
 }
 
+export function clickOnConfirmTransactionBtn() {
+  cy.get('button').contains(confirmBtnStr).click()
+}
+
 export function waitForProposeRequest() {
   cy.intercept('POST', constants.proposeEndpoint).as('ProposeTx')
   cy.wait('@ProposeTx')

cypress/e2e/pages/create_wallet.pages.js

@@ -32,7 +32,7 @@ export const choiceBtn = '[data-testid="choice-btn"]'
 const addFundsBtn = '[data-testid="add-funds-btn"]'
 const createTxBtn = '[data-testid="create-tx-btn"]'
 const qrCodeSwitch = '[data-testid="qr-code-switch"]'
-export const activateAccountBtn = '[data-testid="activate-account-btn"]'
+export const activateAccountBtn = '[data-testid="activate-account-btn-cf"]'
 const notificationsSwitch = '[data-testid="notifications-switch"]'
 export const addFundsSection = '[data-testid="add-funds-section"]'
 export const noTokensAlert = '[data-testid="no-tokens-alert"]'
@@ -49,8 +49,14 @@ const initialSteps = '0 of 2 steps completed'
 export const addSignerStr = 'Add signer'
 export const accountRecoveryStr = 'Account recovery'
 export const sendTokensStr = 'Send tokens'
+const noWalletConnectedMsg = 'No wallet connected'
+export const deployWalletStr = 'about to deploy this Safe Account'
 
 const connectWalletBtn = '[data-testid="connect-wallet-btn"]'
+
+export function waitForConnectionMsgDisappear() {
+  cy.contains(noWalletConnectedMsg).should('not.exist')
+}
 export function checkNotificationsSwitchIs(status) {
   cy.get(notificationsSwitch).find('input').should(`be.${status}`)
 }

cypress/e2e/pages/main.page.js

@@ -333,3 +333,12 @@ export function getIframeBody(iframe) {
 export const checkButtonByTextExists = (buttonText) => {
   cy.get('button').contains(buttonText).should('exist')
 }
+
+export function getAddedSafeAddressFromLocalStorage(chainId, index) {
+  return cy.window().then((win) => {
+    const addedSafes = win.localStorage.getItem(constants.localStorageKeys.SAFE_v2__addedSafes)
+    const addedSafesObj = JSON.parse(addedSafes)
+    const safeAddress = Object.keys(addedSafesObj[chainId])[index]
+    return safeAddress
+  })
+}

cypress/e2e/pages/navigation.page.js

@@ -16,8 +16,8 @@ export function clickOnSideNavigation(option) {
   cy.get(option).should('exist').click()
 }
 
-export function clickOnModalCloseBtn() {
-  cy.get(modalCloseIcon).eq(0).trigger('click')
+export function clickOnModalCloseBtn(index) {
+  cy.get(modalCloseIcon).eq(index).trigger('click')
 }
 
 export function clickOnNewTxBtn() {

cypress/e2e/prodhealthcheck/load_safe.cy.js

@@ -21,7 +21,7 @@ const INVALID_ADDRESS_ERROR_MSG = 'Address given is not a valid Safe address'
 const OWNER_ENS_DEFAULT_NAME = 'test20.eth'
 const OWNER_ADDRESS = constants.EOA
 
-describe('Load Safe tests', () => {
+describe('[PROD] Load Safe tests', () => {
   before(async () => {
     staticSafes = await getSafes(CATEGORIES.static)
   })

cypress/e2e/prodhealthcheck/tx_history.cy.js

@@ -27,7 +27,7 @@ describe('Tx history tests 1', () => {
         constants.stagingCGWSafes
       }${staticSafes.SEP_STATIC_SAFE_7.substring(4)}/transactions/history**`,
       (req) => {
-        req.url = `https://safe-client.safe.global/v1/chains/11155111/safes/0x5912f6616c84024cD1aff0D5b55bb36F5180fFdb/transactions/history?timezone_offset=7200000&trusted=false&cursor=limit=100&offset=1`
+        req.url = `https://safe-client.safe.global/v1/chains/11155111/safes/0x5912f6616c84024cD1aff0D5b55bb36F5180fFdb/transactions/history?timezone=Europe/Berlin&trusted=false&cursor=limit=100&offset=1`
         req.continue()
       },
     ).as('allTransactions')

cypress/e2e/prodhealthcheck/tx_history_2.cy.js

@@ -30,7 +30,7 @@ describe('Tx history tests 2', () => {
         constants.stagingCGWSafes
       }${staticSafes.SEP_STATIC_SAFE_7.substring(4)}/transactions/history**`,
       (req) => {
-        req.url = `https://safe-client.safe.global/v1/chains/11155111/safes/0x5912f6616c84024cD1aff0D5b55bb36F5180fFdb/transactions/history?timezone_offset=7200000&trusted=false&cursor=limit=100&offset=1`
+        req.url = `https://safe-client.safe.global/v1/chains/11155111/safes/0x5912f6616c84024cD1aff0D5b55bb36F5180fFdb/transactions/history?timezone=Europe/Berlin&trusted=false&cursor=limit=100&offset=1`
         req.continue()
       },
     ).as('allTransactions')

cypress/e2e/regression/add_owner.cy.js

@@ -4,10 +4,14 @@ import * as owner from '../pages/owners.pages'
 import * as addressBook from '../pages/address_book.page'
 import { getSafes, CATEGORIES } from '../../support/safes/safesHandler.js'
 import * as wallet from '../../support/utils/wallet.js'
+import * as createTx from '../pages/create_tx.pages.js'
+import * as navigation from '../pages/navigation.page'
+import { getEvents, events, checkDataLayerEvents } from '../../support/utils/gtag.js'
 
 let staticSafes = []
 const walletCredentials = JSON.parse(Cypress.env('CYPRESS_WALLET_CREDENTIALS'))
 const signer = walletCredentials.OWNER_4_PRIVATE_KEY
+const signer2 = walletCredentials.OWNER_1_PRIVATE_KEY
 
 describe('Add Owners tests', () => {
   before(async () => {
@@ -60,4 +64,41 @@ describe('Add Owners tests', () => {
     owner.clickOnNextBtn()
     owner.verifyConfirmTransactionWindowDisplayed()
   })
+
+  it('Verify creation, confirmation and deletion of Add owner tx. GA tx_confirm', () => {
+    const tx_confirmed = [
+      {
+        eventLabel: events.txConfirmedAddOwner.eventLabel,
+        eventCategory: events.txConfirmedAddOwner.category,
+        eventType: events.txConfirmedAddOwner.eventType,
+        safeAddress: staticSafes.SEP_STATIC_SAFE_24.slice(6),
+      },
+    ]
+    cy.visit(constants.setupUrl + staticSafes.SEP_STATIC_SAFE_24)
+    wallet.connectSigner(signer2)
+    owner.waitForConnectionStatus()
+    owner.openAddOwnerWindow()
+    owner.typeOwnerAddress(constants.SEPOLIA_OWNER_2)
+    createTx.changeNonce(2)
+    owner.clickOnNextBtn()
+    createTx.clickOnSignTransactionBtn()
+    createTx.clickViewTransaction()
+
+    navigation.clickOnWalletExpandMoreIcon()
+    navigation.clickOnDisconnectBtn()
+    wallet.connectSigner(signer)
+
+    createTx.clickOnConfirmTransactionBtn()
+    createTx.clickOnNoLaterOption()
+    createTx.clickOnSignTransactionBtn()
+
+    navigation.clickOnWalletExpandMoreIcon()
+    navigation.clickOnDisconnectBtn()
+    wallet.connectSigner(signer2)
+
+    createTx.deleteTx()
+
+    getEvents()
+    checkDataLayerEvents(tx_confirmed)
+  })
 })

cypress/e2e/regression/create_safe_cf.cy.js

@@ -40,10 +40,10 @@ describe('CF Safe regression tests', () => {
     owner.waitForConnectionStatus()
     createwallet.clickOnAddFundsBtn()
     main.verifyElementsIsVisible([createwallet.qrCode])
-    navigation.clickOnModalCloseBtn()
+    navigation.clickOnModalCloseBtn(0)
 
     createwallet.clickOnCreateTxBtn()
-    navigation.clickOnModalCloseBtn()
+    navigation.clickOnModalCloseBtn(0)
   })
 
   it('Verify "0 out of 2 step completed" is shown in the dashboard', () => {
@@ -88,7 +88,7 @@ describe('CF Safe regression tests', () => {
     owner.waitForConnectionStatus()
     createwallet.clickOnCreateTxBtn()
     createwallet.clickOnTxType(txOrder[0])
-    main.verifyElementsExist([createwallet.activateAccountBtn])
+    cy.contains(createwallet.deployWalletStr)
   })
 
   it('Verify "Add another Owner" takes to a tx Add owner', () => {
@@ -154,8 +154,9 @@ describe('CF Safe regression tests', () => {
 
   it('Verify clicking on "Activate now" button opens safe activation flow', () => {
     main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
-    cy.reload()
     cy.visit(constants.BALANCE_URL + staticSafes.SEP_STATIC_SAFE_0)
+    wallet.connectSigner(signer)
+    owner.waitForConnectionStatus()
     createwallet.clickOnActivateAccountBtn()
     main.verifyElementsIsVisible([createwallet.activateAccountBtn])
   })

cypress/e2e/regression/create_safe_simple.cy.js

@@ -134,8 +134,7 @@ describe('Safe creation tests', () => {
         main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sameOwnerName),
       )
       .then(() => {
-        createwallet.clickOnContinueWithWalletBtn()
-        createwallet.clickOnCreateNewSafeBtn()
+        createwallet.waitForConnectionMsgDisappear()
         createwallet.clickOnNextBtn()
         createwallet.clickOnAddNewOwnerBtn()
         createwallet.clickOnSignerAddressInput(1)

cypress/e2e/regression/create_tx.cy.js

@@ -39,7 +39,6 @@ describe('Create transactions tests', () => {
     createtx.changeNonce(14)
     cy.wait(1000)
     createtx.clickOnSignTransactionBtn()
-    createtx.waitForProposeRequest()
     createtx.clickViewTransaction()
     createtx.verifySingleTxPage()
     createtx.verifyQueueLabel()

cypress/e2e/regression/recovery.cy.js

@@ -147,7 +147,7 @@ describe('Recovery regression tests', { defaultCommandTimeout: 50000 }, () => {
     recovery.enterRecovererAddress(constants.SEPOLIA_OWNER_2)
     recovery.agreeToTerms()
     recovery.clickOnNextBtn()
-    navigation.clickOnModalCloseBtn()
+    navigation.clickOnModalCloseBtn(0)
     recovery.getSetupRecoveryBtn()
     navigation.clickOnWalletExpandMoreIcon()
     navigation.clickOnDisconnectBtn()