fix: Keep Sidebar drawer mounted

.env.example

@@ -2,10 +2,16 @@
 NEXT_PUBLIC_INFURA_TOKEN=
 NEXT_PUBLIC_SAFE_APPS_INFURA_TOKEN=
 
+# WalletConnect
+NEXT_PUBLIC_WC_PROJECT_ID=
+
 ## CGW
 NEXT_PUBLIC_GATEWAY_URL_PRODUCTION=
 NEXT_PUBLIC_GATEWAY_URL_STAGING=
 
+# Blockaid
+NEXT_PUBLIC_BLOCKAID_CLIENT_ID=
+
 # Transaction simulation
 NEXT_PUBLIC_TENDERLY_SIMULATE_ENDPOINT_URL=
 NEXT_PUBLIC_TENDERLY_PROJECT_NAME=
@@ -17,15 +23,11 @@ NEXT_PUBLIC_IS_PRODUCTION=
 # Latest supported safe version, used for upgrade prompts
 NEXT_PUBLIC_SAFE_VERSION=
 
-# Access keys
+# Sentry
 NEXT_PUBLIC_SENTRY_DSN=
-NEXT_PUBLIC_BEAMER_ID=
-
-# Wallet-specific variables
-NEXT_PUBLIC_WC_PROJECT_ID=
 
-# E2E tests
-NEXT_PUBLIC_CYPRESS_MNEMONIC=
+# Beamer
+NEXT_PUBLIC_BEAMER_ID=
 
 # Safe Gelato relay service
 NEXT_PUBLIC_SAFE_GELATO_RELAY_SERVICE_URL_PRODUCTION=
@@ -34,19 +36,11 @@ NEXT_PUBLIC_SAFE_GELATO_RELAY_SERVICE_URL_STAGING=
 # Firebase Cloud Messaging
 NEXT_PUBLIC_FIREBASE_OPTIONS_PRODUCTION=
 NEXT_PUBLIC_FIREBASE_VAPID_KEY_PRODUCTION=
-
 NEXT_PUBLIC_FIREBASE_OPTIONS_STAGING=
 NEXT_PUBLIC_FIREBASE_VAPID_KEY_STAGING=
 
-# Blockaid
-NEXT_PUBLIC_BLOCKAID_CLIENT_ID
-
-# Social Login
-NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_STAGING=
-NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_PRODUCTION=
-
 # Cypress wallet private keys
 CYPRESS_WALLET_CREDENTIALS=
 
 # [optional] Beamer keys for e2e tests
-BEAMER_DATA_E2E=
+BEAMER_DATA_E2E=

.github/workflows/cypress/action.yml

@@ -38,9 +38,9 @@ runs:
         curl -O 'https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb'
         sudo apt-get install ./google-chrome-stable_current_amd64.deb
 
-    - name: Install Cypress 13.13.1
+    - name: Install Cypress 13.15.2
       shell: bash
-      run: npm install cypress@13.13.1 --legacy-peer-deps
+      run: yarn add -D cypress@13.15.2
 
     - uses: ./.github/workflows/build
       with:

.github/workflows/lint.yml

@@ -18,10 +18,11 @@ jobs:
 
       - uses: ./.github/workflows/yarn
 
-      - uses: CatChen/eslint-suggestion-action@v2
+      - uses: CatChen/eslint-suggestion-action@v4.1.7
         with:
           request-changes: true # optional
           fail-check: true # optional
           github-token: ${{ secrets.GITHUB_TOKEN }} # optional
           directory: './' # optional
           targets: 'src' # optional
+          config-path: './eslint.config.mjs'

cypress.config.js

@@ -67,6 +67,7 @@ export default defineConfig({
     hideXHR: true,
     defaultCommandTimeout: 10000,
     pageLoadTimeout: 60000,
+    numTestsKeptInMemory: 20,
   },
 
   chromeWebSecurity: false,

cypress/e2e/happypath/recovery_hp_1.cy.js

@@ -34,13 +34,7 @@ describe('Recovery happy path tests 1', () => {
     recovery.clickOnNextBtn()
     tx.executeFlow_1()
     recovery.verifyRecovererAdded([constants.SEPOLIA_OWNER_2_SHORT])
-
     recovery.clearRecoverers()
-
-    // recovery.removeRecoverer(0, constants.SEPOLIA_OWNER_2)
-    // recovery.clickOnNextBtn()
-    // tx.executeFlow_1()
-
     recovery.getSetupRecoveryBtn()
   })
 })

cypress/e2e/happypath_2/proposers.cy.js

@@ -0,0 +1,51 @@
+import * as constants from '../../support/constants.js'
+import * as owner from '../pages/owners.pages.js'
+import { getSafes, CATEGORIES } from '../../support/safes/safesHandler.js'
+import * as wallet from '../../support/utils/wallet.js'
+import * as proposer from '../pages/proposers.pages.js'
+
+let staticSafes = []
+const walletCredentials = JSON.parse(Cypress.env('CYPRESS_WALLET_CREDENTIALS'))
+const signer = walletCredentials.OWNER_4_PRIVATE_KEY
+const signer3 = walletCredentials.OWNER_3_PRIVATE_KEY
+const addedProposer = walletCredentials.OWNER_3_WALLET_ADDRESS
+const proposerAddress = 'sep:0xC16D...6fED'
+const proposerAddress2 = '0x8eeC...2a3b'
+const proposerName2 = 'Proposer 2'
+const proposerName = 'Proposer 1'
+const changedProposerName = 'Changed proposer name'
+
+describe('Happy path Proposers tests', () => {
+  before(async () => {
+    staticSafes = await getSafes(CATEGORIES.static)
+  })
+
+  //TODO: Flaky due to UI retrieval issue - wip
+  it.skip('Verify that editing a proposer is only possible for the proposer created by the creator', () => {
+    cy.visit(constants.setupUrl + staticSafes.SEP_STATIC_SAFE_31)
+    wallet.connectSigner(signer3)
+    cy.contains(owner.safeAccountNonceStr, { timeout: 10000 })
+    proposer.verifyEditProposerBtnDisabled(proposerAddress)
+
+    proposer.clickOnEditProposerBtn(proposerAddress2)
+    proposer.enterProposerName(changedProposerName)
+    proposer.clickOnSubmitProposerBtn()
+    proposer.checkProposerData([changedProposerName])
+
+    proposer.clickOnEditProposerBtn(proposerAddress2)
+    proposer.enterProposerName(proposerName2)
+    proposer.clickOnSubmitProposerBtn()
+    proposer.checkProposerData([proposerName2])
+  })
+
+  it('Verify a proposer can be added', () => {
+    cy.visit(constants.setupUrl + staticSafes.SEP_STATIC_SAFE_32)
+    wallet.connectSigner(signer)
+    cy.contains(owner.safeAccountNonceStr, { timeout: 10000 })
+    proposer.deleteAllProposers()
+    proposer.clickOnAddProposerBtn()
+    proposer.enterProposerData(addedProposer, proposerName)
+    proposer.clickOnSubmitProposerBtn()
+    proposer.verifyProposerSuccessMsgDisplayed()
+  })
+})

cypress/e2e/pages/create_tx.pages.js

@@ -28,6 +28,8 @@ const advancedDetails = '[data-testid="tx-advanced-details"]'
 const baseGas = '[data-testid="tx-bas-gas"]'
 const requiredConfirmation = '[data-testid="required-confirmations"]'
 export const txDate = '[data-testid="tx-date"]'
+export const proposalStatus = '[data-testid="proposal-status"]'
+export const txSigner = '[data-testid="signer"]'
 const spamTokenWarningIcon = '[data-testid="warning"]'
 const untrustedTokenWarningModal = '[data-testid="untrusted-token-warning"]'
 const sendTokensBtn = '[data-testid="send-tokens-btn"]'
@@ -40,11 +42,13 @@ const filterTokenInput = '[data-testid="token-input"]'
 const filterNonceInput = '[data-testid="nonce-input"]'
 const filterApplyBtn = '[data-testid="apply-btn"]'
 const filterClearBtn = '[data-testid="clear-btn"]'
-const addressItem = '[data-testid="address-item"]'
+export const addressItem = '[data-testid="address-item"]'
 const radioSelector = 'div[role="radiogroup"]'
 const rejectTxBtn = '[data-testid="reject-btn"]'
 const deleteTxModalBtn = '[data-testid="delete-tx-btn"]'
 const toggleUntrustedBtn = '[data-testid="toggle-untrusted"]'
+const simulateTxBtn = '[data-testid="simulate-btn"]'
+const simulateSuccess = '[data-testid="simulation-success-msg"]'
 
 const viewTransactionBtn = 'View transaction'
 const transactionDetailsTitle = 'Transaction details'
@@ -627,3 +631,11 @@ export function verifyBulkExecuteBtnIsDisabled() {
 export function toggleUntrustedTxs() {
   cy.get(toggleUntrustedBtn).click()
 }
+
+export function clickOnSimulateTxBtn() {
+  cy.get(simulateTxBtn).click()
+}
+
+export function verifySuccessfulSimulation() {
+  cy.get(simulateSuccess).should('exist')
+}

cypress/e2e/pages/create_wallet.pages.js

@@ -191,9 +191,12 @@ export function clickOnContinueWithWalletBtn() {
   cy.get('button').contains(continueWithWalletBtn).click().wait(1000)
 }
 
+export function verifyConnectWalletBtnDisplayed() {
+  return cy.get(connectWalletBtn).should('be.visible')
+}
 export function clickOnConnectWalletBtn() {
   cy.get(welcomeLoginScreen).within(() => {
-    cy.get(connectWalletBtn).should('be.visible').should('be.enabled').click().wait(1000)
+    verifyConnectWalletBtnDisplayed().should('be.enabled').click().wait(1000)
   })
 }
 

cypress/e2e/pages/main.page.js

@@ -194,6 +194,16 @@ export function acceptCookies(index = 0) {
     })
 }
 
+export function acceptCookies2() {
+  cy.wait(2000)
+  cy.get('body').then(($body) => {
+    if ($body.find('button:contains(' + acceptSelection + ')').length > 0) {
+      cy.contains('button', acceptSelection).click()
+      cy.wait(500)
+    }
+  })
+}
+
 export function verifyOwnerConnected(prefix = 'sep:') {
   cy.get(connectedOwnerBlock).should('contain', prefix)
 }

cypress/e2e/pages/nfts.pages.js

@@ -18,12 +18,11 @@ const modalHeader = '[data-testid="modal-header"]'
 const modalSelectedNFTs = '[data-testid="selected-nfts"]'
 const nftItemList = '[data-testid="nft-item-list"]'
 const nftItemNane = '[data-testid="nft-item-name"]'
-const signBtn = '[data-testid="sign-btn"]'
 const txDetailsSummary = '[data-testid="decoded-tx-summary"]'
 const txAccordionDetails = '[data-testid="decoded-tx-details"]'
 const accordionActionItem = '[data-testid="action-item"]'
 
-const noneNFTSelected = '0 NFTs selected'
+const noneNFTSelected = /0 NFT[s]? selected/
 const sendNFTStr = 'Send NFTs'
 const recipientAddressStr = 'Recipient address or ENS'
 const selectedNFTStr = 'Selected NFTs'

cypress/e2e/pages/owners.pages.js

@@ -95,7 +95,7 @@ export function getThresholdOptions() {
 }
 
 export function verifyThresholdLimit(startValue, endValue) {
-  cy.get('p').contains(`out of ${endValue} signer(s)`)
+  cy.get('p').contains(`out of ${endValue} signer${endValue > 1 ? 's' : ''}`)
   clickOnThresholdDropdown()
   getThresholdOptions().eq(0).should('have.text', startValue).click()
 }
@@ -248,7 +248,9 @@ export function verifyConfirmTransactionWindowDisplayed() {
 
 export function verifyThreshold(startValue, endValue) {
   main.verifyInputValue(thresholdInput, startValue)
-  cy.get('p').contains(`out of ${endValue} signer(s)`).should('be.visible')
+  cy.get('p')
+    .contains(`out of ${endValue} signer${endValue > 1 ? 's' : ''}`)
+    .should('be.visible')
   cy.get(thresholdInput).parent().click()
   cy.get(thresholdList).contains(endValue).should('be.visible')
   cy.get(thresholdList).find('li').should('have.length', endValue)