Merge branch 'dev' of github.com:safe-global/safe-wallet-web into las…

…t-safe

cypress/e2e/pages/balances.pages.js

@@ -44,7 +44,7 @@ export const tokenListOptions = {
 export const currencyEUR = 'EUR'
 export const currencyUSD = 'USD'
 
-export const currentcySepoliaFormat = '0.1 ETH'
+export const currentcySepoliaFormat = '0.09996 ETH'
 
 export const currencyAave = 'AAVE'
 export const currencyAaveAlttext = 'AAVE'

cypress/e2e/pages/batches.pages.js

@@ -67,15 +67,19 @@ function addToBatchButton() {
 export function openBatchtransactionsModal() {
   cy.get(batchTxTopBar).should('be.visible').click()
   cy.contains(batchedTransactionsStr).should('be.visible')
-  cy.contains(addInitialTransactionStr)
 }
 
 export function openNewTransactionModal() {
   cy.get(addNewTxBatch).click()
-  cy.contains('h1', newTransactionTitle).should('be.visible')
   cy.contains(sendTokensButn).click()
 }
 
+export function addNewTransactionToBatch(EOA, currentNonce, funds_first_tx) {
+  openBatchtransactionsModal()
+  openNewTransactionModal()
+  addToBatch(EOA, currentNonce, funds_first_tx)
+}
+
 export function verifyAmountTransactionsInBatch(count) {
   cy.contains(batchedTransactionsStr, { timeout: 7000 })
     .should('be.visible')

cypress/e2e/pages/create_wallet.pages.js

@@ -55,15 +55,9 @@ export function typeWalletName(name) {
 
 export function selectNetwork(network, regex = false) {
   cy.wait(1000)
-  cy.get(selectNetworkBtn).should('exist').click()
+  cy.get(selectNetworkBtn).should('be.visible').click()
+  cy.wait(1000)
   cy.get('li').contains(network).click()
-
-  if (regex) {
-    regex = constants.networks.goerli
-    cy.get(selectNetworkBtn).click().invoke('text').should('match', regex)
-  } else {
-    cy.get(selectNetworkBtn).click().should('have.text', network)
-  }
   cy.get('body').click()
 }
 

cypress/e2e/pages/main.page.js

@@ -6,11 +6,11 @@ export function clickOnSideMenuItem(item) {
   cy.get('p').contains(item).click()
 }
 
-export function acceptCookies() {
+export function acceptCookies(index = 0) {
   cy.wait(1000)
 
   cy.findAllByText('Got it!')
-    .should('have.length.at.least', 0)
+    .should('have.length.at.least', index)
     .each(($el) => $el.click())
 
   cy.get('button')

cypress/e2e/pages/owners.pages.js

@@ -5,7 +5,7 @@ const copyToClipboardBtn = 'button[aria-label="Copy to clipboard"]'
 const tooltipLabel = (label) => `span[aria-label="${label}"]`
 const removeOwnerBtn = 'span[data-track="settings: Remove owner"] > span > button'
 const replaceOwnerBtn = 'span[data-track="settings: Replace owner"] > span > button'
-const addOwnerBtn = 'span[data-track="settings: Add owner"]'
+const addOwnerBtn = 'span[data-track="settings: Add owner"] > button'
 const tooltip = 'div[role="tooltip"]'
 const expandMoreIcon = 'svg[data-testid="ExpandMoreIcon"]'
 const sentinelStart = 'div[data-testid="sentinelStart"]'
@@ -87,6 +87,10 @@ export function verifyRemoveBtnIsEnabled() {
   return cy.get(removeOwnerBtn).should('exist')
 }
 
+export function verifyRemoveBtnIsDisabled() {
+  return cy.get(removeOwnerBtn).should('exist').and('be.disabled')
+}
+
 export function hoverOverDeleteOwnerBtn(index) {
   cy.get(removeOwnerBtn).eq(index).trigger('mouseover', { force: true })
 }
@@ -110,6 +114,10 @@ export function verifyReplaceBtnIsEnabled() {
   cy.get(replaceOwnerBtn).should('exist').and('not.be.disabled')
 }
 
+export function verifyReplaceBtnIsDisabled() {
+  cy.get(replaceOwnerBtn).should('exist').and('be.disabled')
+}
+
 export function hoverOverReplaceOwnerBtn() {
   cy.get(replaceOwnerBtn).trigger('mouseover', { force: true })
 }
@@ -118,6 +126,10 @@ export function verifyAddOwnerBtnIsEnabled() {
   cy.get(addOwnerBtn).should('exist').and('not.be.disabled')
 }
 
+export function verifyAddOwnerBtnIsDisabled() {
+  cy.get(addOwnerBtn).should('exist').and('be.disabled')
+}
+
 export function hoverOverAddOwnerBtn() {
   cy.get(addOwnerBtn).trigger('mouseover')
 }

cypress/e2e/pages/safeapps.pages.js

@@ -23,11 +23,12 @@ const allowAllPermissions = /allow all/i
 const appNotSupportedMsg = "The app doesn't support Safe App functionality"
 
 export const pinWalletConnectStr = /pin walletconnect/i
-export const transactionBuilderStr = /pin transaction builder/i
+export const transactionBuilderStr = 'Transaction Builder'
 export const logoWalletConnect = /logo.*walletconnect/i
 export const walletConnectHeadlinePreview = /walletconnect/i
-export const availableNetworksPreview = /available networks/i
-export const connecttextPreview = 'Connect your Safe to any dApp that supports WalletConnect'
+export const transactiobUilderHeadlinePreview = 'Transaction Builder'
+export const availableNetworksPreview = 'Available networks'
+export const connecttextPreview = 'Compose custom contract interactions and batch them into a single transaction'
 const warningDefaultAppStr = 'The application you are trying to access is not in the default Safe Apps list'
 export const localStorageItem =
   '{"https://safe-test-app.com":[{"feature":"camera","status":"granted"},{"feature":"microphone","status":"denied"}]}'
@@ -70,20 +71,16 @@ export function verifyLinkName(name) {
 }
 
 export function clickOnApp(app) {
-  cy.findByRole('link', { name: app }).click()
+  cy.contains(app).click()
 }
 
 export function verifyNoAppsTextPresent() {
   cy.contains(noAppsStr).should('exist')
 }
 
 export function pinApp(app, pin = true) {
-  cy.findByLabelText(app).click()
-  cy.wait(200)
-  cy.findByLabelText(app).should(($el) => {
-    const ariaLabel = $el.attr('aria-label')
-    expect(ariaLabel).to.include(pin ? 'Unpin' : 'Pin')
-  })
+  const option = pin ? 'Pin' : 'Unpin'
+  cy.get(`[aria-label="${option} ${app}"]`).click()
 }
 
 export function clickOnBookmarkedAppsTab() {

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

@@ -9,7 +9,7 @@ describe('Safe Apps tests', () => {
   beforeEach(() => {
     cy.clearLocalStorage()
     cy.visit(constants.SEPOLIA_TEST_SAFE_4 + constants.appsUrl, { failOnStatusCode: false })
-    main.acceptCookies()
+    main.acceptCookies(1)
   })
 
   it('Verify app list can be filtered by app name [C56130]', () => {
@@ -32,15 +32,12 @@ describe('Safe Apps tests', () => {
 
   it('Verify apps can be pinned [C56133]', () => {
     safeapps.clearSearchAppInput()
-    safeapps.pinApp(safeapps.pinWalletConnectStr)
     safeapps.pinApp(safeapps.transactionBuilderStr)
-    safeapps.verifyPinnedAppCount(2)
+    safeapps.verifyPinnedAppCount(1)
   })
 
   it('Verify apps can be unpinned [C56134]', () => {
-    safeapps.pinApp(safeapps.pinWalletConnectStr)
     safeapps.pinApp(safeapps.transactionBuilderStr)
-    safeapps.pinApp(safeapps.pinWalletConnectStr, false)
     safeapps.pinApp(safeapps.transactionBuilderStr, false)
     safeapps.verifyPinnedAppCount(0)
   })

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

@@ -10,17 +10,19 @@ describe('Safe Apps info modal tests', () => {
   })
 
   it('Verify the disclaimer is displayed when a Safe App is opened [C56139]', () => {
-    safeapps.clickOnApp(safeapps.logoWalletConnect)
+    safeapps.clickOnApp(safeapps.transactionBuilderStr)
     safeapps.clickOnOpenSafeAppBtn()
   })
 
-  it('Verify the permissions slide is shown if the app require permissions [C56140]', () => {
+  // Skip tests due to changed logic
+  // TODO: Discuss furthers
+  it.skip('Verify the permissions slide is shown if the app require permissions [C56140]', () => {
     safeapps.clickOnContinueBtn()
     cy.wait(500) // wait for the animation to finish
     safeapps.verifyCameraCheckBoxExists()
   })
 
-  it('Verify the permissions and consents decision are stored when accepted [C56141]', () => {
+  it.skip('Verify the permissions and consents decision are stored when accepted [C56141]', () => {
     safeapps.storeAndVerifyPermissions()
   })
 })

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

@@ -10,16 +10,14 @@ describe('Safe Apps info modal tests', () => {
   })
 
   it('Verify the preview drawer is displayed when opening a Safe App from the app list [C56149]', () => {
-    safeapps.clickOnApp(safeapps.logoWalletConnect)
+    safeapps.clickOnApp(safeapps.transactionBuilderStr)
 
     cy.findByRole('presentation').within(() => {
       safeapps.verifyPreviewWindow(
-        safeapps.walletConnectHeadlinePreview,
+        safeapps.transactiobUilderHeadlinePreview,
         safeapps.connecttextPreview,
         safeapps.availableNetworksPreview,
       )
-      safeapps.pinApp(safeapps.pinWalletConnectStr)
-      safeapps.pinApp(safeapps.pinWalletConnectStr, false)
       safeapps.closePreviewWindow()
     })
     cy.findByRole('presentation').should('not.exist')

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

@@ -19,7 +19,7 @@ describe('Safe permissions system tests', () => {
 
   it('Verify that requesting permissions with wallet_requestPermissions shows the permissions prompt and return the permissions on accept [C56150]', () => {
     cy.visitSafeApp(constants.testAppUrl + constants.requestPermissionsUrl)
-    main.acceptCookies()
+    main.acceptCookies(1)
     safeapps.clickOnContinueBtn()
     safeapps.verifyWarningDefaultAppMsgIsDisplayed()
     safeapps.clickOnContinueBtn()

cypress/e2e/smoke/add_owner.cy.js

@@ -7,7 +7,7 @@ describe('Add Owners tests', () => {
   beforeEach(() => {
     cy.visit(constants.setupUrl + constants.SEPOLIA_TEST_SAFE_1)
     cy.clearLocalStorage()
-    main.acceptCookies()
+    main.acceptCookies(1)
     cy.contains(owner.safeAccountNonceStr, { timeout: 10000 })
   })
 
@@ -17,16 +17,14 @@ describe('Add Owners tests', () => {
 
   it('Verify “Add new owner” button tooltip displays correct message for Non-Owner [C56018]', () => {
     cy.visit(constants.setupUrl + constants.SEPOLIA_TEST_SAFE_2)
-    owner.hoverOverAddOwnerBtn()
-    owner.verifyTooltiptext(owner.nonOwnerErrorMsg)
+    owner.verifyAddOwnerBtnIsDisabled()
   })
 
   it('Verify Tooltip displays correct message for disconnected user [C56019]', () => {
     owner.waitForConnectionStatus()
     owner.clickOnWalletExpandMoreIcon()
     owner.clickOnDisconnectBtn()
-    owner.hoverOverAddOwnerBtn()
-    owner.verifyTooltiptext(owner.disconnectedUserErrorMsg)
+    owner.verifyAddOwnerBtnIsDisabled()
   })
 
   it('Verify the Add New Owner Form can be opened [C56020]', () => {

cypress/e2e/smoke/assets.cy.js

@@ -13,7 +13,7 @@ describe('Assets tests', () => {
   beforeEach(() => {
     cy.visit(constants.BALANCE_URL + constants.SEPOLIA_TEST_SAFE_5)
     cy.clearLocalStorage()
-    main.acceptCookies()
+    main.acceptCookies(2)
   })
 
   it('Verify that the token tab is selected by default and the table is visible [C56039]', () => {

cypress/e2e/smoke/balances.cy.js

@@ -14,7 +14,7 @@ describe('Balance tests', () => {
   before(() => {
     cy.clearLocalStorage()
     cy.visit(constants.BALANCE_URL + constants.SEPOLIA_TEST_SAFE_5)
-    main.acceptCookies()
+    main.acceptCookies(2)
     cy.contains('Assets')
     cy.get(balances.balanceSingleRow).should('have.length.lessThan', ASSETS_LENGTH)
     balances.selectTokenList(balances.tokenListOptions.allTokens)

cypress/e2e/smoke/balances_pagination.cy.js

@@ -1,5 +1,6 @@
 import * as constants from '../../support/constants'
 import * as balances from '../pages/balances.pages'
+import * as main from '../../e2e/pages/main.page'
 
 const ASSETS_LENGTH = 8
 
@@ -8,9 +9,7 @@ describe('Balance tests', () => {
     cy.clearLocalStorage()
     // Open the Safe used for testing
     cy.visit(constants.BALANCE_URL + constants.PAGINATION_TEST_SAFE)
-    cy.contains('button', 'Accept selection').click()
-    // Table is loaded
-    cy.contains('Görli Ether')
+    main.acceptCookies(2)
 
     cy.contains('div', 'Default tokens').click()
     cy.wait(100)

cypress/e2e/smoke/batch_tx.cy.js

@@ -7,10 +7,10 @@ const funds_first_tx = '0.001'
 const funds_second_tx = '0.002'
 
 describe('Batch transaction tests', () => {
-  before(() => {
+  beforeEach(() => {
     cy.clearLocalStorage()
     cy.visit(constants.BALANCE_URL + constants.SEPOLIA_TEST_SAFE_5)
-    main.acceptCookies()
+    main.acceptCookies(2)
   })
 
   it('Verify empty batch list can be opened [C56082]', () => {
@@ -20,10 +20,11 @@ describe('Batch transaction tests', () => {
 
   it('Verify the Add batch button is present in a transaction form [C56084]', () => {
     //The "true" is to validate that the add to batch button is not visible if "Yes, execute" is selected
-    batch.addToBatch(constants.EOA, currentNonce, funds_first_tx)
+    batch.addNewTransactionToBatch(constants.EOA, currentNonce, funds_first_tx)
   })
 
   it('Verify a transaction can be added to the batch [C56085]', () => {
+    batch.addNewTransactionToBatch(constants.EOA, currentNonce, funds_first_tx)
     cy.contains(batch.transactionAddedToBatchStr).should('be.visible')
     //The batch button in the header shows the transaction count
     batch.verifyBatchIconCount(1)
@@ -32,26 +33,37 @@ describe('Batch transaction tests', () => {
   })
 
   it('Verify a second transaction can be added to the batch [C56086]', () => {
-    batch.openNewTransactionModal()
-    batch.addToBatch(constants.EOA, currentNonce, funds_second_tx)
+    batch.addNewTransactionToBatch(constants.EOA, currentNonce, funds_first_tx)
+    cy.wait(1000)
+    batch.addNewTransactionToBatch(constants.EOA, currentNonce, funds_first_tx)
     batch.verifyBatchIconCount(2)
     batch.clickOnBatchCounter()
     batch.verifyAmountTransactionsInBatch(2)
   })
 
   it('Verify the batch can be confirmed and related transactions exist in the form [C56088]', () => {
+    batch.addNewTransactionToBatch(constants.EOA, currentNonce, funds_first_tx)
+    cy.wait(1000)
+    batch.addNewTransactionToBatch(constants.EOA, currentNonce, funds_first_tx)
+    batch.clickOnBatchCounter()
+    batch.clickOnConfirmBatchBtn()
+    batch.clickOnBatchCounter()
     batch.clickOnConfirmBatchBtn()
     batch.verifyBatchTransactionsCount(2)
+    batch.clickOnBatchCounter()
     cy.contains(funds_first_tx).parents('ul').as('TransactionList')
     cy.get('@TransactionList').find('li').eq(0).find('span').eq(0).contains(funds_first_tx)
-    cy.get('@TransactionList').find('li').eq(1).find('span').eq(0).contains(funds_second_tx)
+    cy.get('@TransactionList').find('li').eq(1).find('span').eq(0).contains(funds_first_tx)
   })
 
   it('Verify a transaction can be removed from the batch [C56089]', () => {
+    batch.addNewTransactionToBatch(constants.EOA, currentNonce, funds_first_tx)
+    cy.wait(1000)
+    batch.addNewTransactionToBatch(constants.EOA, currentNonce, funds_first_tx)
     batch.clickOnBatchCounter()
     cy.contains(batch.batchedTransactionsStr).should('be.visible').parents('aside').find('ul > li').as('BatchList')
     cy.get('@BatchList').find(batch.deleteTransactionbtn).eq(0).click()
     cy.get('@BatchList').should('have.length', 1)
-    cy.get('@BatchList').contains(funds_first_tx).should('not.exist')
+    cy.get('@BatchList').contains(funds_second_tx).should('not.exist')
   })
 })

cypress/e2e/smoke/create_tx.cy.js

@@ -3,13 +3,13 @@ import * as main from '../../e2e/pages/main.page'
 import * as createtx from '../../e2e/pages/create_tx.pages'
 
 const sendValue = 0.00002
-const currentNonce = 1
+const currentNonce = 11
 
 describe('Create transactions tests', () => {
   before(() => {
     cy.clearLocalStorage()
     cy.visit(constants.BALANCE_URL + constants.SEPOLIA_TEST_SAFE_5)
-    main.acceptCookies()
+    main.acceptCookies(2)
   })
 
   it('Verify a new send token transaction can be created [C56104]', () => {

cypress/e2e/smoke/import_export_data.cy.js

@@ -24,6 +24,7 @@ describe('Import Export Data tests', () => {
   })
 
   it('Verify address book imported data [C56112]', () => {
+    main.acceptCookies(1)
     file.clickOnAddressBookBtn()
     file.verifyImportedAddressBookData()
   })
@@ -32,7 +33,6 @@ describe('Import Export Data tests', () => {
     const appNames = ['Transaction Builder']
 
     file.clickOnAppsBtn()
-    file.clickOnBookmarkedAppsBtn()
     file.verifyAppsAreVisible(appNames)
   })