diff --git a/cypress/e2e/pages/address_book.page.js b/cypress/e2e/pages/address_book.page.js
index 611b7d826b..eff18a543a 100644
--- a/cypress/e2e/pages/address_book.page.js
+++ b/cypress/e2e/pages/address_book.page.js
@@ -1,41 +1,164 @@
-export const acceptSelection = 'Save settings'
-export const addressBook = 'Address book'
-const createEntryBtn = 'Create entry'
+import * as constants from '../../support/constants'
+import * as main from '../pages/main.page'
 
+export const addressBookRecipient = '[data-testid="address-book-recipient"]'
 const beameriFrameContainer = '#beamerOverlay .iframeCointaner'
 const beamerInput = 'input[id="beamer"]'
 const nameInput = 'input[name="name"]'
 const addressInput = 'input[name="address"]'
-export const addressBookRecipient = '[data-testid="address-book-recipient"]'
-const saveBtn = 'Save'
+const exportModalBtn = '[data-testid="export-modal-btn"]'
 export const editEntryBtn = 'button[aria-label="Edit entry"]'
 export const deleteEntryBtn = 'button[aria-label="Delete entry"]'
 export const deleteEntryModalBtnSection = '.MuiDialogActions-root'
+const tableContainer = '[data-testid="table-container"]'
+const tableRow = '[data-testid="table-row"]'
+const importBtn = '[data-testid="import-btn"]'
+const cancelImportBtn = '[data-testid="cancel-btn"]'
+const uploadErrorMsg = '[data-testid="error-message"]'
+const modalSummaryMessage = '[data-testid="summary-message"]'
+const saveBtn = '[data-testid="save-btn"]'
+const divInput = '[data-testid="name-input"]'
+const exportSummary = '[data-testid="export-summary"]'
+const sendBtn = '[data-testid="send-btn"]'
+const nextPageBtn = 'button[aria-label="Go to next page"]'
+const previousPageBtn = 'button[aria-label="Go to previous page"]'
+
+//TODO Move to specific component
+const moreActionIcon = '[data-testid="MoreHorizIcon"]'
+
+export const acceptSelection = 'Save settings'
+export const addressBook = 'Address book'
+const createEntryBtn = 'Create entry'
 export const delteEntryModaldeleteBtn = 'Delete'
-const importBtn = 'Import'
 const exportBtn = 'Export'
-const exportModalBtn = '[data-testid="export-modal-btn"]'
+// const saveBtn = 'Save'
 const whatsNewBtnStr = "What's new"
 const beamrCookiesStr = 'accept the "Beamer" cookies'
+const headerImportBtnStr = 'Import'
+const mandatoryNameStr = 'Name *'
+const nameSortBtn = 'Name'
+const addressortBtn = 'Address'
+const addToAddressBookStr = 'Add to address book'
+
+export const emptyCSVFile = '../fixtures/address_book_empty_test.csv'
+export const nonCSVFile = '../fixtures/balances.json'
+export const duplicatedCSVFile = 'address_book_duplicated.csv'
+export const validCSVFile = '../fixtures/address_book_test.csv'
+export const networksCSVFile = '../fixtures/address_book_networks.csv'
+export const addedSafesCSVFile = '../fixtures/address_book_addedsafes.csv'
+
+const sortSafe1 = 'AA Safe'
+const sortSafe2 = 'BB Safe'
+
+export const entries = [
+  '0x6E834E9D04ad6b26e1525dE1a37BFd9b215f40B7',
+  'test-sepolia-3',
+  '0xf405BC611F4a4c89CCB3E4d083099f9C36D966f8',
+  'sepolia-test-4',
+  '0x03042B890b99552b60A073F808100517fb148F60',
+  'sepolia-test-5',
+  '0xBd69b0a9DC90eB6F9bAc3E4a5875f437348b6415',
+  'assets-test-sepolia',
+]
+
+export function clickOnNextPageBtn() {
+  cy.get(nextPageBtn).click()
+}
+
+export function clickOnPrevPageBtn() {
+  cy.get(previousPageBtn).click()
+}
+
+export function verifyCountOfSafes(count) {
+  main.verifyElementsCount(tableRow, count)
+}
+export function verifyRecipientData(data) {
+  main.verifyValuesExist(addressBookRecipient, data)
+}
+
+export function clickOnSendBtn() {
+  cy.get(sendBtn).click()
+}
+
+export function clickOnMoreActionsBtn() {
+  cy.get(moreActionIcon).click()
+}
+
+export function clickOnAddToAddressBookBtn() {
+  cy.get('li span').contains(addToAddressBookStr).click()
+}
+
+export function verifyExportMessage(count) {
+  let msg = `${count} address book`
+  cy.get(exportSummary).should('contain', msg)
+}
+
+export function clickOnNameSortBtn() {
+  cy.get(tableContainer).contains(nameSortBtn).click()
+  cy.wait(500)
+}
+
+export function clickOnAddrressSortBtn() {
+  cy.get(tableContainer).contains(addressortBtn).click()
+  cy.wait(500)
+}
+
+export function verifyEntriesOrder(option = 'ascending') {
+  let address = constants.DEFAULT_OWNER_ADDRESS
+  let name = sortSafe1
+  if (option == 'descending') {
+    address = constants.RECIPIENT_ADDRESS
+    name = sortSafe2
+  }
+
+  cy.get(tableRow).eq(0).contains(address)
+  cy.get(tableRow).eq(0).contains(name)
+}
+
+export function addEntryByENS(name, ens) {
+  typeInName(name)
+  typeInAddress(ens)
+  clickOnSaveEntryBtn()
+  verifyNewEntryAdded(name, constants.SEPOLIA_TEST_SAFE_7)
+}
+
+export function verifyModalSummaryMessage(entryCount, chainCount) {
+  cy.get(modalSummaryMessage).should(
+    'contain',
+    `Found ${entryCount} entries on ${chainCount} ${chainCount > 1 ? 'chains' : 'chain'}`,
+  )
+}
+export const uploadErrorMessages = {
+  fileType: 'File type must be text/csv',
+  emptyFile: 'No entries found in address book',
+}
+
+export function verifyUploadExportMessage(msg) {
+  main.verifyValuesExist(uploadErrorMsg, msg)
+}
+
+export function verifyImportBtnStatus(status) {
+  main.verifyElementsStatus([importBtn], status)
+}
+
+export function verifyNumberOfRows(number) {
+  main.verifyElementsCount(tableRow, number)
+}
 
 export function clickOnImportFileBtn() {
-  cy.contains(importBtn).click()
+  cy.contains(headerImportBtnStr).click()
 }
 
-export function importFile() {
-  cy.get('[type="file"]').attachFile('../fixtures/address_book_test.csv')
-  // Import button should be enabled
-  cy.get('.MuiDialogActions-root').contains('Import').should('not.be.disabled')
-  cy.get('.MuiDialogActions-root').contains('Import').click()
+export function importCSVFile(file) {
+  cy.get('[type="file"]').attachFile(file)
 }
 
-export function verifyImportModalIsClosed() {
-  cy.get('Import address book').should('not.exist')
+export function clickOnImportBtn() {
+  cy.get(importBtn).click()
 }
 
-export function verifyDataImported(name, address) {
-  cy.contains(name).should('exist')
-  cy.contains(address).should('exist')
+export function verifyDataImported(data) {
+  main.verifyValuesExist(tableContainer, data)
 }
 
 export function clickOnExportFileBtn() {
@@ -59,7 +182,7 @@ export function typeInAddress(address) {
 }
 
 export function clickOnSaveEntryBtn() {
-  cy.contains('button', saveBtn).click()
+  cy.get(saveBtn).click()
 }
 
 export function verifyNewEntryAdded(name, address) {
@@ -82,10 +205,6 @@ export function typeInNameInput(name) {
   cy.get(nameInput).clear().type(name).should('have.value', name)
 }
 
-export function clickOnSaveButton() {
-  cy.contains('button', saveBtn).click()
-}
-
 export function verifyNameWasChanged(name, editedName) {
   cy.get(name).should('not.exist')
   cy.contains(editedName).should('exist')
@@ -119,3 +238,9 @@ export function verifyBeameriFrameExists() {
   cy.wait(1000)
   cy.get(beameriFrameContainer).should('exist')
 }
+
+export function verifyEmptyOwnerNameNotAllowed() {
+  cy.get(nameInput).clear()
+  main.verifyElementsStatus([saveBtn], constants.enabledStates.disabled)
+  cy.get(divInput).contains(mandatoryNameStr)
+}
diff --git a/cypress/e2e/pages/assets.pages.js b/cypress/e2e/pages/assets.pages.js
index 2509eefb30..444e4f58ab 100644
--- a/cypress/e2e/pages/assets.pages.js
+++ b/cypress/e2e/pages/assets.pages.js
@@ -17,6 +17,8 @@ const hiddenTokenSaveBtn = 'span[data-track="assets: Save hide dialog"]'
 const hiddenTokenCancelBtn = 'span[data-track="assets: Cancel hide dialog"]'
 const hiddenTokenDeselectAllBtn = 'span[data-track="assets: Deselect all hide dialog"]'
 const hiddenTokenIcon = 'svg[data-testid="VisibilityOffOutlinedIcon"]'
+const currencySelector = '[data-testid="currency-selector"]'
+const currencyItem = '[data-testid="currency-item"]'
 
 const hideTokenDefaultString = 'Hide tokens'
 const assetNameSortBtnStr = 'Asset'
@@ -91,6 +93,15 @@ export const currentcyGnosisFormat = '< 0.00001 GNO'
 export const currencyOx = /^0x$/
 export const currentcyOxFormat = '1.003 ZRX'
 
+function clickOnCurrencySelector() {
+  cy.get(currencySelector).click()
+}
+
+export function changeCurrency(currency) {
+  clickOnCurrencySelector()
+  cy.get(currencyItem).contains(currency).click()
+}
+
 export function clickOnSendBtn(index) {
   cy.get('button')
     .contains(sendBtnStr)
diff --git a/cypress/e2e/pages/create_wallet.pages.js b/cypress/e2e/pages/create_wallet.pages.js
index 4d458ddd43..77c4e945ef 100644
--- a/cypress/e2e/pages/create_wallet.pages.js
+++ b/cypress/e2e/pages/create_wallet.pages.js
@@ -10,7 +10,8 @@ const ownerAddress = 'input[name^="owners"][name$="address"]'
 const thresholdInput = 'input[name="threshold"]'
 export const removeOwnerBtn = 'button[aria-label="Remove owner"]'
 const connectingContainer = 'div[class*="connecting-container"]'
-const createNewSafeBtn = 'span[data-track="create-safe: Continue to creation"]'
+const createNewSafeBtn = '[data-testid="create-safe-btn"]'
+const continueWithWalletBtn = 'span[data-track="create-safe: Continue to my accounts"]'
 const connectWalletBtn = 'Connect wallet'
 const googleConnectBtn = '[data-testid="google-connect-btn"]'
 const googleSignedinBtn = '[data-testid="signed-in-account-btn"]'
@@ -110,6 +111,10 @@ export function clickOnCreateNewSafeBtn() {
   cy.get(createNewSafeBtn).click().wait(1000)
 }
 
+export function clickOnContinueWithWalletBtn() {
+  cy.get(continueWithWalletBtn).click().wait(1000)
+}
+
 export function clickOnConnectWalletBtn() {
   cy.get(welcomeLoginScreen).within(() => {
     cy.get('button').contains(connectWalletBtn).should('be.visible').should('be.enabled').click().wait(1000)
diff --git a/cypress/e2e/pages/navigation.page.js b/cypress/e2e/pages/navigation.page.js
index 8748d2a581..f2fec60f15 100644
--- a/cypress/e2e/pages/navigation.page.js
+++ b/cypress/e2e/pages/navigation.page.js
@@ -9,6 +9,9 @@ const sentinelStart = 'div[data-testid="sentinelStart"]'
 const disconnectBtnStr = 'Disconnect'
 const notConnectedStatus = 'Connect'
 
+export function verifyTxBtnStatus(status) {
+  cy.get(newTxBtn).should(status)
+}
 export function clickOnSideNavigation(option) {
   cy.get(option).should('exist').click()
 }
@@ -23,7 +26,7 @@ export function clickOnNewTxBtn() {
 
 export function clickOnWalletExpandMoreIcon() {
   cy.get(expandMoreIcon).eq(0).click()
-  cy.get(sentinelStart).next().should('be.visible')
+  cy.get(sentinelStart).next().should('exist')
 }
 
 export function clickOnDisconnectBtn() {
diff --git a/cypress/e2e/pages/sidebar.pages.js b/cypress/e2e/pages/sidebar.pages.js
index 9604103e55..003e324c39 100644
--- a/cypress/e2e/pages/sidebar.pages.js
+++ b/cypress/e2e/pages/sidebar.pages.js
@@ -15,7 +15,7 @@ const sideBarListItem = '[data-testid="sidebar-list-item"]'
 const sideBarListItemWhatsNew = '[data-testid="list-item-whats-new"]'
 const sideBarListItemNeedHelp = '[data-testid="list-item-need-help"]'
 const sideSafeListItem = '[data-testid="safe-list-item"]'
-const sidebarSafeHeader = '[data-testid="sidebar-safe-header"]'
+const sidebarSafeHeader = '[data-testid="safe-header-info"]'
 const sidebarSafeContainer = '[data-testid="sidebar-safe-container"]'
 const safeItemOptionsBtn = '[data-testid="safe-options-btn"]'
 const safeItemOptionsRenameBtn = '[data-testid="rename-btn"]'
@@ -26,8 +26,10 @@ const cancelBtn = '[data-testid="cancel-btn"]'
 const deleteBtn = '[data-testid="delete-btn"]'
 const readOnlyVisibility = '[data-testid="read-only-visibility"]'
 const currencySection = '[data-testid="currency-section"]'
+const missingSignatureInfo = '[data-testid="missing-signature-info"]'
+const queuedTxInfo = '[data-testid="queued-tx-info"]'
 
-export const addedSafesGnosis = ['0x17b3...98C8', '0x11A6...F1BB', '0xB8d7...642A']
+export const addedSafesEth = ['0x8675...a19b']
 export const addedSafesSepolia = ['0x6d0b...6dC1', '0x5912...fFdb', '0x0637...708e', '0xD157...DE9a']
 export const sideBarListItems = ['Home', 'Assets', 'Transactions', 'Address book', 'Apps', 'Settings']
 export const testSafeHeaderDetails = ['2/2', constants.SEPOLIA_TEST_SAFE_13_SHORT]
@@ -113,6 +115,7 @@ export function verifySafesByNetwork(netwrok, safes) {
   cy.get(sidebarSafeContainer).within(() => {
     cy.get(chainLogo)
       .contains(netwrok)
+      .parent()
       .next()
       .within(() => {
         main.verifyValuesExist(sideSafeListItem, safes)
@@ -120,27 +123,26 @@ export function verifySafesByNetwork(netwrok, safes) {
   })
 }
 
+function getSafeItemByName(name) {
+  return cy.get(sidebarSafeContainer).find(sideSafeListItem).contains(name).parents('li')
+}
+
 export function verifySafeReadOnlyState(safe) {
-  cy.get(sidebarSafeContainer).within(() => {
-    cy.get(sideSafeListItem)
-      .contains(safe)
-      .parents('li')
-      .within(() => {
-        cy.get(readOnlyVisibility).should('exist')
-      })
-  })
+  getSafeItemByName(safe).find(readOnlyVisibility).should('exist')
+}
+
+export function verifyMissingSignature(safe) {
+  getSafeItemByName(safe).find(missingSignatureInfo).should('exist')
+}
+
+export function verifyQueuedTx(safe) {
+  return getSafeItemByName(safe).find(queuedTxInfo).should('exist')
 }
 
 function clickOnSafeItemOptionsBtn(name) {
-  cy.get(sidebarSafeContainer).within(() => {
-    cy.get(sideSafeListItem)
-      .contains(name)
-      .parents('li')
-      .within(() => {
-        cy.get(safeItemOptionsBtn).click()
-      })
-  })
+  getSafeItemByName(name).find(safeItemOptionsBtn).click()
 }
+
 export function renameSafeItem(oldName, newName) {
   clickOnSafeItemOptionsBtn(oldName)
   clickOnRenameBtn()
@@ -188,3 +190,9 @@ export function clickOnSaveBtn() {
 function verifyModalRemoved() {
   main.verifyElementsCount(modal.modalTitle, 0)
 }
+
+export function checkCurrencyInHeader(currency) {
+  cy.get(sidebarSafeHeader).within(() => {
+    cy.get(currencySection).contains(currency)
+  })
+}
diff --git a/cypress/e2e/regression/address_book.cy.js b/cypress/e2e/regression/address_book.cy.js
index edfbc15ba4..b2f9ee4150 100644
--- a/cypress/e2e/regression/address_book.cy.js
+++ b/cypress/e2e/regression/address_book.cy.js
@@ -5,18 +5,20 @@ import * as constants from '../../support/constants'
 import * as addressBook from '../../e2e/pages/address_book.page'
 import * as main from '../../e2e/pages/main.page'
 import * as ls from '../../support/localstorage_data.js'
+import * as sidebar from '../pages/sidebar.pages.js'
 
 const NAME = 'Owner1'
 const EDITED_NAME = 'Edited Owner1'
+const importedSafe = 'imported-safe'
 
 describe('Address book tests', () => {
   beforeEach(() => {
-    cy.clearLocalStorage()
     cy.visit(constants.addressBookUrl + constants.SEPOLIA_TEST_SAFE_1)
+    cy.clearLocalStorage()
     main.acceptCookies()
   })
 
-  it('Verify entered entry in Name input can be saved', () => {
+  it('Verify owners name can be edited', () => {
     main
       .addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sepoliaAddress1)
       .then(() => {
@@ -26,7 +28,7 @@ describe('Address book tests', () => {
             cy.reload()
             addressBook.clickOnEditEntryBtn()
             addressBook.typeInNameInput(EDITED_NAME)
-            addressBook.clickOnSaveButton()
+            addressBook.clickOnSaveEntryBtn()
             addressBook.verifyNameWasChanged(NAME, EDITED_NAME)
           })
       })
@@ -51,8 +53,7 @@ describe('Address book tests', () => {
     cy.contains(constants.GNO_CSV_ENTRY.address).should('exist')
   })
 
-  // TODO: Change title in Testrail. New title "...exported"
-  it('Verify the address book file can be downloaded', () => {
+  it('Verify the address book file can be exported', () => {
     main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.dataSet).then(() => {
       main
         .isItemInLocalstorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.dataSet)
@@ -64,6 +65,7 @@ describe('Address book tests', () => {
           const fileName = `safe-address-book-${date}.csv`
 
           addressBook.clickOnExportFileBtn()
+          addressBook.verifyExportMessage(12)
           addressBook.confirmExport()
 
           const downloadsFolder = Cypress.config('downloadsFolder')
@@ -72,4 +74,37 @@ describe('Address book tests', () => {
         })
     })
   })
+
+  it('Verify that importing a csv file does not alter addresses in the Address book not present in the file', () => {
+    main
+      .addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sepoliaAddress1)
+      .then(() => {
+        main
+          .isItemInLocalstorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sepoliaAddress1)
+          .then(() => {
+            cy.wait(1000)
+            cy.reload()
+            addressBook.clickOnImportFileBtn()
+            addressBook.importCSVFile(addressBook.validCSVFile)
+            addressBook.clickOnImportBtn()
+            addressBook.verifyDataImported([constants.RECIPIENT_ADDRESS])
+          })
+      })
+  })
+
+  it('Verify Safe name changes after uploading a csv file', () => {
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addedSafes, ls.addedSafes.set4).then(() => {
+      main
+        .addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.addedSafesImport)
+        .then(() => {
+          cy.wait(1000)
+          cy.reload()
+          addressBook.clickOnImportFileBtn()
+          addressBook.importCSVFile(addressBook.addedSafesCSVFile)
+          addressBook.clickOnImportBtn()
+          sidebar.openSidebar()
+          sidebar.verifyAddedSafesExist([importedSafe])
+        })
+    })
+  })
 })
diff --git a/cypress/e2e/regression/address_book_2.cy.js b/cypress/e2e/regression/address_book_2.cy.js
new file mode 100644
index 0000000000..d1c125d093
--- /dev/null
+++ b/cypress/e2e/regression/address_book_2.cy.js
@@ -0,0 +1,86 @@
+import * as constants from '../../support/constants.js'
+import * as addressBook from '../pages/address_book.page.js'
+import * as main from '../pages/main.page.js'
+import * as ls from '../../support/localstorage_data.js'
+import * as createtx from '../../e2e/pages/create_tx.pages'
+import * as data from '../../fixtures/txhistory_data_data.json'
+
+const typeReceive = data.type.receive
+
+const owner1 = 'Automation owner'
+const onwer2 = 'Changed Automation owner'
+const onwer3 = 'New Automation owner'
+
+describe('Address book tests - 2', () => {
+  beforeEach(() => {
+    cy.visit(constants.addressBookUrl + constants.SEPOLIA_TEST_SAFE_1)
+    cy.clearLocalStorage()
+    cy.wait(1000)
+    main.acceptCookies()
+  })
+
+  it('Verify Name and Address columns sorting works', () => {
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sortingData)
+    cy.reload()
+    addressBook.clickOnNameSortBtn()
+    addressBook.verifyEntriesOrder()
+    addressBook.clickOnNameSortBtn()
+    addressBook.verifyEntriesOrder('descending')
+
+    // Clicking twice is required to trigger actual click after swtiching from Name
+    addressBook.clickOnAddrressSortBtn()
+    addressBook.clickOnAddrressSortBtn()
+    addressBook.verifyEntriesOrder()
+    addressBook.clickOnAddrressSortBtn()
+    addressBook.verifyEntriesOrder('descending')
+  })
+
+  it('Verify that edit owners name changes the name in the settings', () => {
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sepoliaAddress2)
+    cy.reload()
+    addressBook.clickOnEditEntryBtn()
+    addressBook.typeInNameInput(onwer2)
+    addressBook.clickOnSaveEntryBtn()
+    addressBook.verifyNameWasChanged(owner1, onwer2)
+    cy.visit(constants.setupUrl + constants.SEPOLIA_TEST_SAFE_1)
+    addressBook.verifyNameWasChanged(owner1, onwer2)
+  })
+
+  it('Verify that editing an entry from the transaction details updates the name in address book', () => {
+    cy.visit(constants.transactionsHistoryUrl + constants.SEPOLIA_TEST_SAFE_8)
+    main.waitForHistoryCallToComplete()
+    createtx.clickOnTransactionItemByName(typeReceive.summaryTitle, typeReceive.summaryTxInfo)
+    addressBook.clickOnMoreActionsBtn()
+    addressBook.clickOnAddToAddressBookBtn()
+    addressBook.typeInNameInput(onwer3)
+    addressBook.clickOnSaveEntryBtn()
+    addressBook.verifyNameWasChanged(owner1, onwer3)
+    cy.visit(constants.addressBookUrl + constants.SEPOLIA_TEST_SAFE_8)
+    addressBook.verifyNameWasChanged(owner1, onwer3)
+  })
+
+  it('Verify copy to clipboard/Etherscan work as expected', () => {
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sepoliaAddress1)
+    cy.wait(1000)
+    cy.reload()
+    createtx.verifyCopyIconWorks(0, constants.RECIPIENT_ADDRESS)
+    createtx.verifyNumberOfExternalLinks(1)
+  })
+
+  it('Verify by default there 25 rows shown per page', () => {
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.pagination)
+    cy.wait(1000)
+    cy.reload()
+    addressBook.verifyCountOfSafes(25)
+  })
+
+  it('Verify that clicking on next and previous page buttons shows safes', () => {
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.pagination)
+    cy.wait(1000)
+    cy.reload()
+    addressBook.clickOnNextPageBtn()
+    addressBook.verifyCountOfSafes(1)
+    addressBook.clickOnPrevPageBtn()
+    addressBook.verifyCountOfSafes(25)
+  })
+})
diff --git a/cypress/e2e/regression/create_safe_simple.cy.js b/cypress/e2e/regression/create_safe_simple.cy.js
index f8627e89d9..327179d93e 100644
--- a/cypress/e2e/regression/create_safe_simple.cy.js
+++ b/cypress/e2e/regression/create_safe_simple.cy.js
@@ -14,6 +14,7 @@ describe('Safe creation tests', () => {
   it('Verify Next button is disabled until switching to network is done', () => {
     owner.waitForConnectionStatus()
     createwallet.selectNetwork(constants.networks.ethereum)
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.checkNetworkChangeWarningMsg()
     createwallet.verifyNextBtnIsDisabled()
@@ -24,6 +25,7 @@ describe('Safe creation tests', () => {
   // TODO: Check unit tests
   it('Verify error message is displayed if wallet name input exceeds 50 characters', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.typeWalletName(main.generateRandomString(51))
     owner.verifyErrorMsgInvalidAddress(constants.addressBookErrrMsg.exceedChars)
@@ -34,6 +36,7 @@ describe('Safe creation tests', () => {
   // TODO: Check unit tests
   it('Verify there is no error message is displayed if wallet name input contains less than 50 characters', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.typeWalletName(main.generateRandomString(50))
     owner.verifyValidWalletName(constants.addressBookErrrMsg.exceedChars)
@@ -41,6 +44,7 @@ describe('Safe creation tests', () => {
 
   it('Verify current connected account is shown as default owner', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.clickOnNextBtn()
     owner.verifyExistingOwnerAddress(0, constants.DEFAULT_OWNER_ADDRESS)
@@ -49,6 +53,7 @@ describe('Safe creation tests', () => {
   // TODO: Check unit tests
   it('Verify error message is displayed if owner name input exceeds 50 characters', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     owner.typeExistingOwnerName(main.generateRandomString(51))
     owner.verifyErrorMsgInvalidAddress(constants.addressBookErrrMsg.exceedChars)
@@ -57,6 +62,7 @@ describe('Safe creation tests', () => {
   // TODO: Check unit tests
   it('Verify there is no error message is displayed if owner name input contains less than 50 characters', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     owner.typeExistingOwnerName(main.generateRandomString(50))
     owner.verifyValidWalletName(constants.addressBookErrrMsg.exceedChars)
@@ -65,6 +71,7 @@ describe('Safe creation tests', () => {
   it('Verify data persistence', () => {
     const ownerName = 'David'
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.clickOnNextBtn()
     createwallet.clickOnAddNewOwnerBtn()
@@ -97,6 +104,7 @@ describe('Safe creation tests', () => {
 
   it('Verify tip is displayed on right side for threshold 1/1', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.clickOnNextBtn()
     createwallet.verifyPolicy1_1()
@@ -105,6 +113,7 @@ describe('Safe creation tests', () => {
   // TODO: Check unit tests
   it('Verify address input validation rules', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.clickOnNextBtn()
     createwallet.clickOnAddNewOwnerBtn()
diff --git a/cypress/e2e/regression/sidebar_2.cy.js b/cypress/e2e/regression/sidebar_2.cy.js
index daef0b5844..87ac18b101 100644
--- a/cypress/e2e/regression/sidebar_2.cy.js
+++ b/cypress/e2e/regression/sidebar_2.cy.js
@@ -2,14 +2,15 @@ import * as constants from '../../support/constants'
 import * as main from '../pages/main.page'
 import * as sideBar from '../pages/sidebar.pages'
 import * as ls from '../../support/localstorage_data.js'
+import * as assets from '../pages/assets.pages.js'
 
 const newSafeName = 'Added safe 3'
-const oldSafeName = 'Added safe 2'
-const staticSafe100 = 'Added safe 100'
+const addedSafe900 = 'Added safe 900'
+const staticSafe200 = 'Added safe 200'
 
 describe('Sidebar added sidebar tests', () => {
   beforeEach(() => {
-    cy.visit(constants.homeUrl + constants.SEPOLIA_TEST_SAFE_13)
+    cy.visit(constants.BALANCE_URL + constants.SEPOLIA_TEST_SAFE_13)
     cy.wait(2000)
     cy.clearLocalStorage()
     main.acceptCookies()
@@ -19,30 +20,45 @@ describe('Sidebar added sidebar tests', () => {
 
   it('Verify the safe added are listed in the sidebar', () => {
     sideBar.openSidebar()
-    sideBar.verifyAddedSafesExist(sideBar.addedSafesGnosis, sideBar.addedSafesSepolia)
+    sideBar.verifyAddedSafesExist(sideBar.addedSafesSepolia)
   })
 
   it('Verify Safes are separated by networks', () => {
     sideBar.openSidebar()
-    sideBar.verifySafesByNetwork(constants.networks.gnosis, sideBar.addedSafesGnosis)
+    sideBar.verifySafesByNetwork(constants.networks.ethereum, sideBar.addedSafesEth)
     sideBar.verifySafesByNetwork(constants.networks.sepolia, sideBar.addedSafesSepolia)
   })
 
   it('Verify a safe can be renamed', () => {
     sideBar.openSidebar()
-    sideBar.renameSafeItem(oldSafeName, newSafeName)
+    sideBar.renameSafeItem(addedSafe900, newSafeName)
     sideBar.clickOnSaveBtn()
     sideBar.verifySafeNameExists(newSafeName)
   })
 
   it('Verify a safe can be removed', () => {
     sideBar.openSidebar()
-    sideBar.removeSafeItem(oldSafeName)
-    sideBar.verifySafeRemoved([oldSafeName])
+    sideBar.removeSafeItem(addedSafe900)
+    sideBar.verifySafeRemoved([addedSafe900])
   })
 
   it('Verify the "Read only" tag if the connected user is not an owner of a safe', () => {
     sideBar.openSidebar()
-    sideBar.verifySafeReadOnlyState(staticSafe100)
+    sideBar.verifySafeReadOnlyState(addedSafe900)
+  })
+
+  it('Verify Fiat currency changes when edited in the assets tab', () => {
+    assets.changeCurrency(constants.currencies.cad)
+    sideBar.checkCurrencyInHeader(constants.currencies.cad)
+  })
+
+  it('Verify "wallet" tag counter if the safe has tx ready for execution', () => {
+    sideBar.openSidebar()
+    sideBar.verifyMissingSignature(staticSafe200)
+  })
+
+  it('Verify "Wallet" tag counter only shows for owners', () => {
+    sideBar.openSidebar()
+    sideBar.verifyQueuedTx(staticSafe200)
   })
 })
diff --git a/cypress/e2e/regression/sidebar_nonowner.cy.js b/cypress/e2e/regression/sidebar_nonowner.cy.js
new file mode 100644
index 0000000000..f88c2faedf
--- /dev/null
+++ b/cypress/e2e/regression/sidebar_nonowner.cy.js
@@ -0,0 +1,29 @@
+import * as constants from '../../support/constants.js'
+import * as main from '../pages/main.page.js'
+import * as sideBar from '../pages/sidebar.pages.js'
+import * as navigation from '../pages/navigation.page.js'
+import * as ls from '../../support/localstorage_data.js'
+
+const addedOwner = 'Added owner'
+const addedNonowner = 'Added non-owner'
+
+describe('Sidebar non-owner tests', () => {
+  beforeEach(() => {
+    cy.visit(constants.homeUrl + constants.SEPOLIA_TEST_SAFE_17_SIDEBAR_NONOWNER)
+    cy.wait(2000)
+    cy.clearLocalStorage()
+    main.acceptCookies()
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addedSafes, ls.addedSafes.set3)
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.addedSafes)
+  })
+
+  it('Verify New Transaction button enabled for users with Spending limits allowed', () => {
+    navigation.verifyTxBtnStatus(constants.enabledStates.enabled)
+  })
+
+  it('Verify tag counting queue tx show for owners and non-owners', () => {
+    sideBar.openSidebar()
+    sideBar.verifyQueuedTx(addedOwner).contains(2)
+    sideBar.verifyQueuedTx(addedNonowner).contains(2)
+  })
+})
diff --git a/cypress/e2e/safe-apps/tx-builder.spec.cy.js b/cypress/e2e/safe-apps/tx-builder.spec.cy.js
index c021504610..201feec1ee 100644
--- a/cypress/e2e/safe-apps/tx-builder.spec.cy.js
+++ b/cypress/e2e/safe-apps/tx-builder.spec.cy.js
@@ -197,9 +197,10 @@ describe('Transaction Builder tests', { defaultCommandTimeout: 20000 }, () => {
     })
   })
 
-  it('Verify a batch cannot be created without asset amount', () => {
+  it.skip('Verify a batch cannot be created without asset amount', () => {
     cy.enter(iframeSelector).then((getBody) => {
       getBody().findByLabelText(safeapps.enterAddressStr).type(constants.SEPOLIA_TEST_SAFE_10)
+      getBody().findByText(safeapps.keepProxiABIStr).click()
       getBody().findByText(safeapps.addTransactionStr).click()
       getBody().findAllByText(safeapps.requiredStr).should('have.css', 'color', 'rgb(244, 67, 54)')
     })
@@ -266,9 +267,10 @@ describe('Transaction Builder tests', { defaultCommandTimeout: 20000 }, () => {
     })
   })
 
-  it('Verify a valid batch as successful can be simulated', () => {
+  it.skip('Verify a valid batch as successful can be simulated', () => {
     cy.enter(iframeSelector).then((getBody) => {
       getBody().findByLabelText(safeapps.enterAddressStr).type(constants.SEPOLIA_TEST_SAFE_10)
+      getBody().findByText(safeapps.keepProxiABIStr).click()
       getBody().findByLabelText(safeapps.tokenAmount).type('0')
       getBody().findByText(safeapps.addTransactionStr).click()
       getBody().findByText(safeapps.createBatchStr).click()
@@ -278,9 +280,10 @@ describe('Transaction Builder tests', { defaultCommandTimeout: 20000 }, () => {
     })
   })
 
-  it('Verify an invalid batch as failed can be simulated', () => {
+  it.skip('Verify an invalid batch as failed can be simulated', () => {
     cy.enter(iframeSelector).then((getBody) => {
       getBody().findByLabelText(safeapps.enterAddressStr).type(constants.SEPOLIA_TEST_SAFE_10)
+      getBody().findByText(safeapps.keepProxiABIStr).click()
       getBody().findByLabelText(safeapps.tokenAmount).type('100')
       getBody().findByText(safeapps.addTransactionStr).click()
       getBody().findByText(safeapps.createBatchStr).click()
diff --git a/cypress/e2e/smoke/address_book.cy.js b/cypress/e2e/smoke/address_book.cy.js
index 2f396ab06d..203c94c90c 100644
--- a/cypress/e2e/smoke/address_book.cy.js
+++ b/cypress/e2e/smoke/address_book.cy.js
@@ -5,12 +5,17 @@ import * as main from '../../e2e/pages/main.page'
 import * as ls from '../../support/localstorage_data.js'
 
 const NAME = 'Owner1'
+const NAME_2 = 'Owner2'
 const EDITED_NAME = 'Edited Owner1'
+const duplicateEntry = 'test-sepolia-90'
+const owner1 = 'Automation owner'
+
+const recipientData = [owner1, constants.DEFAULT_OWNER_ADDRESS]
 
 describe('[SMOKE] Address book tests', () => {
   beforeEach(() => {
-    cy.clearLocalStorage()
     cy.visit(constants.addressBookUrl + constants.SEPOLIA_TEST_SAFE_1)
+    cy.clearLocalStorage()
     main.waitForHistoryCallToComplete()
     main.acceptCookies()
   })
@@ -37,8 +42,61 @@ describe('[SMOKE] Address book tests', () => {
 
   it('[SMOKE] Verify csv file can be imported', () => {
     addressBook.clickOnImportFileBtn()
-    addressBook.importFile()
-    addressBook.verifyImportModalIsClosed()
-    addressBook.verifyDataImported(constants.SEPOLIA_CSV_ENTRY.name, constants.SEPOLIA_CSV_ENTRY.address)
+    addressBook.importCSVFile(addressBook.validCSVFile)
+    addressBook.verifyImportBtnStatus(constants.enabledStates.enabled)
+    addressBook.clickOnImportBtn()
+    addressBook.verifyDataImported(addressBook.entries)
+    addressBook.verifyNumberOfRows(4)
+  })
+
+  it('[SMOKE] Import a csv file with an empty address/name/network in one row', () => {
+    addressBook.clickOnImportFileBtn()
+    addressBook.importCSVFile(addressBook.emptyCSVFile)
+    addressBook.verifyImportBtnStatus(constants.enabledStates.disabled)
+    addressBook.verifyUploadExportMessage([addressBook.uploadErrorMessages.emptyFile])
+  })
+
+  it('[SMOKE] Import a non-csv file', () => {
+    addressBook.clickOnImportFileBtn()
+    addressBook.importCSVFile(addressBook.nonCSVFile)
+    addressBook.verifyImportBtnStatus(constants.enabledStates.disabled)
+    addressBook.verifyUploadExportMessage([addressBook.uploadErrorMessages.fileType])
+  })
+
+  it('[SMOKE] Import a csv file with a repeated address and same network', () => {
+    addressBook.clickOnImportFileBtn()
+    addressBook.importCSVFile(addressBook.duplicatedCSVFile)
+    addressBook.verifyImportBtnStatus(constants.enabledStates.enabled)
+    addressBook.clickOnImportBtn()
+    addressBook.verifyDataImported([duplicateEntry])
+    addressBook.verifyNumberOfRows(1)
+  })
+
+  it('[SMOKE] Verify modal shows the amount of entries and networks detected', () => {
+    addressBook.clickOnImportFileBtn()
+    addressBook.importCSVFile(addressBook.networksCSVFile)
+    addressBook.verifyImportBtnStatus(constants.enabledStates.enabled)
+    addressBook.verifyModalSummaryMessage(4, 3)
+  })
+
+  it('[SMOKE] Verify an entry can be added by ENS name', () => {
+    addressBook.clickOnCreateEntryBtn()
+    addressBook.addEntryByENS(NAME_2, constants.ENS_TEST_SEPOLIA)
+  })
+
+  it('[SMOKE] Verify empty name is not allowed when editing', () => {
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sepoliaAddress1)
+    cy.wait(1000)
+    cy.reload()
+    addressBook.clickOnEditEntryBtn()
+    addressBook.verifyEmptyOwnerNameNotAllowed()
+  })
+
+  it('[SMOKE] Verify clicking on Send button autofills the recipient filed with correct value', () => {
+    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sepoliaAddress2)
+    cy.wait(1000)
+    cy.reload()
+    addressBook.clickOnSendBtn()
+    addressBook.verifyRecipientData(recipientData)
   })
 })
diff --git a/cypress/e2e/smoke/create_safe_simple.cy.js b/cypress/e2e/smoke/create_safe_simple.cy.js
index 3578417fce..54e1491739 100644
--- a/cypress/e2e/smoke/create_safe_simple.cy.js
+++ b/cypress/e2e/smoke/create_safe_simple.cy.js
@@ -11,6 +11,7 @@ describe('[SMOKE] Safe creation tests', () => {
     main.acceptCookies()
   })
   it('[SMOKE] Verify a Wallet can be connected', () => {
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     owner.clickOnWalletExpandMoreIcon()
     owner.clickOnDisconnectBtn()
@@ -20,12 +21,14 @@ describe('[SMOKE] Safe creation tests', () => {
 
   it('[SMOKE] Verify that a new Wallet has default name related to the selected network', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.verifyDefaultWalletName(createwallet.defaltSepoliaPlaceholder)
   })
 
   it('[SMOKE] Verify Add and Remove Owner Row works as expected', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.clickOnNextBtn()
     createwallet.clickOnAddNewOwnerBtn()
@@ -40,6 +43,7 @@ describe('[SMOKE] Safe creation tests', () => {
 
   it('[SMOKE] Verify Threshold Setup', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     createwallet.clickOnNextBtn()
     createwallet.clickOnAddNewOwnerBtn()
diff --git a/cypress/fixtures/address_book_addedsafes.csv  b/cypress/fixtures/address_book_addedsafes.csv 
new file mode 100644
index 0000000000..afe54dcd76
--- /dev/null
+++ b/cypress/fixtures/address_book_addedsafes.csv 	
@@ -0,0 +1,2 @@
+address,name,chainId
+0x6d0b6F96f665Bb4490f9ddb2e450Da2f7e546dC1,imported-safe,11155111
\ No newline at end of file
diff --git a/cypress/fixtures/address_book_duplicated.csv b/cypress/fixtures/address_book_duplicated.csv
new file mode 100644
index 0000000000..2302d1848a
--- /dev/null
+++ b/cypress/fixtures/address_book_duplicated.csv
@@ -0,0 +1,3 @@
+address,name,chainId
+0x6E834E9D04ad6b26e1525dE1a37BFd9b215f40B7,test-sepolia-9,11155111
+0x6E834E9D04ad6b26e1525dE1a37BFd9b215f40B7,test-sepolia-90,11155111
\ No newline at end of file
diff --git a/cypress/fixtures/address_book_empty_test.csv b/cypress/fixtures/address_book_empty_test.csv
new file mode 100644
index 0000000000..4918b1de41
--- /dev/null
+++ b/cypress/fixtures/address_book_empty_test.csv
@@ -0,0 +1 @@
+address,name,chainId
\ No newline at end of file
diff --git a/cypress/fixtures/address_book_networks.csv b/cypress/fixtures/address_book_networks.csv
new file mode 100644
index 0000000000..4624dfb476
--- /dev/null
+++ b/cypress/fixtures/address_book_networks.csv
@@ -0,0 +1,5 @@
+address,name,chainId
+0x8675B754342754A30A2AeF474D114d8460bca19b,"mainnet safe ",1
+0xB8d760a90a5ed54D3c2b3EFC231277e99188642A,"xDai Safe B8", 100
+0x91e11585c114129f3Ec940Aa648A4ac13668d0c2,"Biance safe91", 56
+0x61a0c717d18232711bC788F19C9Cd56a43cc8872,"MM account 1", 1
\ No newline at end of file
diff --git a/cypress/support/constants.js b/cypress/support/constants.js
index f83fb7cfc0..ffd84749aa 100644
--- a/cypress/support/constants.js
+++ b/cypress/support/constants.js
@@ -29,6 +29,7 @@ export const SEPOLIA_TEST_SAFE_14 = 'sep:0xC23e061252BFc7967203D054136d8fA7c7df2
 // SAFE 15 is a safe with native tokens but the automation user is not its owner
 export const SEPOLIA_TEST_SAFE_15_TOKEN = 'sep:0xfC0A7ac73Fde7547ac0792Cca1D8A50CE0AFC4Df'
 export const SEPOLIA_TEST_SAFE_16_CREATE_TX = 'sep:0xc2F3645bfd395516d1a18CA6ad9298299d328C01'
+export const SEPOLIA_TEST_SAFE_17_SIDEBAR_NONOWNER = 'sep:0x10B45a24640E2170B6AA63ea3A289D723a0C9cba'
 export const SEPOLIA_CONTRACT_SHORT = '0x11AB...34aF'
 export const SEPOLIA_RECIPIENT_ADDR_SHORT = '0x4DD4...7bde'
 export const GNO_TEST_SAFE = 'gno:0xB8d760a90a5ed54D3c2b3EFC231277e99188642A'
@@ -134,6 +135,11 @@ export const tokenAbbreviation = {
   link: 'LINK',
 }
 
+export const currencies = {
+  cad: 'CAD',
+  aud: 'AUD',
+}
+
 export const appNames = {
   walletConnect: 'walletconnect',
   customContract: 'compose custom contract',
diff --git a/cypress/support/localstorage_data.js b/cypress/support/localstorage_data.js
index 62e6a1c879..fca7bcc42e 100644
--- a/cypress/support/localstorage_data.js
+++ b/cypress/support/localstorage_data.js
@@ -317,12 +317,53 @@ export const addressBookData = {
     },
   },
   addedSafes: {
-    100: {
-      '0x17b34aEf1428A358bA2eA360a098b8A3BEb698C8': 'Added safe 1',
-      '0x11A6B41322C57Bd0e56cEe06abB11A1E5c1FF1BB': 'Added safe 2',
-      '0xB8d760a90a5ed54D3c2b3EFC231277e99188642A': 'Added safe 100',
+    1: {
+      '0x8675B754342754A30A2AeF474D114d8460bca19b': 'Added safe 900',
+    },
+    11155111: {
+      '0x0A0EEb6fBCc7c82259E548Fc4617175A357b3e71': 'Added safe 200',
+      '0xF21445699e91aC6F2EeeAF1a19510AC4197e59aB': 'Added owner',
+      '0x9E6DAfe829431e1892EcF8461FDAd02665170c31': 'Added non-owner',
     },
   },
+  sortingData: {
+    11155111: {
+      '0xC16Db0251654C0a72E91B190d81eAD367d2C6fED': 'AA Safe',
+      '0x6a5602335a878ADDCa4BF63a050E34946B56B5bC': 'BB Safe',
+    },
+  },
+  pagination: {
+    11155111: {
+      '0xB8Bfd72663602dB33A454e3D899fb1ee95F54c26': 'Safe 1',
+      '0x368D6B0Aa605253D19AB7C1F006a61Aa46bbECEb': 'Safe 2',
+      '0x9190cc22D592dDcf396Fa616ce84a9978fD96Fc9': 'Safe 3',
+      '0x98705770aF3b18db0a64597F6d4DCe825915fec0': 'Safe 4',
+      '0xC23e061252BFc7967203D054136d8fA7c7df2fc4': 'Safe 5',
+      '0x0Ec5EF749cce5185900819A3457C0f9129a9a9a1': 'Safe 6',
+      '0x0A0EEb6fBCc7c82259E548Fc4617175A357b3e71': 'Safe 7',
+      '0x10B45a24640E2170B6AA63ea3A289D723a0C9cba': 'Safe 8',
+      '0xF21445699e91aC6F2EeeAF1a19510AC4197e59aB': 'Safe 9',
+      '0x9E6DAfe829431e1892EcF8461FDAd02665170c31': 'Safe 10',
+      '0x6d0b6F96f665Bb4490f9ddb2e450Da2f7e546dC1': 'Safe 11',
+      '0xB8Bfd72663602dB33A454e3D899fb1ee95F54c26': 'Safe 12',
+      '0x6E834E9D04ad6b26e1525dE1a37BFd9b215f40B7': 'Safe 13',
+      '0xBb26E3717172d5000F87DeFd391994f789D80aEB': 'Safe 14',
+      '0x905934aA8758c06B2422F0C90D97d2fbb6677811': 'Safe 15',
+      '0xf8D6450d6ae36328cBAA97B1998C741be498c5D3': 'Safe 16',
+      '0xBd69b0a9DC90eB6F9bAc3E4a5875f437348b6415': 'Safe 17',
+      '0x5912f6616c84024cD1aff0D5b55bb36F5180fFdb': 'Safe 18',
+      '0x81034C61a318649F7aD43f9e8C1051427e326443': 'Safe 19',
+      '0x06373d5e45AD31BD354CeBfA8dB4eD2c75B8708e': 'Safe 20',
+      '0x4DD4cB2299E491E1B469245DB589ccB2B16d7bde': 'Safe 21',
+      '0xD1571E8Cc4438aFef2836DD9a0E5D09fb63EDE9a': 'Safe 22',
+      '0x691B95d2531BFf662767839d668d3D7651524C21': 'Safe 23',
+      '0x39419cC835046D0c7beca69638eBBDD0F9FD85e4': 'Safe 24',
+      '0xBf30F749FC027a5d79c4710D988F0D3C8e217A4F': 'Safe 25',
+      '0x8A89C14ed0900a95fc94075D0823f8c744789a40': 'Safe 26',
+      '0xc2F3645bfd395516d1a18CA6ad9298299d328C01': 'Safe 27',
+    },
+  },
+  cookies: { necessary: true, updates: true, analytics: true },
 }
 
 export const safeSettings = {
@@ -507,22 +548,54 @@ export const addedSafes = {
         threshold: 1,
         ethBalance: '0',
       },
+      '0x0A0EEb6fBCc7c82259E548Fc4617175A357b3e71': {
+        owners: [
+          {
+            value: '0x8aEf2f5c3F17261F6F1C4dA058D022BE92776af8',
+            name: null,
+            logoUri: null,
+          },
+          {
+            value: '0xC16Db0251654C0a72E91B190d81eAD367d2C6fED',
+            name: null,
+            logoUri: null,
+          },
+        ],
+        threshold: 2,
+        ethBalance: '0',
+      },
     },
-    100: {
-      '0x17b34aEf1428A358bA2eA360a098b8A3BEb698C8': {
+    1: {
+      '0x8675B754342754A30A2AeF474D114d8460bca19b': {
         owners: [{ value: '0x11B1D54B66e5e226D6f89069c21A569A22D98cfd' }],
         threshold: 1,
         ethBalance: '0.001000002',
       },
-      '0x11A6B41322C57Bd0e56cEe06abB11A1E5c1FF1BB': {
-        owners: [{ value: '0x7724b234c9099C205F03b458944942bcEBA13408' }],
-        threshold: 1,
+    },
+  },
+  set3: {
+    11155111: {
+      '0xF21445699e91aC6F2EeeAF1a19510AC4197e59aB': {
+        owners: [
+          {
+            value: '0xC16Db0251654C0a72E91B190d81eAD367d2C6fED',
+            name: null,
+            logoUri: null,
+          },
+        ],
+        threshold: 2,
         ethBalance: '0',
       },
-      '0xB8d760a90a5ed54D3c2b3EFC231277e99188642A': {
-        owners: [{ value: '0x11B1D54B66e5e226D6f89069c21A569A22D98cfd' }],
-        threshold: 1,
-        ethBalance: '0.92132507668989',
+      '0x9E6DAfe829431e1892EcF8461FDAd02665170c31': {
+        owners: [
+          {
+            value: '0x96D4c6fFC338912322813a77655fCC926b9A5aC5',
+            name: null,
+            logoUri: null,
+          },
+        ],
+        threshold: 2,
+        ethBalance: '0',
       },
     },
   },
diff --git a/docs/release-procedure.md b/docs/release-procedure.md
index ee1e755ed6..2e8002bbd3 100644
--- a/docs/release-procedure.md
+++ b/docs/release-procedure.md
@@ -8,16 +8,16 @@ After the PR is tested and approved by QA, it's merged into the `main` branch. `
 
 Schematically:
 ```
-<feature branches> –> dev -> release/X.Y.Z -> main
+<feature branches> –> dev -> release -> main
 ```
 
 We prepare at least one release every sprint. Sprints are two weeks long.
 
 ### Preparing a release branch
-* Create a code-freeze branch named `release/X.Y.Z`
+* Create a code-freeze branch named `release`
   * If it's a regular release, this branch is typically based off of `dev`
   * For hot fixes, it would be `main` + cherry-picked commits
-* Bump the version in the `package.json`
+* Bump the version in the `package.json` as a separate commit with the commit message equal to the exact version
 * Create a PR with the list of changes
 
   >    💡 To generate a quick changelog:
@@ -42,7 +42,7 @@ git reset --hard origin/main
 ```
 * Pull from the release branch:
 ```
-git pull origin release/3.15.0
+git pull origin release
 ```
 * Push:
 ```
diff --git a/package.json b/package.json
index b939beeaf7..be84cd5a5b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "safe-wallet-web",
   "homepage": "https://github.com/safe-global/safe-wallet-web",
   "license": "GPL-3.0",
-  "version": "1.28.0",
+  "version": "1.29.1",
   "type": "module",
   "scripts": {
     "dev": "next dev",
@@ -27,7 +27,8 @@
     "cypress:run": "cypress run",
     "cypress:ci": "yarn cypress:run --config baseUrl=http://localhost:8080 --spec cypress/e2e/smoke/*.cy.js",
     "serve": "npx -y serve out -p ${REVERSE_PROXY_UI_PORT:=8080}",
-    "static-serve": "yarn build && yarn serve"
+    "static-serve": "yarn build && yarn serve",
+    "update-wc": "yarn add @walletconnect/web3wallet@latest @walletconnect/utils@latest @walletconnect/types@latest"
   },
   "engines": {
     "node": ">=16"
@@ -54,16 +55,16 @@
     "@safe-global/safe-apps-sdk": "^9.0.0-next.1",
     "@safe-global/safe-core-sdk": "^3.3.5",
     "@safe-global/safe-core-sdk-utils": "^1.7.4",
-    "@safe-global/safe-ethers-lib": "^1.9.4",
     "@safe-global/safe-deployments": "1.32.0",
-    "@safe-global/safe-gateway-typescript-sdk": "^3.14.0",
+    "@safe-global/safe-ethers-lib": "^1.9.4",
+    "@safe-global/safe-gateway-typescript-sdk": "^3.15.0",
     "@safe-global/safe-modules-deployments": "^1.2.0",
     "@sentry/react": "^7.91.0",
     "@spindl-xyz/attribution-lite": "^1.4.0",
     "@tkey-mpc/common-types": "^8.2.2",
     "@truffle/hdwallet-provider": "^2.1.4",
-    "@walletconnect/utils": "^2.11.0",
-    "@walletconnect/web3wallet": "^1.10.0",
+    "@walletconnect/utils": "^2.11.1",
+    "@walletconnect/web3wallet": "^1.10.1",
     "@web3-onboard/coinbase": "^2.2.6",
     "@web3-onboard/core": "^2.21.2",
     "@web3-onboard/injected-wallets": "^2.10.7",
@@ -118,7 +119,7 @@
     "@types/react-gtm-module": "^2.0.1",
     "@types/semver": "^7.3.10",
     "@typescript-eslint/eslint-plugin": "^5.47.1",
-    "@walletconnect/types": "^2.11.0",
+    "@walletconnect/types": "^2.11.1",
     "cross-env": "^7.0.3",
     "cypress": "^12.15.0",
     "cypress-file-upload": "^5.0.8",
diff --git a/src/components/address-book/AddressBookTable/index.tsx b/src/components/address-book/AddressBookTable/index.tsx
index 542eb1bc5c..f1ee73aeec 100644
--- a/src/components/address-book/AddressBookTable/index.tsx
+++ b/src/components/address-book/AddressBookTable/index.tsx
@@ -120,6 +120,7 @@ function AddressBookTable({ chain, setTxFlow }: AddressBookTableProps) {
               {(isOk) => (
                 <Track {...ADDRESS_BOOK_EVENTS.SEND}>
                   <Button
+                    data-testid="send-btn"
                     variant="contained"
                     color="primary"
                     size="small"
diff --git a/src/components/address-book/ExportDialog/index.tsx b/src/components/address-book/ExportDialog/index.tsx
index 2f5e176d77..15256feaae 100644
--- a/src/components/address-book/ExportDialog/index.tsx
+++ b/src/components/address-book/ExportDialog/index.tsx
@@ -63,7 +63,7 @@ function ExportDialog({
   return (
     <ModalDialog open onClose={handleClose} dialogTitle="Export address book" hideChainIndicator>
       <DialogContent sx={{ p: '24px !important' }}>
-        <Typography>
+        <Typography data-testid="export-summary">
           You&apos;re about to export a CSV file with{' '}
           <b>
             {length} address book {length === 1 ? 'entry' : 'entries'}
@@ -84,7 +84,7 @@ function ExportDialog({
       <DialogActions>
         <Button onClick={handleClose}>Cancel</Button>
         <CSVDownloader filename={filename} bom config={{ delimiter: ',' }} data={csvData} style={{ order: 2 }}>
-          <Button variant="contained" disableElevation onClick={onSubmit}>
+          <Button data-testid="export-modal-btn" variant="contained" disableElevation onClick={onSubmit}>
             Export
           </Button>
         </CSVDownloader>
diff --git a/src/components/address-book/ImportDialog/index.tsx b/src/components/address-book/ImportDialog/index.tsx
index ac6d665eda..7b83a40d8b 100644
--- a/src/components/address-book/ImportDialog/index.tsx
+++ b/src/components/address-book/ImportDialog/index.tsx
@@ -128,7 +128,7 @@ const ImportDialog = ({ handleClose }: { handleClose: () => void }): ReactElemen
                   name: acceptedFile.name,
                   additionalInfo: formatFileSize(acceptedFile.size),
                   summary: [
-                    <Typography key="abSummary">
+                    <Typography data-testid="summary-message" key="abSummary">
                       {`Found ${entryCount} entries on ${chainCount} ${chainCount > 1 ? 'chains' : 'chain'}`}
                     </Typography>,
                   ],
@@ -163,8 +163,16 @@ const ImportDialog = ({ handleClose }: { handleClose: () => void }): ReactElemen
         </Typography>
       </DialogContent>
       <DialogActions>
-        <Button onClick={handleClose}>Cancel</Button>
-        <Button onClick={handleImport} variant="contained" disableElevation disabled={!csvData || !!error}>
+        <Button data-testid="cancel-btn" onClick={handleClose}>
+          Cancel
+        </Button>
+        <Button
+          data-testid="import-btn"
+          onClick={handleImport}
+          variant="contained"
+          disableElevation
+          disabled={!csvData || !!error}
+        >
           Import
         </Button>
       </DialogActions>
diff --git a/src/components/balances/AssetsTable/index.tsx b/src/components/balances/AssetsTable/index.tsx
index 224983b867..db035340b0 100644
--- a/src/components/balances/AssetsTable/index.tsx
+++ b/src/components/balances/AssetsTable/index.tsx
@@ -1,3 +1,4 @@
+import CheckBalance from '@/features/counterfactual/CheckBalance'
 import { type ReactElement, useMemo, useContext } from 'react'
 import { Button, Tooltip, Typography, SvgIcon, IconButton, Box, Checkbox, Skeleton } from '@mui/material'
 import type { TokenInfo } from '@safe-global/safe-gateway-typescript-sdk'
@@ -138,7 +139,7 @@ const AssetsTable = ({
     [hiddenAssets, balances.items, showHiddenAssets],
   )
 
-  const hasNoAssets = balances.items.length === 1 && balances.items[0].balance === '0'
+  const hasNoAssets = !loading && balances.items.length === 1 && balances.items[0].balance === '0'
 
   const selectedAssetCount = visibleAssets?.filter((item) => isAssetSelected(item.tokenInfo.address)).length || 0
 
@@ -257,6 +258,8 @@ const AssetsTable = ({
           <EnhancedTable rows={rows} headCells={headCells} />
         </div>
       )}
+
+      <CheckBalance />
     </>
   )
 }
diff --git a/src/components/balances/CurrencySelect/index.tsx b/src/components/balances/CurrencySelect/index.tsx
index bfec864f59..04d9af8e93 100644
--- a/src/components/balances/CurrencySelect/index.tsx
+++ b/src/components/balances/CurrencySelect/index.tsx
@@ -34,6 +34,7 @@ const CurrencySelect = (): ReactElement => {
       <InputLabel id="currency-label">Currency</InputLabel>
 
       <Select
+        data-testid="currency-selector"
         labelId="currency-label"
         id="currency"
         value={currency.toUpperCase()}
@@ -43,7 +44,7 @@ const CurrencySelect = (): ReactElement => {
         onClose={() => handleTrack('Close')}
       >
         {fiatCurrencies.map((item) => (
-          <MenuItem key={item} value={item} sx={{ overflow: 'hidden' }}>
+          <MenuItem data-testid="currency-item" key={item} value={item} sx={{ overflow: 'hidden' }}>
             {item.toUpperCase()}
           </MenuItem>
         ))}
diff --git a/src/components/common/AddressInput/index.tsx b/src/components/common/AddressInput/index.tsx
index d4789d5976..a72a2e950e 100644
--- a/src/components/common/AddressInput/index.tsx
+++ b/src/components/common/AddressInput/index.tsx
@@ -117,7 +117,7 @@ const AddressInput = ({
         className={inputCss.input}
         autoComplete="off"
         autoFocus={props.focused}
-        label={<>{error?.message || props.label}</>}
+        label={<>{error?.message || props.label || `Recipient address${isDomainLookupEnabled ? ' or ENS' : ''}`}</>}
         error={!!error}
         fullWidth
         spellCheck={false}
diff --git a/src/components/common/ChainIndicator/index.tsx b/src/components/common/ChainIndicator/index.tsx
index ab84e47a71..f113146f16 100644
--- a/src/components/common/ChainIndicator/index.tsx
+++ b/src/components/common/ChainIndicator/index.tsx
@@ -15,6 +15,7 @@ type ChainIndicatorProps = {
   className?: string
   showUnknown?: boolean
   showLogo?: boolean
+  responsive?: boolean
 }
 
 const fallbackChainConfig = {
@@ -32,6 +33,7 @@ const ChainIndicator = ({
   inline = false,
   showUnknown = true,
   showLogo = true,
+  responsive = false,
 }: ChainIndicatorProps): ReactElement | null => {
   const currentChainId = useChainId()
   const id = chainId || currentChainId
@@ -56,7 +58,12 @@ const ChainIndicator = ({
     <span
       data-testid="chain-logo"
       style={showLogo ? undefined : style}
-      className={classnames(inline ? css.inlineIndicator : css.indicator, showLogo ? css.withLogo : '', className)}
+      className={classnames(className || '', {
+        [css.inlineIndicator]: inline,
+        [css.indicator]: !inline,
+        [css.withLogo]: showLogo,
+        [css.responsive]: responsive,
+      })}
     >
       {showLogo && (
         <img
@@ -68,7 +75,7 @@ const ChainIndicator = ({
         />
       )}
 
-      {chainConfig.chainName}
+      <span className={css.name}>{chainConfig.chainName}</span>
     </span>
   ) : null
 }
diff --git a/src/components/common/ChainIndicator/styles.module.css b/src/components/common/ChainIndicator/styles.module.css
index fee2c496dc..42f18a2504 100644
--- a/src/components/common/ChainIndicator/styles.module.css
+++ b/src/components/common/ChainIndicator/styles.module.css
@@ -1,9 +1,9 @@
 .indicator {
   display: flex;
   align-items: center;
-  justify-content: center;
   min-width: 70px;
   font-size: 12px;
+  justify-content: center;
 }
 
 .inlineIndicator {
@@ -21,5 +21,16 @@
   align-items: center;
   gap: var(--space-1);
   padding: 0;
+  min-width: 115px;
   font-size: 14px;
+  justify-content: start;
+}
+
+@media (max-width: 899.95px) {
+  .responsive .name {
+    display: none;
+  }
+.indicator {
+  min-width: 35px;
+}
 }
diff --git a/src/components/common/CooldownButton/index.test.tsx b/src/components/common/CooldownButton/index.test.tsx
new file mode 100644
index 0000000000..7de9dc9eed
--- /dev/null
+++ b/src/components/common/CooldownButton/index.test.tsx
@@ -0,0 +1,77 @@
+import { render, waitFor } from '@/tests/test-utils'
+import CooldownButton from './index'
+
+describe('CooldownButton', () => {
+  beforeAll(() => {
+    jest.useFakeTimers()
+  })
+
+  afterAll(() => {
+    jest.useRealTimers()
+  })
+  it('should be disabled initially if startDisabled is set and become enabled after <cooldown> seconds', async () => {
+    const onClickEvent = jest.fn()
+    const result = render(
+      <CooldownButton cooldown={30} onClick={onClickEvent} startDisabled>
+        Try again
+      </CooldownButton>,
+    )
+
+    expect(result.getByRole('button')).toBeDisabled()
+    expect(result.getByText('Try again in 30s')).toBeVisible()
+
+    jest.advanceTimersByTime(10_000)
+
+    await waitFor(() => {
+      expect(result.getByRole('button')).toBeDisabled()
+      expect(result.getByText('Try again in 20s')).toBeVisible()
+    })
+
+    jest.advanceTimersByTime(5_000)
+
+    await waitFor(() => {
+      expect(result.getByRole('button')).toBeDisabled()
+      expect(result.getByText('Try again in 15s')).toBeVisible()
+    })
+
+    jest.advanceTimersByTime(15_000)
+
+    await waitFor(() => {
+      expect(result.getByRole('button')).toBeEnabled()
+    })
+    result.getByRole('button').click()
+
+    expect(onClickEvent).toHaveBeenCalledTimes(1)
+    await waitFor(() => {
+      expect(result.getByRole('button')).toBeDisabled()
+    })
+  })
+
+  it('should be enabled initially if startDisabled is not set and become disabled after click', async () => {
+    const onClickEvent = jest.fn()
+    const result = render(
+      <CooldownButton cooldown={30} onClick={onClickEvent}>
+        Try again
+      </CooldownButton>,
+    )
+
+    expect(result.getByRole('button')).toBeEnabled()
+    result.getByRole('button').click()
+
+    expect(onClickEvent).toHaveBeenCalledTimes(1)
+
+    await waitFor(() => {
+      expect(result.getByRole('button')).toBeDisabled()
+      expect(result.getByText('Try again in 30s')).toBeVisible()
+    })
+
+    jest.advanceTimersByTime(30_000)
+
+    await waitFor(() => {
+      expect(result.getByRole('button')).toBeEnabled()
+    })
+    result.getByRole('button').click()
+
+    expect(onClickEvent).toHaveBeenCalledTimes(2)
+  })
+})
diff --git a/src/components/common/CooldownButton/index.tsx b/src/components/common/CooldownButton/index.tsx
new file mode 100644
index 0000000000..aee9af0714
--- /dev/null
+++ b/src/components/common/CooldownButton/index.tsx
@@ -0,0 +1,48 @@
+import { Button } from '@mui/material'
+import { useState, useCallback, useEffect, type ReactNode } from 'react'
+
+// TODO: Extract into a hook so it can be reused for links and not just buttons
+const CooldownButton = ({
+  onClick,
+  cooldown,
+  startDisabled = false,
+  children,
+}: {
+  onClick: () => void
+  startDisabled?: boolean
+  cooldown: number // Cooldown in seconds
+  children: ReactNode
+}) => {
+  const [remainingSeconds, setRemainingSeconds] = useState(startDisabled ? cooldown : 0)
+  const [lastSendTime, setLastSendTime] = useState(startDisabled ? Date.now() : 0)
+
+  const adjustSeconds = useCallback(() => {
+    const remainingCoolDownSeconds = Math.max(0, cooldown * 1000 - (Date.now() - lastSendTime)) / 1000
+    setRemainingSeconds(remainingCoolDownSeconds)
+  }, [cooldown, lastSendTime])
+
+  useEffect(() => {
+    // Counter for progress
+    const interval = setInterval(adjustSeconds, 1000)
+    return () => clearInterval(interval)
+  }, [adjustSeconds])
+
+  const handleClick = () => {
+    setLastSendTime(Date.now())
+    setRemainingSeconds(cooldown)
+    onClick()
+  }
+
+  const isDisabled = remainingSeconds > 0
+
+  return (
+    <Button onClick={handleClick} variant="contained" size="small" disabled={isDisabled}>
+      <span>
+        {children}
+        {remainingSeconds > 0 && ` in ${Math.floor(remainingSeconds)}s`}
+      </span>
+    </Button>
+  )
+}
+
+export default CooldownButton
diff --git a/src/components/common/EnhancedTable/index.tsx b/src/components/common/EnhancedTable/index.tsx
index 33e6258a36..30a5130830 100644
--- a/src/components/common/EnhancedTable/index.tsx
+++ b/src/components/common/EnhancedTable/index.tsx
@@ -135,13 +135,14 @@ function EnhancedTable({ rows, headCells, mobileVariant }: EnhancedTableProps) {
 
   return (
     <Box sx={{ width: '100%' }}>
-      <TableContainer component={Paper} sx={{ width: '100%', mb: 2 }}>
+      <TableContainer data-testid="table-container" component={Paper} sx={{ width: '100%', mb: 2 }}>
         <Table aria-labelledby="tableTitle" className={mobileVariant ? css.mobileColumn : undefined}>
           <EnhancedTableHead headCells={headCells} order={order} orderBy={orderBy} onRequestSort={handleRequestSort} />
           <TableBody>
             {pagedRows.length > 0 ? (
               pagedRows.map((row, index) => (
                 <TableRow
+                  data-testid="table-row"
                   tabIndex={-1}
                   key={row.key ?? index}
                   selected={row.selected}
diff --git a/src/components/common/EthHashInfo/index.tsx b/src/components/common/EthHashInfo/index.tsx
index 7d6821f2ba..18559af22e 100644
--- a/src/components/common/EthHashInfo/index.tsx
+++ b/src/components/common/EthHashInfo/index.tsx
@@ -16,7 +16,7 @@ const EthHashInfo = ({
   const currentChainId = useChainId()
   const chain = useAppSelector((state) => selectChainById(state, props.chainId || currentChainId))
   const addressBook = useAddressBook()
-  const link = chain ? getBlockExplorerLink(chain, props.address) : undefined
+  const link = chain && props.hasExplorer ? getBlockExplorerLink(chain, props.address) : undefined
   const name = showName ? addressBook[props.address] || props.name : undefined
 
   return (
diff --git a/src/components/common/NetworkSelector/index.tsx b/src/components/common/NetworkSelector/index.tsx
index b1e76fea60..34981d95fc 100644
--- a/src/components/common/NetworkSelector/index.tsx
+++ b/src/components/common/NetworkSelector/index.tsx
@@ -19,8 +19,6 @@ import useWallet from '@/hooks/wallets/useWallet'
 import { isSocialWalletEnabled } from '@/hooks/wallets/wallets'
 import { isSocialLoginWallet } from '@/services/mpc/SocialLoginModule'
 
-const keepPathRoutes = [AppRoutes.welcome.index, AppRoutes.newSafe.create, AppRoutes.newSafe.load]
-
 const MenuWithTooltip = forwardRef<HTMLUListElement>(function MenuWithTooltip(props: any, ref) {
   return (
     <Tooltip title="More network support coming soon" arrow placement="left">
@@ -31,11 +29,6 @@ const MenuWithTooltip = forwardRef<HTMLUListElement>(function MenuWithTooltip(pr
   )
 })
 
-const testNets = ['gor', 'base-gor', 'sep']
-const isTestnet = (shortName: string) => {
-  return testNets.includes(shortName)
-}
-
 const NetworkSelector = (props: { onChainSelect?: () => void }): ReactElement => {
   const wallet = useWallet()
   const isDarkMode = useDarkMode()
@@ -44,14 +37,14 @@ const NetworkSelector = (props: { onChainSelect?: () => void }): ReactElement =>
   const chainId = useChainId()
   const router = useRouter()
 
-  const [testNets, prodNets] = useMemo(() => partition(configs, (config) => isTestnet(config.shortName)), [configs])
+  const [testNets, prodNets] = useMemo(() => partition(configs, (config) => config.isTestnet), [configs])
 
   const getNetworkLink = useCallback(
     (shortName: string) => {
-      const shouldKeepPath = keepPathRoutes.includes(router.pathname)
+      const shouldKeepPath = !router.query.safe
 
       const route = {
-        pathname: shouldKeepPath ? router.pathname : '/',
+        pathname: shouldKeepPath ? router.pathname : AppRoutes.index,
         query: {
           chain: shortName,
         } as {
diff --git a/src/components/dashboard/CreationDialog/index.tsx b/src/components/dashboard/CreationDialog/index.tsx
index 07a417f4e5..9133386e14 100644
--- a/src/components/dashboard/CreationDialog/index.tsx
+++ b/src/components/dashboard/CreationDialog/index.tsx
@@ -1,5 +1,10 @@
+import { selectUndeployedSafe } from '@/features/counterfactual/store/undeployedSafesSlice'
+import useChainId from '@/hooks/useChainId'
+import useSafeInfo from '@/hooks/useSafeInfo'
+import { useAppSelector } from '@/store'
+import type { PredictedSafeProps } from '@safe-global/protocol-kit'
 import React, { type ElementType } from 'react'
-import { Box, Button, Dialog, DialogContent, Grid, SvgIcon, Typography } from '@mui/material'
+import { Alert, Box, Button, Dialog, DialogContent, Grid, Link, SvgIcon, Typography } from '@mui/material'
 import { useRouter } from 'next/router'
 
 import HomeIcon from '@/public/images/sidebar/home.svg'
@@ -27,11 +32,34 @@ const HintItem = ({ Icon, title, description }: { Icon: ElementType; title: stri
   )
 }
 
+const getExportFileName = () => {
+  const today = new Date().toISOString().slice(0, 10)
+  return `safe-backup-${today}.json`
+}
+
+const backupSafe = (chainId: string, safeAddress: string, undeployedSafe: PredictedSafeProps) => {
+  const data = JSON.stringify({ chainId, safeAddress, safeProps: undeployedSafe }, null, 2)
+
+  const blob = new Blob([data], { type: 'text/json' })
+  const link = document.createElement('a')
+
+  link.download = getExportFileName()
+  link.href = window.URL.createObjectURL(blob)
+  link.dataset.downloadurl = ['text/json', link.download, link.href].join(':')
+  link.dispatchEvent(new MouseEvent('click'))
+
+  // TODO: Track this as an event
+  // trackEvent(COUNTERFACTUAL_EVENTS.EXPORT_SAFE)
+}
+
 const CreationDialog = () => {
   const router = useRouter()
   const [open, setOpen] = React.useState(true)
   const [remoteSafeApps = []] = useRemoteSafeApps()
   const chain = useCurrentChain()
+  const chainId = useChainId()
+  const { safeAddress } = useSafeInfo()
+  const undeployedSafe = useAppSelector((state) => selectUndeployedSafe(state, chainId, safeAddress))
 
   const onClose = () => {
     const { [CREATION_MODAL_QUERY_PARM]: _, ...query } = router.query
@@ -49,7 +77,8 @@ const CreationDialog = () => {
         <Typography variant="body2">
           Congratulations on your first step to truly unlock ownership. Enjoy the experience and discover our app.
         </Typography>
-        <Grid container mt={4} mb={6} spacing={3}>
+
+        <Grid container mt={2} mb={4} spacing={3}>
           <HintItem Icon={HomeIcon} title="Home" description="Get a status overview of your Safe Account here." />
           <HintItem
             Icon={TransactionIcon}
@@ -73,6 +102,23 @@ const CreationDialog = () => {
             description="Have any questions? Check out our collection of articles."
           />
         </Grid>
+
+        {undeployedSafe && (
+          <Alert severity="info" sx={{ mb: 2 }}>
+            We recommend{' '}
+            <Link
+              href="#"
+              onClick={(e) => {
+                e.preventDefault()
+                backupSafe(chainId, safeAddress, undeployedSafe)
+              }}
+            >
+              backing up your Safe Account
+            </Link>{' '}
+            in case you lose access to this device.
+          </Alert>
+        )}
+
         <Box display="flex" justifyContent="center">
           <Button onClick={onClose} variant="contained" size="stretched">
             Got it
diff --git a/src/components/dashboard/index.tsx b/src/components/dashboard/index.tsx
index 75d8d96613..faebec1afa 100644
--- a/src/components/dashboard/index.tsx
+++ b/src/components/dashboard/index.tsx
@@ -1,3 +1,4 @@
+import useOnboard from '@/hooks/wallets/useOnboard'
 import type { ReactElement } from 'react'
 import dynamic from 'next/dynamic'
 import { Grid } from '@mui/material'
@@ -17,8 +18,11 @@ const RecoveryWidget = dynamic(() => import('@/features/recovery/components/Reco
 
 const Dashboard = (): ReactElement => {
   const router = useRouter()
+  const onboard = useOnboard()
   const { [CREATION_MODAL_QUERY_PARM]: showCreationModal = '' } = router.query
 
+  console.log(onboard)
+
   const supportsRecovery = useIsRecoverySupported()
   const [recovery] = useRecovery()
   const showRecoveryWidget = supportsRecovery && !recovery
diff --git a/src/components/new-safe/ReviewRow/index.tsx b/src/components/new-safe/ReviewRow/index.tsx
index 7478c054c4..6f434c108c 100644
--- a/src/components/new-safe/ReviewRow/index.tsx
+++ b/src/components/new-safe/ReviewRow/index.tsx
@@ -1,13 +1,15 @@
 import React, { type ReactElement } from 'react'
 import { Grid, Typography } from '@mui/material'
 
-const ReviewRow = ({ name, value }: { name: string; value: ReactElement }) => {
+const ReviewRow = ({ name, value }: { name?: string; value: ReactElement }) => {
   return (
     <>
-      <Grid item xs={3}>
-        <Typography variant="body2">{name}</Typography>
-      </Grid>
-      <Grid item xs={9}>
+      {name && (
+        <Grid item xs={3}>
+          <Typography variant="body2">{name}</Typography>
+        </Grid>
+      )}
+      <Grid item xs={name ? 9 : 12}>
         {value}
       </Grid>
     </>
diff --git a/src/components/new-safe/create/logic/index.ts b/src/components/new-safe/create/logic/index.ts
index 8c79eca2ee..4070125258 100644
--- a/src/components/new-safe/create/logic/index.ts
+++ b/src/components/new-safe/create/logic/index.ts
@@ -1,3 +1,4 @@
+import type { SafeVersion } from '@safe-global/safe-core-sdk-types'
 import { type BrowserProvider, type Provider } from 'ethers'
 
 import { getSafeInfo, type SafeInfo, type ChainInfo } from '@safe-global/safe-gateway-typescript-sdk'
@@ -56,20 +57,27 @@ export const getSafeDeployProps = async (
   }
 }
 
-const getSafeFactory = async (ethersProvider: BrowserProvider): Promise<SafeFactory> => {
-  if (!isValidSafeVersion(LATEST_SAFE_VERSION)) {
+const getSafeFactory = async (
+  ethersProvider: BrowserProvider,
+  safeVersion = LATEST_SAFE_VERSION,
+): Promise<SafeFactory> => {
+  if (!isValidSafeVersion(safeVersion)) {
     throw new Error('Invalid Safe version')
   }
   const ethAdapter = await createEthersAdapter(ethersProvider)
-  const safeFactory = await SafeFactory.create({ ethAdapter, safeVersion: LATEST_SAFE_VERSION })
+  const safeFactory = await SafeFactory.create({ ethAdapter, safeVersion })
   return safeFactory
 }
 
 /**
  * Create a Safe creation transaction via Core SDK and submits it to the wallet
  */
-export const createNewSafe = async (ethersProvider: BrowserProvider, props: DeploySafeProps): Promise<Safe> => {
-  const safeFactory = await getSafeFactory(ethersProvider)
+export const createNewSafe = async (
+  ethersProvider: BrowserProvider,
+  props: DeploySafeProps,
+  safeVersion?: SafeVersion,
+): Promise<Safe> => {
+  const safeFactory = await getSafeFactory(ethersProvider, safeVersion)
   return safeFactory.deploySafe(props)
 }
 
@@ -285,10 +293,22 @@ export const getRedirect = (
   return redirectUrl + `${appendChar}safe=${address}`
 }
 
-export const relaySafeCreation = async (chain: ChainInfo, owners: string[], threshold: number, saltNonce: number) => {
-  const readOnlyProxyFactoryContract = await getReadOnlyProxyFactoryContract(chain.chainId, LATEST_SAFE_VERSION)
+export const relaySafeCreation = async (
+  chain: ChainInfo,
+  owners: string[],
+  threshold: number,
+  saltNonce: number,
+  safeVersion?: SafeVersion,
+) => {
+  const readOnlyProxyFactoryContract = await getReadOnlyProxyFactoryContract(
+    chain.chainId,
+    safeVersion ?? LATEST_SAFE_VERSION,
+  )
   const proxyFactoryAddress = await readOnlyProxyFactoryContract.getAddress()
-  const readOnlyFallbackHandlerContract = await getReadOnlyFallbackHandlerContract(chain.chainId, LATEST_SAFE_VERSION)
+  const readOnlyFallbackHandlerContract = await getReadOnlyFallbackHandlerContract(
+    chain.chainId,
+    safeVersion ?? LATEST_SAFE_VERSION,
+  )
   const fallbackHandlerAddress = await readOnlyFallbackHandlerContract.getAddress()
   const readOnlySafeContract = await getReadOnlyGnosisSafeContract(chain)
   const safeContractAddress = await readOnlySafeContract.getAddress()
diff --git a/src/components/new-safe/create/logic/utils.test.ts b/src/components/new-safe/create/logic/utils.test.ts
new file mode 100644
index 0000000000..ffc1da67e3
--- /dev/null
+++ b/src/components/new-safe/create/logic/utils.test.ts
@@ -0,0 +1,50 @@
+import * as creationUtils from '@/components/new-safe/create/logic/index'
+import { getAvailableSaltNonce } from '@/components/new-safe/create/logic/utils'
+import * as web3Utils from '@/hooks/wallets/web3'
+import { faker } from '@faker-js/faker'
+import type { DeploySafeProps } from '@safe-global/protocol-kit'
+import { BrowserProvider, type Eip1193Provider } from 'ethers'
+
+describe('getAvailableSaltNonce', () => {
+  jest.spyOn(creationUtils, 'computeNewSafeAddress').mockReturnValue(Promise.resolve(faker.finance.ethereumAddress()))
+
+  let mockProvider: BrowserProvider
+  let mockDeployProps: DeploySafeProps
+
+  beforeAll(() => {
+    mockProvider = new BrowserProvider(jest.fn() as unknown as Eip1193Provider)
+    mockDeployProps = {
+      safeAccountConfig: {
+        threshold: 1,
+        owners: [faker.finance.ethereumAddress()],
+        fallbackHandler: faker.finance.ethereumAddress(),
+      },
+    }
+  })
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('should return initial nonce if no contract is deployed to the computed address', async () => {
+    jest.spyOn(web3Utils, 'isSmartContract').mockReturnValue(Promise.resolve(false))
+    const initialNonce = faker.string.numeric()
+
+    const result = await getAvailableSaltNonce(mockProvider, { ...mockDeployProps, saltNonce: initialNonce })
+
+    expect(result).toEqual(initialNonce)
+  })
+
+  it('should return an increased nonce if a contract is deployed to the computed address', async () => {
+    jest.spyOn(web3Utils, 'isSmartContract').mockReturnValueOnce(Promise.resolve(true))
+    const initialNonce = faker.string.numeric()
+
+    const result = await getAvailableSaltNonce(mockProvider, { ...mockDeployProps, saltNonce: initialNonce })
+
+    jest.spyOn(web3Utils, 'isSmartContract').mockReturnValueOnce(Promise.resolve(false))
+
+    const increasedNonce = (Number(initialNonce) + 1).toString()
+
+    expect(result).toEqual(increasedNonce)
+  })
+})
diff --git a/src/components/new-safe/create/logic/utils.ts b/src/components/new-safe/create/logic/utils.ts
new file mode 100644
index 0000000000..e31e01bfd1
--- /dev/null
+++ b/src/components/new-safe/create/logic/utils.ts
@@ -0,0 +1,17 @@
+import { computeNewSafeAddress } from '@/components/new-safe/create/logic/index'
+import { isSmartContract } from '@/hooks/wallets/web3'
+import type { DeploySafeProps } from '@safe-global/protocol-kit'
+import type { BrowserProvider } from 'ethers'
+
+export const getAvailableSaltNonce = async (provider: BrowserProvider, props: DeploySafeProps): Promise<string> => {
+  const safeAddress = await computeNewSafeAddress(provider, props)
+  const isContractDeployed = await isSmartContract(provider, safeAddress)
+
+  // Safe is already deployed so we try the next saltNonce
+  if (isContractDeployed) {
+    return getAvailableSaltNonce(provider, { ...props, saltNonce: (Number(props.saltNonce) + 1).toString() })
+  }
+
+  // We know that there will be a saltNonce but the type has it as optional
+  return props.saltNonce!
+}
diff --git a/src/components/new-safe/create/steps/ReviewStep/index.test.tsx b/src/components/new-safe/create/steps/ReviewStep/index.test.tsx
index 397e4bc18a..8ebfc9bdaa 100644
--- a/src/components/new-safe/create/steps/ReviewStep/index.test.tsx
+++ b/src/components/new-safe/create/steps/ReviewStep/index.test.tsx
@@ -1,10 +1,14 @@
+import type { NewSafeFormData } from '@/components/new-safe/create'
+import * as useChains from '@/hooks/useChains'
+import * as relay from '@/utils/relaying'
 import { type ChainInfo } from '@safe-global/safe-gateway-typescript-sdk'
 
 import { render } from '@/tests/test-utils'
-import { NetworkFee } from '@/components/new-safe/create/steps/ReviewStep/index'
+import ReviewStep, { NetworkFee } from '@/components/new-safe/create/steps/ReviewStep/index'
 import * as useWallet from '@/hooks/wallets/useWallet'
 import { type ConnectedWallet } from '@/hooks/wallets/useOnboard'
-import { ONBOARD_MPC_MODULE_LABEL } from '@/services/mpc/SocialLoginModule'
+import * as socialLogin from '@/services/mpc/SocialLoginModule'
+import { act, fireEvent } from '@testing-library/react'
 
 const mockChainInfo = {
   chainId: '100',
@@ -25,14 +29,14 @@ describe('NetworkFee', () => {
   })
 
   it('displays a sponsored by message for social login', () => {
-    jest.spyOn(useWallet, 'default').mockReturnValue({ label: ONBOARD_MPC_MODULE_LABEL } as unknown as ConnectedWallet)
+    jest.spyOn(useWallet, 'default').mockReturnValue({ label: 'Social Login' } as unknown as ConnectedWallet)
     const result = render(<NetworkFee totalFee="0" chain={mockChainInfo} willRelay={true} />)
 
     expect(result.getByText(/Your account is sponsored by Gnosis/)).toBeInTheDocument()
   })
 
   it('displays an error message for social login if there are no relays left', () => {
-    jest.spyOn(useWallet, 'default').mockReturnValue({ label: ONBOARD_MPC_MODULE_LABEL } as unknown as ConnectedWallet)
+    jest.spyOn(useWallet, 'default').mockReturnValue({ label: 'Social Login' } as unknown as ConnectedWallet)
     const result = render(<NetworkFee totalFee="0" chain={mockChainInfo} willRelay={false} />)
 
     expect(
@@ -40,3 +44,103 @@ describe('NetworkFee', () => {
     ).toBeInTheDocument()
   })
 })
+
+describe('ReviewStep', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('should display a pay now pay later option for counterfactual safe setups', () => {
+    const mockData: NewSafeFormData = {
+      name: 'Test',
+      threshold: 1,
+      owners: [{ name: '', address: '0x1' }],
+      saltNonce: 0,
+    }
+    jest.spyOn(useChains, 'useHasFeature').mockReturnValue(true)
+
+    const { getByText } = render(
+      <ReviewStep data={mockData} onSubmit={jest.fn()} onBack={jest.fn()} setStep={jest.fn()} />,
+    )
+
+    expect(getByText('Pay now')).toBeInTheDocument()
+  })
+
+  it('should not display the network fee for counterfactual safes', () => {
+    const mockData: NewSafeFormData = {
+      name: 'Test',
+      threshold: 1,
+      owners: [{ name: '', address: '0x1' }],
+      saltNonce: 0,
+    }
+    jest.spyOn(useChains, 'useHasFeature').mockReturnValue(true)
+
+    const { queryByText } = render(
+      <ReviewStep data={mockData} onSubmit={jest.fn()} onBack={jest.fn()} setStep={jest.fn()} />,
+    )
+
+    expect(queryByText('You will have to confirm a transaction and pay an estimated fee')).not.toBeInTheDocument()
+  })
+
+  it('should not display the execution method for counterfactual safes', () => {
+    const mockData: NewSafeFormData = {
+      name: 'Test',
+      threshold: 1,
+      owners: [{ name: '', address: '0x1' }],
+      saltNonce: 0,
+    }
+    jest.spyOn(useChains, 'useHasFeature').mockReturnValue(true)
+
+    const { queryByText } = render(
+      <ReviewStep data={mockData} onSubmit={jest.fn()} onBack={jest.fn()} setStep={jest.fn()} />,
+    )
+
+    expect(queryByText('Who will pay gas fees:')).not.toBeInTheDocument()
+  })
+
+  it('should display the network fee for counterfactual safes if the user selects pay now', async () => {
+    const mockData: NewSafeFormData = {
+      name: 'Test',
+      threshold: 1,
+      owners: [{ name: '', address: '0x1' }],
+      saltNonce: 0,
+    }
+    jest.spyOn(useChains, 'useHasFeature').mockReturnValue(true)
+
+    const { getByText } = render(
+      <ReviewStep data={mockData} onSubmit={jest.fn()} onBack={jest.fn()} setStep={jest.fn()} />,
+    )
+
+    const payNow = getByText('Pay now')
+
+    act(() => {
+      fireEvent.click(payNow)
+    })
+
+    expect(getByText(/You will have to confirm a transaction and pay an estimated fee/)).toBeInTheDocument()
+  })
+
+  it('should display the execution method for counterfactual safes if the user selects pay now and there is relaying', async () => {
+    const mockData: NewSafeFormData = {
+      name: 'Test',
+      threshold: 1,
+      owners: [{ name: '', address: '0x1' }],
+      saltNonce: 0,
+    }
+    jest.spyOn(useChains, 'useHasFeature').mockReturnValue(true)
+    jest.spyOn(relay, 'hasRemainingRelays').mockReturnValue(true)
+    jest.spyOn(socialLogin, 'isSocialLoginWallet').mockReturnValue(false)
+
+    const { getByText } = render(
+      <ReviewStep data={mockData} onSubmit={jest.fn()} onBack={jest.fn()} setStep={jest.fn()} />,
+    )
+
+    const payNow = getByText('Pay now')
+
+    act(() => {
+      fireEvent.click(payNow)
+    })
+
+    expect(getByText(/Who will pay gas fees:/)).toBeInTheDocument()
+  })
+})
diff --git a/src/components/new-safe/create/steps/ReviewStep/index.tsx b/src/components/new-safe/create/steps/ReviewStep/index.tsx
index b6c7ddfc99..dee132db0c 100644
--- a/src/components/new-safe/create/steps/ReviewStep/index.tsx
+++ b/src/components/new-safe/create/steps/ReviewStep/index.tsx
@@ -1,47 +1,55 @@
-import ErrorMessage from '@/components/tx/ErrorMessage'
-import useWalletCanPay from '@/hooks/useWalletCanPay'
-import { useMemo, useState } from 'react'
-import { Button, Grid, Typography, Divider, Box, Alert } from '@mui/material'
-import lightPalette from '@/components/theme/lightPalette'
 import ChainIndicator from '@/components/common/ChainIndicator'
+import type { NamedAddress } from '@/components/new-safe/create/types'
 import EthHashInfo from '@/components/common/EthHashInfo'
-import { useCurrentChain } from '@/hooks/useChains'
-import useGasPrice, { getTotalFee } from '@/hooks/useGasPrice'
-import { useEstimateSafeCreationGas } from '@/components/new-safe/create/useEstimateSafeCreationGas'
-import { formatVisualAmount } from '@/utils/formatters'
+import { getTotalFeeFormatted } from '@/hooks/useGasPrice'
 import type { StepRenderProps } from '@/components/new-safe/CardStepper/useCardStepper'
 import type { NewSafeFormData } from '@/components/new-safe/create'
+import { computeNewSafeAddress } from '@/components/new-safe/create/logic'
+import { getAvailableSaltNonce } from '@/components/new-safe/create/logic/utils'
+import NetworkWarning from '@/components/new-safe/create/NetworkWarning'
 import css from '@/components/new-safe/create/steps/ReviewStep/styles.module.css'
 import layoutCss from '@/components/new-safe/create/styles.module.css'
-import { getReadOnlyFallbackHandlerContract } from '@/services/contracts/safeContracts'
-import { computeNewSafeAddress } from '@/components/new-safe/create/logic'
-import useWallet from '@/hooks/wallets/useWallet'
-import { useWeb3 } from '@/hooks/wallets/web3'
+import { useEstimateSafeCreationGas } from '@/components/new-safe/create/useEstimateSafeCreationGas'
 import useSyncSafeCreationStep from '@/components/new-safe/create/useSyncSafeCreationStep'
-import ArrowBackIcon from '@mui/icons-material/ArrowBack'
-import NetworkWarning from '@/components/new-safe/create/NetworkWarning'
-import useIsWrongChain from '@/hooks/useIsWrongChain'
 import ReviewRow from '@/components/new-safe/ReviewRow'
-import { ExecutionMethodSelector, ExecutionMethod } from '@/components/tx/ExecutionMethodSelector'
-import { MAX_HOUR_RELAYS, useLeastRemainingRelays } from '@/hooks/useRemainingRelays'
-import classnames from 'classnames'
-import { hasRemainingRelays } from '@/utils/relaying'
-import { usePendingSafe } from '../StatusStep/usePendingSafe'
+import ErrorMessage from '@/components/tx/ErrorMessage'
+import { ExecutionMethod, ExecutionMethodSelector } from '@/components/tx/ExecutionMethodSelector'
+import { RELAY_SPONSORS } from '@/components/tx/SponsoredBy'
 import { LATEST_SAFE_VERSION } from '@/config/constants'
+import PayNowPayLater, { PayMethod } from '@/features/counterfactual/PayNowPayLater'
+import { createCounterfactualSafe } from '@/features/counterfactual/utils'
+import { useCurrentChain, useHasFeature } from '@/hooks/useChains'
+import useGasPrice from '@/hooks/useGasPrice'
+import useIsWrongChain from '@/hooks/useIsWrongChain'
+import { MAX_HOUR_RELAYS, useLeastRemainingRelays } from '@/hooks/useRemainingRelays'
+import useWalletCanPay from '@/hooks/useWalletCanPay'
+import useWallet from '@/hooks/wallets/useWallet'
+import { useWeb3 } from '@/hooks/wallets/web3'
+import { getReadOnlyFallbackHandlerContract } from '@/services/contracts/safeContracts'
 import { isSocialLoginWallet } from '@/services/mpc/SocialLoginModule'
-import { RELAY_SPONSORS } from '@/components/tx/SponsoredBy'
-import Image from 'next/image'
-import { type ChainInfo } from '@safe-global/safe-gateway-typescript-sdk'
+import { useAppDispatch } from '@/store'
+import { FEATURES } from '@/utils/chains'
+import { hasRemainingRelays } from '@/utils/relaying'
+import ArrowBackIcon from '@mui/icons-material/ArrowBack'
+import { Alert, Box, Button, Divider, Grid, Typography } from '@mui/material'
 import { type DeploySafeProps } from '@safe-global/protocol-kit'
+import { type ChainInfo } from '@safe-global/safe-gateway-typescript-sdk'
+import classnames from 'classnames'
+import Image from 'next/image'
+import { useRouter } from 'next/router'
+import { useMemo, useState } from 'react'
+import { usePendingSafe } from '../StatusStep/usePendingSafe'
 
 export const NetworkFee = ({
   totalFee,
   chain,
   willRelay,
+  inline = false,
 }: {
   totalFee: string
   chain: ChainInfo | undefined
   willRelay: boolean
+  inline?: boolean
 }) => {
   const wallet = useWallet()
 
@@ -49,16 +57,8 @@ export const NetworkFee = ({
 
   if (!isSocialLogin) {
     return (
-      <Box
-        p={1}
-        sx={{
-          backgroundColor: lightPalette.secondary.background,
-          color: 'static.main',
-          width: 'fit-content',
-          borderRadius: '6px',
-        }}
-      >
-        <Typography variant="body1" className={classnames({ [css.sponsoredFee]: willRelay })}>
+      <Box className={classnames(css.networkFee, { [css.networkFeeInline]: inline })}>
+        <Typography className={classnames({ [css.sponsoredFee]: willRelay })}>
           <b>
             &asymp; {totalFee} {chain?.nativeCurrency.symbol}
           </b>
@@ -95,16 +95,66 @@ export const NetworkFee = ({
   )
 }
 
+export const SafeSetupOverview = ({
+  name,
+  owners,
+  threshold,
+}: {
+  name?: string
+  owners: NamedAddress[]
+  threshold: number
+}) => {
+  const chain = useCurrentChain()
+
+  return (
+    <Grid container spacing={3}>
+      <ReviewRow name="Network" value={<ChainIndicator chainId={chain?.chainId} inline />} />
+      {name && <ReviewRow name="Name" value={<Typography>{name}</Typography>} />}
+      <ReviewRow
+        name="Owners"
+        value={
+          <Box data-testid="review-step-owner-info" className={css.ownersArray}>
+            {owners.map((owner, index) => (
+              <EthHashInfo
+                address={owner.address}
+                name={owner.name || owner.ens}
+                shortAddress={false}
+                showPrefix={false}
+                showName
+                hasExplorer
+                showCopyButton
+                key={index}
+              />
+            ))}
+          </Box>
+        }
+      />
+      <ReviewRow
+        name="Threshold"
+        value={
+          <Typography>
+            {threshold} out of {owners.length} owner(s)
+          </Typography>
+        }
+      />
+    </Grid>
+  )
+}
+
 const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps<NewSafeFormData>) => {
   const isWrongChain = useIsWrongChain()
   useSyncSafeCreationStep(setStep)
   const chain = useCurrentChain()
   const wallet = useWallet()
   const provider = useWeb3()
+  const dispatch = useAppDispatch()
+  const router = useRouter()
   const [gasPrice] = useGasPrice()
-  const saltNonce = useMemo(() => Date.now(), [])
   const [_, setPendingSafe] = usePendingSafe()
+  const [payMethod, setPayMethod] = useState(PayMethod.PayLater)
   const [executionMethod, setExecutionMethod] = useState(ExecutionMethod.RELAY)
+  const [submitError, setSubmitError] = useState<string>()
+  const isCounterfactualEnabled = useHasFeature(FEATURES.COUNTERFACTUAL)
 
   const ownerAddresses = useMemo(() => data.owners.map((owner) => owner.address), [data.owners])
   const [minRelays] = useLeastRemainingRelays(ownerAddresses)
@@ -117,9 +167,9 @@ const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps<NewSafe
     return {
       owners: data.owners.map((owner) => owner.address),
       threshold: data.threshold,
-      saltNonce,
+      saltNonce: Date.now(), // This is not the final saltNonce but easier to use and will only result in a slightly higher gas estimation
     }
-  }, [data.owners, data.threshold, saltNonce])
+  }, [data.owners, data.threshold])
 
   const { gasLimit } = useEstimateSafeCreationGas(safeParams)
 
@@ -128,10 +178,10 @@ const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps<NewSafe
 
   const walletCanPay = useWalletCanPay({ gasLimit, maxFeePerGas, maxPriorityFeePerGas })
 
-  const totalFee =
-    gasLimit && maxFeePerGas
-      ? formatVisualAmount(getTotalFee(maxFeePerGas, maxPriorityFeePerGas, gasLimit), chain?.nativeCurrency.decimals)
-      : '> 0.001'
+  const totalFee = getTotalFeeFormatted(maxFeePerGas, maxPriorityFeePerGas, gasLimit, chain)
+
+  // Only 1 out of 1 safe setups are supported for now
+  const isCounterfactual = data.threshold === 1 && data.owners.length === 1 && isCounterfactualEnabled
 
   const handleBack = () => {
     onBack(data)
@@ -140,28 +190,40 @@ const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps<NewSafe
   const createSafe = async () => {
     if (!wallet || !provider || !chain) return
 
-    const readOnlyFallbackHandlerContract = await getReadOnlyFallbackHandlerContract(chain.chainId, LATEST_SAFE_VERSION)
+    try {
+      const readOnlyFallbackHandlerContract = await getReadOnlyFallbackHandlerContract(
+        chain.chainId,
+        LATEST_SAFE_VERSION,
+      )
 
-    const props: DeploySafeProps = {
-      safeAccountConfig: {
-        threshold: data.threshold,
-        owners: data.owners.map((owner) => owner.address),
-        fallbackHandler: await readOnlyFallbackHandlerContract.getAddress(),
-      },
-      saltNonce: saltNonce.toString(),
-    }
+      const props: DeploySafeProps = {
+        safeAccountConfig: {
+          threshold: data.threshold,
+          owners: data.owners.map((owner) => owner.address),
+          fallbackHandler: await readOnlyFallbackHandlerContract.getAddress(),
+        },
+      }
 
-    const safeAddress = await computeNewSafeAddress(provider, props)
+      const saltNonce = await getAvailableSaltNonce(provider, { ...props, saltNonce: '0' })
+      const safeAddress = await computeNewSafeAddress(provider, { ...props, saltNonce })
 
-    const pendingSafe = {
-      ...data,
-      saltNonce,
-      safeAddress,
-      willRelay,
-    }
+      if (isCounterfactual && payMethod === PayMethod.PayLater) {
+        createCounterfactualSafe(chain, safeAddress, saltNonce, data, dispatch, props, router)
+        return
+      }
 
-    setPendingSafe(pendingSafe)
-    onSubmit(pendingSafe)
+      const pendingSafe = {
+        ...data,
+        saltNonce: Number(saltNonce),
+        safeAddress,
+        willRelay,
+      }
+
+      setPendingSafe(pendingSafe)
+      onSubmit(pendingSafe)
+    } catch (_err) {
+      setSubmitError('Error creating the Safe Account. Please try again later.')
+    }
   }
 
   const isSocialLogin = isSocialLoginWallet(wallet?.label)
@@ -170,83 +232,93 @@ const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps<NewSafe
   return (
     <>
       <Box className={layoutCss.row}>
-        <Grid container spacing={3}>
-          <ReviewRow name="Network" value={<ChainIndicator chainId={chain?.chainId} inline />} />
-          {data.name && <ReviewRow name="Name" value={<Typography>{data.name}</Typography>} />}
-          <ReviewRow
-            name="Owners"
-            value={
-              <Box data-testid="review-step-owner-info" className={css.ownersArray}>
-                {data.owners.map((owner, index) => (
-                  <EthHashInfo
-                    address={owner.address}
-                    name={owner.name || owner.ens}
-                    shortAddress={false}
-                    showPrefix={false}
-                    showName
-                    hasExplorer
-                    showCopyButton
-                    key={index}
-                  />
-                ))}
-              </Box>
-            }
-          />
-          <ReviewRow
-            name="Threshold"
-            value={
-              <Typography>
-                {data.threshold} out of {data.owners.length} owner(s)
-              </Typography>
-            }
-          />
-        </Grid>
+        <SafeSetupOverview name={data.name} owners={data.owners} threshold={data.threshold} />
       </Box>
 
-      <Divider />
-      <Box className={layoutCss.row} display="flex" flexDirection="column" gap={3}>
-        {canRelay && !isSocialLogin && (
-          <Grid container spacing={3}>
-            <ReviewRow
-              name="Execution method"
-              value={
-                <ExecutionMethodSelector
-                  executionMethod={executionMethod}
-                  setExecutionMethod={setExecutionMethod}
-                  relays={minRelays}
+      {isCounterfactual && (
+        <>
+          <Divider />
+          <Box className={layoutCss.row}>
+            <PayNowPayLater totalFee={totalFee} canRelay={canRelay} payMethod={payMethod} setPayMethod={setPayMethod} />
+
+            {canRelay && !isSocialLogin && payMethod === PayMethod.PayNow && (
+              <Grid container spacing={3} pt={2}>
+                <ReviewRow
+                  value={
+                    <ExecutionMethodSelector
+                      executionMethod={executionMethod}
+                      setExecutionMethod={setExecutionMethod}
+                      relays={minRelays}
+                    />
+                  }
                 />
-              }
-            />
-          </Grid>
-        )}
-
-        <Grid data-testid="network-fee-section" container spacing={3}>
-          <ReviewRow
-            name="Est. network fee"
-            value={
-              <>
-                <NetworkFee totalFee={totalFee} willRelay={willRelay} chain={chain} />
-
-                {!willRelay && !isSocialLogin && (
-                  <Typography variant="body2" color="text.secondary" mt={1}>
-                    You will have to confirm a transaction with your connected wallet.
-                  </Typography>
-                )}
-              </>
-            }
-          />
-        </Grid>
-
-        {isWrongChain && <NetworkWarning />}
-
-        {!walletCanPay && !willRelay && (
-          <ErrorMessage>Your connected wallet doesn&apos;t have enough funds to execute this transaction</ErrorMessage>
-        )}
-      </Box>
+              </Grid>
+            )}
+
+            {payMethod === PayMethod.PayNow && (
+              <Grid item>
+                <Typography mt={2}>
+                  You will have to confirm a transaction and pay an estimated fee of{' '}
+                  <NetworkFee totalFee={totalFee} willRelay={willRelay} chain={chain} inline /> with your connected
+                  wallet
+                </Typography>
+              </Grid>
+            )}
+          </Box>
+        </>
+      )}
+
+      {!isCounterfactual && (
+        <>
+          <Divider />
+          <Box className={layoutCss.row} display="flex" flexDirection="column" gap={3}>
+            {canRelay && !isSocialLogin && (
+              <Grid container spacing={3}>
+                <ReviewRow
+                  name="Execution method"
+                  value={
+                    <ExecutionMethodSelector
+                      executionMethod={executionMethod}
+                      setExecutionMethod={setExecutionMethod}
+                      relays={minRelays}
+                    />
+                  }
+                />
+              </Grid>
+            )}
+
+            <Grid data-testid="network-fee-section" container spacing={3}>
+              <ReviewRow
+                name="Est. network fee"
+                value={
+                  <>
+                    <NetworkFee totalFee={totalFee} willRelay={willRelay} chain={chain} />
+
+                    {!willRelay && !isSocialLogin && (
+                      <Typography variant="body2" color="text.secondary" mt={1}>
+                        You will have to confirm a transaction with your connected wallet.
+                      </Typography>
+                    )}
+                  </>
+                }
+              />
+            </Grid>
+
+            {isWrongChain && <NetworkWarning />}
+
+            {!walletCanPay && !willRelay && (
+              <ErrorMessage>
+                Your connected wallet doesn&apos;t have enough funds to execute this transaction
+              </ErrorMessage>
+            )}
+          </Box>
+        </>
+      )}
 
       <Divider />
 
       <Box className={layoutCss.row}>
+        {submitError && <ErrorMessage className={css.errorMessage}>{submitError}</ErrorMessage>}
         <Box display="flex" flexDirection="row" justifyContent="space-between" gap={3}>
           <Button
             data-testid="back-btn"
@@ -264,7 +336,7 @@ const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps<NewSafe
             size="stretched"
             disabled={isDisabled}
           >
-            Next
+            Create
           </Button>
         </Box>
       </Box>
diff --git a/src/components/new-safe/create/steps/ReviewStep/styles.module.css b/src/components/new-safe/create/steps/ReviewStep/styles.module.css
index 05cff69a60..9b87174229 100644
--- a/src/components/new-safe/create/steps/ReviewStep/styles.module.css
+++ b/src/components/new-safe/create/steps/ReviewStep/styles.module.css
@@ -9,3 +9,20 @@
   text-decoration: line-through;
   color: var(--color-text-secondary);
 }
+
+.errorMessage {
+  margin-top: 0;
+}
+
+.networkFee {
+  padding: var(--space-1);
+  background-color: var(--color-secondary-background);
+  color: var(--color-static-main);
+  width: fit-content;
+  border-radius: 6px;
+}
+
+.networkFeeInline {
+  padding: 2px 4px;
+  display: inline-flex;
+}
diff --git a/src/components/safe-apps/AddCustomAppModal/index.tsx b/src/components/safe-apps/AddCustomAppModal/index.tsx
index c32fce32cf..eeae0cc239 100644
--- a/src/components/safe-apps/AddCustomAppModal/index.tsx
+++ b/src/components/safe-apps/AddCustomAppModal/index.tsx
@@ -45,7 +45,7 @@ type CustomAppFormData = {
   safeApp: SafeAppData
 }
 
-const HELP_LINK = 'https://docs.safe.global/safe-core-aa-sdk/safe-apps/get-started'
+const HELP_LINK = 'https://docs.safe.global/apps-sdk-overview'
 const APP_ALREADY_IN_THE_LIST_ERROR = 'This Safe App is already in the list'
 const MANIFEST_ERROR = "The app doesn't support Safe App functionality"
 const INVALID_URL_ERROR = 'The url is invalid'
diff --git a/src/components/safe-apps/AppFrame/index.tsx b/src/components/safe-apps/AppFrame/index.tsx
index 8b59b5b613..3b07088f25 100644
--- a/src/components/safe-apps/AppFrame/index.tsx
+++ b/src/components/safe-apps/AppFrame/index.tsx
@@ -1,3 +1,4 @@
+import useBalances from '@/hooks/useBalances'
 import { useContext, useState } from 'react'
 import type { ReactElement } from 'react'
 import { useMemo } from 'react'
@@ -72,6 +73,7 @@ const AppFrame = ({ appUrl, allowedFeaturesList, safeAppFromManifest }: AppFrame
 
   const addressBook = useAddressBook()
   const chain = useCurrentChain()
+  const { balances } = useBalances()
   const router = useRouter()
   const {
     expanded: queueBarExpanded,
@@ -164,10 +166,13 @@ const AppFrame = ({ appUrl, allowedFeaturesList, safeAppFromManifest }: AppFrame
     onGetSafeInfo: useGetSafeInfo(),
     onGetSafeBalances: (currency) => {
       const isDefaultTokenlistSupported = chain && hasFeature(chain, FEATURES.DEFAULT_TOKENLIST)
-      return getBalances(chainId, safeAddress, currency, {
-        exclude_spam: true,
-        trusted: isDefaultTokenlistSupported && TOKEN_LISTS.TRUSTED === tokenlist,
-      })
+
+      return safe.deployed
+        ? getBalances(chainId, safeAddress, currency, {
+            exclude_spam: true,
+            trusted: isDefaultTokenlistSupported && TOKEN_LISTS.TRUSTED === tokenlist,
+          })
+        : Promise.resolve(balances)
     },
     onGetChainInfo: () => {
       if (!chain) return
diff --git a/src/components/safe-apps/AppFrame/useAppCommunicator.ts b/src/components/safe-apps/AppFrame/useAppCommunicator.ts
index df36131719..e87a09472f 100644
--- a/src/components/safe-apps/AppFrame/useAppCommunicator.ts
+++ b/src/components/safe-apps/AppFrame/useAppCommunicator.ts
@@ -28,11 +28,11 @@ import type { Permission, PermissionRequest } from '@safe-global/safe-apps-sdk/d
 import type { SafeSettings } from '@safe-global/safe-apps-sdk'
 import AppCommunicator from '@/services/safe-apps/AppCommunicator'
 import { Errors, logError } from '@/services/exceptions'
-import { createSafeAppsWeb3Provider } from '@/hooks/wallets/web3'
 import type { SafePermissionsRequest } from '@/hooks/safe-apps/permissions'
 import { SAFE_APPS_EVENTS, trackSafeAppEvent } from '@/services/analytics'
 import { useAppSelector } from '@/store'
 import { selectRpc } from '@/store/settingsSlice'
+import { createSafeAppsWeb3Provider } from '@/hooks/wallets/web3'
 
 export enum CommunicatorMessages {
   REJECT_TRANSACTION_MESSAGE = 'Transaction was rejected',
@@ -79,7 +79,7 @@ const useAppCommunicator = (
       return
     }
 
-    return createSafeAppsWeb3Provider(chain.rpcUri, customRpc?.[chain.chainId])
+    return createSafeAppsWeb3Provider(chain, customRpc?.[chain.chainId])
   }, [chain, customRpc])
 
   useEffect(() => {
diff --git a/src/components/settings/DataManagement/index.tsx b/src/components/settings/DataManagement/index.tsx
index 2547c5e8d0..02e45a3e46 100644
--- a/src/components/settings/DataManagement/index.tsx
+++ b/src/components/settings/DataManagement/index.tsx
@@ -8,8 +8,6 @@ import { addressBookSlice, selectAllAddressBooks } from '@/store/addressBookSlic
 import { addedSafesSlice, selectAllAddedSafes } from '@/store/addedSafesSlice'
 import { safeAppsSlice, selectSafeApps } from '@/store/safeAppsSlice'
 import { selectSettings, settingsSlice } from '@/store/settingsSlice'
-import InfoIcon from '@/public/images/notifications/info.svg'
-import ExternalLink from '@/components/common/ExternalLink'
 import { ImportFileUpload } from '@/components/settings/DataManagement/ImportFileUpload'
 import { ImportDialog } from '@/components/settings/DataManagement/ImportDialog'
 import { SAFE_EXPORT_VERSION } from '@/components/settings/DataManagement/useGlobalImportFileParser'
@@ -98,20 +96,6 @@ const DataManagement = () => {
               settings={settings}
               safeApps={safeApps}
             />
-            <Typography>
-              <SvgIcon
-                component={InfoIcon}
-                inheritViewBox
-                fontSize="small"
-                color="border"
-                sx={{
-                  verticalAlign: 'middle',
-                  mr: 0.5,
-                }}
-              />
-              You can also export your data from the{' '}
-              <ExternalLink href="https://gnosis-safe.io/app/export">old app</ExternalLink>
-            </Typography>
           </Grid>
         </Grid>
       </Paper>
diff --git a/src/components/settings/PushNotifications/PushNotificationsBanner/PushNotificationsBanner.test.tsx b/src/components/settings/PushNotifications/PushNotificationsBanner/PushNotificationsBanner.test.tsx
index 448c997e01..d48d520c6c 100644
--- a/src/components/settings/PushNotifications/PushNotificationsBanner/PushNotificationsBanner.test.tsx
+++ b/src/components/settings/PushNotifications/PushNotificationsBanner/PushNotificationsBanner.test.tsx
@@ -1,9 +1,10 @@
 import 'fake-indexeddb/auto'
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { toBeHex } from 'ethers'
 import * as tracking from '@/services/analytics'
 import { set } from 'idb-keyval'
 import * as navigation from 'next/navigation'
-import type { ChainInfo, SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
+import type { ChainInfo } from '@safe-global/safe-gateway-typescript-sdk'
 
 import { PushNotificationsBanner, _getSafesToRegister } from '.'
 import { createPushNotificationPrefsIndexedDb } from '@/services/push-notifications/preferences'
@@ -95,6 +96,14 @@ describe('PushNotificationsBanner', () => {
   })
 
   describe('PushNotificationsBanner', () => {
+    const extendedSafeInfo = {
+      ...extendedSafeInfoBuilder().build(),
+      chainId: '1',
+      address: {
+        value: toBeHex('0x123', 20),
+      },
+    }
+
     beforeEach(() => {
       // Reset indexedDB
       indexedDB = new IDBFactory()
@@ -140,12 +149,7 @@ describe('PushNotificationsBanner', () => {
           safeInfo: {
             loading: false,
             error: undefined,
-            data: {
-              chainId: '1',
-              address: {
-                value: toBeHex('0x123', 20),
-              },
-            } as unknown as SafeInfo,
+            data: extendedSafeInfo,
           },
         },
       })
@@ -187,12 +191,7 @@ describe('PushNotificationsBanner', () => {
             safeInfo: {
               loading: false,
               error: undefined,
-              data: {
-                chainId: '1',
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-              } as unknown as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
@@ -233,12 +232,7 @@ describe('PushNotificationsBanner', () => {
             safeInfo: {
               loading: false,
               error: undefined,
-              data: {
-                chainId: '1',
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-              } as unknown as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
@@ -277,12 +271,7 @@ describe('PushNotificationsBanner', () => {
             safeInfo: {
               loading: false,
               error: undefined,
-              data: {
-                chainId: '1',
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-              } as unknown as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
@@ -317,12 +306,7 @@ describe('PushNotificationsBanner', () => {
             safeInfo: {
               loading: false,
               error: undefined,
-              data: {
-                chainId: '1',
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-              } as unknown as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
@@ -366,12 +350,7 @@ describe('PushNotificationsBanner', () => {
             safeInfo: {
               loading: false,
               error: undefined,
-              data: {
-                chainId: '1',
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-              } as unknown as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
diff --git a/src/components/settings/SafeModules/__tests__/SafeModules.test.tsx b/src/components/settings/SafeModules/__tests__/SafeModules.test.tsx
index f0204108a6..f68dafe367 100644
--- a/src/components/settings/SafeModules/__tests__/SafeModules.test.tsx
+++ b/src/components/settings/SafeModules/__tests__/SafeModules.test.tsx
@@ -1,19 +1,18 @@
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { render, waitFor } from '@/tests/test-utils'
 import * as useSafeInfoHook from '@/hooks/useSafeInfo'
 import SafeModules from '..'
-import type { AddressEx, SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import { zeroPadValue } from 'ethers'
 
 const MOCK_MODULE_1 = zeroPadValue('0x01', 20)
 const MOCK_MODULE_2 = zeroPadValue('0x02', 20)
 
 describe('SafeModules', () => {
+  const extendedSafeInfo = extendedSafeInfoBuilder().build()
+
   it('should render placeholder label without any modules', async () => {
     jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
-      safe: {
-        modules: [] as AddressEx[],
-        chainId: '4',
-      } as SafeInfo,
+      safe: extendedSafeInfo,
       safeAddress: '0x123',
       safeError: undefined,
       safeLoading: false,
@@ -26,7 +25,7 @@ describe('SafeModules', () => {
 
   it('should render placeholder label if safe is loading', async () => {
     jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
-      safe: {} as SafeInfo,
+      safe: extendedSafeInfo,
       safeAddress: '',
       safeError: undefined,
       safeLoading: true,
@@ -39,6 +38,7 @@ describe('SafeModules', () => {
   it('should render module addresses for defined modules', async () => {
     jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
       safe: {
+        ...extendedSafeInfo,
         modules: [
           {
             value: MOCK_MODULE_1,
@@ -47,8 +47,7 @@ describe('SafeModules', () => {
             value: MOCK_MODULE_2,
           },
         ],
-        chainId: '4',
-      } as SafeInfo,
+      },
       safeAddress: '0x123',
       safeError: undefined,
       safeLoading: false,
diff --git a/src/components/settings/TransactionGuards/__tests__/TransactionGuards.test.tsx b/src/components/settings/TransactionGuards/__tests__/TransactionGuards.test.tsx
index 15e7b4b0b0..b318020784 100644
--- a/src/components/settings/TransactionGuards/__tests__/TransactionGuards.test.tsx
+++ b/src/components/settings/TransactionGuards/__tests__/TransactionGuards.test.tsx
@@ -1,6 +1,6 @@
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { render, waitFor } from '@/tests/test-utils'
 import * as useSafeInfoHook from '@/hooks/useSafeInfo'
-import type { SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import { zeroPadValue } from 'ethers'
 import TransactionGuards from '..'
 
@@ -8,13 +8,11 @@ const MOCK_GUARD = zeroPadValue('0x01', 20)
 const EMPTY_LABEL = 'No transaction guard set'
 
 describe('TransactionGuards', () => {
+  const extendedSafeInfo = extendedSafeInfoBuilder().build()
+
   it('should render placeholder label without an tx guard', async () => {
     jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
-      safe: {
-        guard: null,
-        chainId: '4',
-        version: '1.3.0',
-      } as any as SafeInfo,
+      safe: extendedSafeInfo,
       safeAddress: '0x123',
       safeError: undefined,
       safeLoading: false,
@@ -27,7 +25,7 @@ describe('TransactionGuards', () => {
 
   it('should render null if safe is loading', async () => {
     jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
-      safe: {} as SafeInfo,
+      safe: extendedSafeInfo,
       safeAddress: '',
       safeError: undefined,
       safeLoading: true,
@@ -41,10 +39,11 @@ describe('TransactionGuards', () => {
   it('should render null if safe version < 1.3.0', async () => {
     jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
       safe: {
+        ...extendedSafeInfo,
         guard: null,
         chainId: '4',
         version: '1.2.0',
-      } as any as SafeInfo,
+      },
       safeAddress: '0x123',
       safeError: undefined,
       safeLoading: false,
@@ -58,12 +57,11 @@ describe('TransactionGuards', () => {
   it('should render tx guard address if defined', async () => {
     jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
       safe: {
+        ...extendedSafeInfo,
         guard: {
           value: MOCK_GUARD,
         },
-        chainId: '4',
-        version: '1.3.0',
-      } as SafeInfo,
+      },
       safeAddress: '0x123',
       safeError: undefined,
       safeLoading: false,
diff --git a/src/components/sidebar/PendingActions/index.tsx b/src/components/sidebar/PendingActions/index.tsx
index 425d91a6b7..54f19e4452 100644
--- a/src/components/sidebar/PendingActions/index.tsx
+++ b/src/components/sidebar/PendingActions/index.tsx
@@ -45,6 +45,7 @@ const PendingActionButtons = ({
           <NextLink href={queueLink} passHref legacyBehavior>
             <Tooltip title={`${shortAddress} can confirm ${totalToSign} transaction(s)`} placement="top" arrow>
               <ButtonBase
+                data-testid="missing-signature-info"
                 className={classnames(css.pendingButton, css.missingSignatures)}
                 onClick={closeDrawer}
                 sx={{
@@ -65,6 +66,7 @@ const PendingActionButtons = ({
           <NextLink href={queueLink} passHref legacyBehavior>
             <Tooltip title={`${totalQueued} transactions in the queue`} placement="top" arrow>
               <ButtonBase
+                data-testid="queued-tx-info"
                 className={classnames(css.pendingButton, css.queued)}
                 onClick={closeDrawer}
                 sx={{
diff --git a/src/components/sidebar/Sidebar/index.tsx b/src/components/sidebar/Sidebar/index.tsx
index e6d0128553..d34dfa39c7 100644
--- a/src/components/sidebar/Sidebar/index.tsx
+++ b/src/components/sidebar/Sidebar/index.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useState, type ReactElement } from 'react'
-import { Box, Divider, Drawer, IconButton } from '@mui/material'
+import { Box, Divider, Drawer } from '@mui/material'
 import ChevronRight from '@mui/icons-material/ChevronRight'
 
 import ChainIndicator from '@/components/common/ChainIndicator'
@@ -31,9 +31,9 @@ const Sidebar = (): ReactElement => {
         <ChainIndicator showLogo={false} />
 
         {/* Open the safes list */}
-        <IconButton data-testid="open-safes-icon" className={css.drawerButton} onClick={onDrawerToggle}>
+        <button data-testid="open-safes-icon" className={css.drawerButton} onClick={onDrawerToggle}>
           <ChevronRight />
-        </IconButton>
+        </button>
 
         {/* Address, balance, copy button, etc */}
         <SidebarHeader />
diff --git a/src/components/sidebar/Sidebar/styles.module.css b/src/components/sidebar/Sidebar/styles.module.css
index fc200c3691..f5f3013f33 100644
--- a/src/components/sidebar/Sidebar/styles.module.css
+++ b/src/components/sidebar/Sidebar/styles.module.css
@@ -46,6 +46,8 @@
 .drawerButton {
   position: absolute !important;
   z-index: 2;
+  color: var(--color-text-primary);
+  padding: 8px 0;
   right: 0;
   transform: translateX(50%);
   margin-top: 54px;
diff --git a/src/components/transactions/SingleTx/SingleTx.test.tsx b/src/components/transactions/SingleTx/SingleTx.test.tsx
index eca17836e4..467f2805d8 100644
--- a/src/components/transactions/SingleTx/SingleTx.test.tsx
+++ b/src/components/transactions/SingleTx/SingleTx.test.tsx
@@ -1,7 +1,10 @@
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { fireEvent, render } from '@/tests/test-utils'
 import SingleTx from '@/pages/transactions/tx'
 import * as useSafeInfo from '@/hooks/useSafeInfo'
-import type { SafeInfo, TransactionDetails } from '@safe-global/safe-gateway-typescript-sdk'
+import * as gatewaySDK from '@safe-global/safe-gateway-typescript-sdk'
+import type { TransactionDetails } from '@safe-global/safe-gateway-typescript-sdk'
+import { waitFor } from '@testing-library/react'
 
 const MOCK_SAFE_ADDRESS = '0x0000000000000000000000000000000000005AFE'
 const SAFE_ADDRESS = '0x87a57cBf742CC1Fc702D0E9BF595b1E056693e2f'
@@ -30,23 +33,27 @@ jest.mock('next/router', () => ({
   },
 }))
 
-jest.mock('@safe-global/safe-gateway-typescript-sdk', () => ({
-  ...jest.requireActual('@safe-global/safe-gateway-typescript-sdk'),
-  getTransactionDetails: jest.fn(() => Promise.resolve(txDetails)),
-}))
+const extendedSafeInfo = extendedSafeInfoBuilder().build()
 
 jest.spyOn(useSafeInfo, 'default').mockImplementation(() => ({
   safeAddress: SAFE_ADDRESS,
   safe: {
+    ...extendedSafeInfo,
     chainId: '5',
-  } as SafeInfo,
+  },
   safeError: undefined,
   safeLoading: false,
   safeLoaded: true,
 }))
 
 describe('SingleTx', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
   it('renders <SingleTx />', async () => {
+    jest.spyOn(gatewaySDK, 'getTransactionDetails').mockImplementation(() => Promise.resolve(txDetails))
+
     const screen = render(<SingleTx />)
 
     const button = screen.queryByText('Details')
@@ -56,28 +63,22 @@ describe('SingleTx', () => {
   })
 
   it('shows an error when the transaction has failed to load', async () => {
-    const getTransactionDetails = jest.spyOn(
-      require('@safe-global/safe-gateway-typescript-sdk'),
-      'getTransactionDetails',
-    )
-    getTransactionDetails.mockImplementation(() => Promise.reject(new Error('Server error')))
+    jest.spyOn(gatewaySDK, 'getTransactionDetails').mockImplementation(() => Promise.reject(new Error('Server error')))
 
     const screen = render(<SingleTx />)
 
-    expect(await screen.findByText('Failed to load transaction')).toBeInTheDocument()
+    await waitFor(() => {
+      expect(screen.getByText('Failed to load transaction')).toBeInTheDocument()
+    })
 
-    const button = screen.getByText('Details')
-    fireEvent.click(button!)
-
-    expect(screen.getByText('Server error')).toBeInTheDocument()
+    await waitFor(() => {
+      fireEvent.click(screen.getByText('Details'))
+      expect(screen.getByText('Server error')).toBeInTheDocument()
+    })
   })
 
   it('shows an error when transaction is not from the opened Safe', async () => {
-    const getTransactionDetails = jest.spyOn(
-      require('@safe-global/safe-gateway-typescript-sdk'),
-      'getTransactionDetails',
-    )
-    getTransactionDetails.mockImplementation(() =>
+    jest.spyOn(gatewaySDK, 'getTransactionDetails').mockImplementation(() =>
       Promise.resolve({
         ...txDetails,
         safeAddress: MOCK_SAFE_ADDRESS,
@@ -86,11 +87,14 @@ describe('SingleTx', () => {
 
     const screen = render(<SingleTx />)
 
-    expect(await screen.findByText('Failed to load transaction')).toBeInTheDocument()
+    await waitFor(() => {
+      expect(screen.getByText('Failed to load transaction')).toBeInTheDocument()
+    })
 
-    const button = screen.getByText('Details')
-    fireEvent.click(button!)
+    fireEvent.click(screen.getByText('Details'))
 
-    expect(screen.getByText('Transaction with this id was not found in this Safe Account')).toBeInTheDocument()
+    await waitFor(() => {
+      expect(screen.getByText('Transaction with this id was not found in this Safe Account')).toBeInTheDocument()
+    })
   })
 })
diff --git a/src/components/tx-flow/common/TxLayout/index.tsx b/src/components/tx-flow/common/TxLayout/index.tsx
index eda536aa11..f51a98fdd1 100644
--- a/src/components/tx-flow/common/TxLayout/index.tsx
+++ b/src/components/tx-flow/common/TxLayout/index.tsx
@@ -1,3 +1,4 @@
+import useSafeInfo from '@/hooks/useSafeInfo'
 import { type ComponentType, type ReactElement, type ReactNode, useContext, useEffect, useState } from 'react'
 import { Box, Container, Grid, Typography, Button, Paper, SvgIcon, IconButton, useMediaQuery } from '@mui/material'
 import { useTheme } from '@mui/material/styles'
@@ -23,6 +24,7 @@ const TxLayoutHeader = ({
   icon: TxLayoutProps['icon']
   subtitle: TxLayoutProps['subtitle']
 }) => {
+  const { safe } = useSafeInfo()
   const { nonceNeeded } = useContext(SafeTxContext)
 
   if (hideNonce && !icon && !subtitle) return null
@@ -41,7 +43,7 @@ const TxLayoutHeader = ({
         </Typography>
       </Box>
 
-      {!hideNonce && nonceNeeded && <TxNonce />}
+      {!hideNonce && safe.deployed && nonceNeeded && <TxNonce />}
     </Box>
   )
 }
diff --git a/src/components/tx-flow/flows/AddOwner/ReviewOwner.tsx b/src/components/tx-flow/flows/AddOwner/ReviewOwner.tsx
index 464d2bf570..2c802bbbb2 100644
--- a/src/components/tx-flow/flows/AddOwner/ReviewOwner.tsx
+++ b/src/components/tx-flow/flows/AddOwner/ReviewOwner.tsx
@@ -1,3 +1,4 @@
+import { useCurrentChain } from '@/hooks/useChains'
 import { useContext, useEffect } from 'react'
 import { Typography, Divider, Box, SvgIcon, Paper } from '@mui/material'
 
@@ -20,21 +21,24 @@ export const ReviewOwner = ({ params }: { params: AddOwnerFlowProps | ReplaceOwn
   const { setSafeTx, setSafeTxError } = useContext(SafeTxContext)
   const { safe } = useSafeInfo()
   const { chainId } = safe
+  const chain = useCurrentChain()
   const { newOwner, removedOwner, threshold } = params
 
   useEffect(() => {
+    if (!chain) return
+
     const promise = removedOwner
-      ? createSwapOwnerTx({
+      ? createSwapOwnerTx(chain, safe.deployed, {
           newOwnerAddress: newOwner.address,
           oldOwnerAddress: removedOwner.address,
         })
-      : createAddOwnerTx({
+      : createAddOwnerTx(chain, safe.deployed, {
           ownerAddress: newOwner.address,
           threshold,
         })
 
     promise.then(setSafeTx).catch(setSafeTxError)
-  }, [removedOwner, newOwner, threshold, setSafeTx, setSafeTxError])
+  }, [removedOwner, newOwner, threshold, setSafeTx, setSafeTxError, chain, safe.deployed])
 
   const addAddressBookEntryAndSubmit = () => {
     if (typeof newOwner.name !== 'undefined') {
diff --git a/src/components/tx-flow/flows/NftTransfer/SendNftBatch.tsx b/src/components/tx-flow/flows/NftTransfer/SendNftBatch.tsx
index f60583c5e7..9f2bb7977c 100644
--- a/src/components/tx-flow/flows/NftTransfer/SendNftBatch.tsx
+++ b/src/components/tx-flow/flows/NftTransfer/SendNftBatch.tsx
@@ -113,7 +113,7 @@ const SendNftBatch = ({ params, onSubmit }: SendNftBatchProps) => {
       <FormProvider {...formMethods}>
         <form onSubmit={handleSubmit(onFormSubmit)}>
           <FormControl fullWidth sx={{ mb: 3, mt: 1 }}>
-            <AddressBookInput name={Field.recipient} label="Recipient address or ENS" canAdd={isAddressValid} />
+            <AddressBookInput name={Field.recipient} canAdd={isAddressValid} />
           </FormControl>
 
           <Typography data-testid="selected-nfts" variant="body2" color="text.secondary" mb={2}>
diff --git a/src/components/tx-flow/flows/SignMessage/SignMessage.test.tsx b/src/components/tx-flow/flows/SignMessage/SignMessage.test.tsx
index 1d93175fca..c1098a8e54 100644
--- a/src/components/tx-flow/flows/SignMessage/SignMessage.test.tsx
+++ b/src/components/tx-flow/flows/SignMessage/SignMessage.test.tsx
@@ -1,3 +1,4 @@
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { hexlify, zeroPadValue, toUtf8Bytes } from 'ethers'
 import type { SafeInfo, SafeMessage, SafeMessageListPage } from '@safe-global/safe-gateway-typescript-sdk'
 import { SafeMessageListItemType } from '@safe-global/safe-gateway-typescript-sdk'
@@ -90,19 +91,21 @@ describe('SignMessage', () => {
   })
 
   const mockUseSafeMessages = useSafeMessages as jest.Mock
+  const extendedSafeInfo = {
+    ...extendedSafeInfoBuilder().build(),
+    version: '1.3.0',
+    address: {
+      value: zeroPadValue('0x01', 20),
+    },
+    chainId: '5',
+    threshold: 2,
+  }
 
   beforeEach(() => {
     jest.clearAllMocks()
 
     jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
-      safe: {
-        version: '1.3.0',
-        address: {
-          value: zeroPadValue('0x01', 20),
-        },
-        chainId: '5',
-        threshold: 2,
-      } as SafeInfo,
+      safe: extendedSafeInfo,
       safeAddress: zeroPadValue('0x01', 20),
       safeError: undefined,
       safeLoading: false,
@@ -255,16 +258,10 @@ describe('SignMessage', () => {
 
     expect(proposalSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        safe: {
-          version: '1.3.0',
-          address: {
-            value: zeroPadValue('0x01', 20),
-          },
-          chainId: '5',
-          threshold: 2,
-        } as SafeInfo,
+        safe: extendedSafeInfo,
         message: 'Hello world!',
         safeAppId: 25,
+        //onboard: expect.anything(),
       }),
     )
 
@@ -363,15 +360,9 @@ describe('SignMessage', () => {
 
     expect(confirmationSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        safe: {
-          version: '1.3.0',
-          address: {
-            value: zeroPadValue('0x01', 20),
-          },
-          chainId: '5',
-          threshold: 2,
-        } as SafeInfo,
+        safe: extendedSafeInfo,
         message: 'Hello world!',
+        onboard: expect.anything(),
       }),
     )
 
diff --git a/src/components/tx-flow/flows/TokenTransfer/CreateTokenTransfer.tsx b/src/components/tx-flow/flows/TokenTransfer/CreateTokenTransfer.tsx
index f312db8aaf..6900b3c3ed 100644
--- a/src/components/tx-flow/flows/TokenTransfer/CreateTokenTransfer.tsx
+++ b/src/components/tx-flow/flows/TokenTransfer/CreateTokenTransfer.tsx
@@ -103,11 +103,7 @@ export const CreateTokenTransfer = ({
       <FormProvider {...formMethods}>
         <form onSubmit={handleSubmit(onSubmit)} className={commonCss.form}>
           <FormControl fullWidth sx={{ mt: 1 }}>
-            <AddressBookInput
-              name={TokenTransferFields.recipient}
-              label="Recipient address or ENS"
-              canAdd={isAddressValid}
-            />
+            <AddressBookInput name={TokenTransferFields.recipient} canAdd={isAddressValid} />
           </FormControl>
 
           <TokenAmountInput balances={balancesItems} selectedToken={selectedToken} maxAmount={maxAmount} />
diff --git a/src/components/tx-flow/flows/TokenTransfer/__tests__/CreateTokenTransfer.test.tsx b/src/components/tx-flow/flows/TokenTransfer/__tests__/CreateTokenTransfer.test.tsx
index af351c4fa9..01c52de3bd 100644
--- a/src/components/tx-flow/flows/TokenTransfer/__tests__/CreateTokenTransfer.test.tsx
+++ b/src/components/tx-flow/flows/TokenTransfer/__tests__/CreateTokenTransfer.test.tsx
@@ -29,7 +29,7 @@ describe('CreateTokenTransfer', () => {
       <CreateTokenTransfer params={mockParams} onSubmit={jest.fn()} isSafeTokenPaused={true} />,
     )
 
-    expect(getAllByText('Recipient address or ENS')[0]).toBeInTheDocument()
+    expect(getAllByText('Recipient address')[0]).toBeInTheDocument()
   })
 
   it('should disable the submit button and display a warning if $SAFE token is selected and not transferable', () => {
diff --git a/src/components/tx/ErrorMessage/index.tsx b/src/components/tx/ErrorMessage/index.tsx
index bbae5fc712..2f16b760cb 100644
--- a/src/components/tx/ErrorMessage/index.tsx
+++ b/src/components/tx/ErrorMessage/index.tsx
@@ -24,7 +24,7 @@ const ErrorMessage = ({
   }
 
   return (
-    <div className={classNames(css.container, css[level], className, 'errorMessage')}>
+    <div data-testid="error-message" className={classNames(css.container, css[level], className, 'errorMessage')}>
       <div className={css.message}>
         <SvgIcon
           component={level === 'info' ? InfoIcon : WarningIcon}
diff --git a/src/components/tx/GasParams/GasParams.test.tsx b/src/components/tx/GasParams/GasParams.test.tsx
index 9e4ca9b461..3d6178ef0d 100644
--- a/src/components/tx/GasParams/GasParams.test.tsx
+++ b/src/components/tx/GasParams/GasParams.test.tsx
@@ -65,7 +65,7 @@ describe('GasParams', () => {
     )
 
     expect(getByText('Estimated fee')).toBeInTheDocument()
-    expect(getByText('0.21 SepoliaETH')).toBeInTheDocument()
+    expect(getByText('0.42 SepoliaETH')).toBeInTheDocument()
   })
 
   it("Doesn't show an estimated fee if there is no gasLimit", () => {
diff --git a/src/components/tx/GasParams/index.tsx b/src/components/tx/GasParams/index.tsx
index d223e30376..ce527316ea 100644
--- a/src/components/tx/GasParams/index.tsx
+++ b/src/components/tx/GasParams/index.tsx
@@ -1,3 +1,4 @@
+import { getTotalFee } from '@/hooks/useGasPrice'
 import type { ReactElement, SyntheticEvent } from 'react'
 import { Accordion, AccordionDetails, AccordionSummary, Skeleton, Typography, Link, Grid } from '@mui/material'
 import type { ChainInfo } from '@safe-global/safe-gateway-typescript-sdk'
@@ -51,8 +52,9 @@ export const _GasParams = ({
   const isError = gasLimitError && !gasLimit
 
   // Total gas cost
-  // TODO: Check how to use getTotalFee here
-  const totalFee = !isLoading ? formatVisualAmount(maxFeePerGas * gasLimit, chain?.nativeCurrency.decimals) : '> 0.001'
+  const totalFee = !isLoading
+    ? formatVisualAmount(getTotalFee(maxFeePerGas, maxPriorityFeePerGas, gasLimit), chain?.nativeCurrency.decimals)
+    : '> 0.001'
 
   // Individual gas params
   const gasLimitString = gasLimit?.toString() || ''
diff --git a/src/components/tx/SignOrExecuteForm/hooks.test.ts b/src/components/tx/SignOrExecuteForm/hooks.test.ts
index b2ede6cbb6..356c8240de 100644
--- a/src/components/tx/SignOrExecuteForm/hooks.test.ts
+++ b/src/components/tx/SignOrExecuteForm/hooks.test.ts
@@ -1,7 +1,7 @@
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { renderHook } from '@/tests/test-utils'
 import { zeroPadValue } from 'ethers'
 import { createSafeTx } from '@/tests/builders/safeTx'
-import type { SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import { type ConnectedWallet } from '@/hooks/wallets/useOnboard'
 import * as useSafeInfoHook from '@/hooks/useSafeInfo'
 import * as wallet from '@/hooks/wallets/useWallet'
@@ -13,6 +13,8 @@ import { type OnboardAPI } from '@web3-onboard/core'
 import { useAlreadySigned, useImmediatelyExecutable, useIsExecutionLoop, useTxActions, useValidateNonce } from './hooks'
 
 describe('SignOrExecute hooks', () => {
+  const extendedSafeInfo = extendedSafeInfoBuilder().build()
+
   beforeEach(() => {
     jest.clearAllMocks()
 
@@ -45,13 +47,14 @@ describe('SignOrExecute hooks', () => {
     it('should return true if nonce is correct', () => {
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: zeroPadValue('0x0000', 20),
         safeError: undefined,
         safeLoading: false,
@@ -66,13 +69,14 @@ describe('SignOrExecute hooks', () => {
     it('should return false if nonce is incorrect', () => {
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 90,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: zeroPadValue('0x0000', 20),
         safeError: undefined,
         safeLoading: false,
@@ -92,12 +96,13 @@ describe('SignOrExecute hooks', () => {
       jest.spyOn(useSafeInfoHook, 'default').mockReturnValue({
         safeAddress: address,
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: address },
           owners: [{ value: address }],
           nonce: 100,
           chainId: '1',
-        } as SafeInfo,
+        },
         safeLoaded: true,
         safeLoading: false,
         safeError: undefined,
@@ -132,12 +137,13 @@ describe('SignOrExecute hooks', () => {
       jest.spyOn(useSafeInfoHook, 'default').mockReturnValue({
         safeAddress: zeroPadValue('0x0000', 20),
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           owners: [{ value: zeroPadValue('0x0123', 20) }],
           threshold: 1,
           nonce: 100,
-        } as SafeInfo,
+        },
         safeLoaded: true,
         safeLoading: false,
         safeError: undefined,
@@ -154,13 +160,14 @@ describe('SignOrExecute hooks', () => {
       jest.spyOn(useSafeInfoHook, 'default').mockReturnValue({
         safeAddress: zeroPadValue('0x0000', 20),
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           owners: [{ value: zeroPadValue('0x0123', 20) }],
           threshold: 2,
           nonce: 100,
           chainId: '1',
-        } as SafeInfo,
+        },
         safeLoaded: true,
         safeLoading: false,
         safeError: undefined,
@@ -177,13 +184,14 @@ describe('SignOrExecute hooks', () => {
       jest.spyOn(useSafeInfoHook, 'default').mockReturnValue({
         safeAddress: zeroPadValue('0x0000', 20),
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           owners: [{ value: zeroPadValue('0x0123', 20) }],
           threshold: 1,
           nonce: 100,
           chainId: '1',
-        } as SafeInfo,
+        },
         safeLoaded: true,
         safeLoading: false,
         safeError: undefined,
@@ -201,13 +209,14 @@ describe('SignOrExecute hooks', () => {
     it('should return sign and execute actions', () => {
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: '0x123',
         safeError: undefined,
         safeLoading: false,
@@ -225,13 +234,14 @@ describe('SignOrExecute hooks', () => {
 
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: '0x123',
         safeError: undefined,
         safeLoading: false,
@@ -266,13 +276,14 @@ describe('SignOrExecute hooks', () => {
 
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: '0x123',
         safeError: undefined,
         safeLoading: false,
@@ -295,13 +306,14 @@ describe('SignOrExecute hooks', () => {
     it('should execute a tx without a txId (immediate execution)', async () => {
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: '0x123',
         safeError: undefined,
         safeLoading: false,
@@ -327,13 +339,14 @@ describe('SignOrExecute hooks', () => {
     it('should execute a tx with an id (existing tx)', async () => {
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: '0x123',
         safeError: undefined,
         safeLoading: false,
@@ -359,13 +372,14 @@ describe('SignOrExecute hooks', () => {
     it('should throw an error if the tx is undefined', async () => {
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: '0x123',
         safeError: undefined,
         safeLoading: false,
@@ -383,13 +397,15 @@ describe('SignOrExecute hooks', () => {
     it('should relay a tx execution', async () => {
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
+          ...extendedSafeInfoBuilder().build(),
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 1,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: '0x123',
         safeError: undefined,
         safeLoading: false,
@@ -410,6 +426,7 @@ describe('SignOrExecute hooks', () => {
         data: '0x0001',
         staticPart: () => '',
         dynamicPart: () => '',
+        isContractSignature: false,
       })
 
       const id = await executeTx({ gasPrice: 1 }, tx, '123', 'origin.com', true)
@@ -423,13 +440,15 @@ describe('SignOrExecute hooks', () => {
 
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
+          ...extendedSafeInfoBuilder().build(),
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: '0x123',
         safeError: undefined,
         safeLoading: false,
@@ -442,6 +461,7 @@ describe('SignOrExecute hooks', () => {
         data: '0x0001',
         staticPart: () => '',
         dynamicPart: () => '',
+        isContractSignature: false,
       })
 
       const proposeSpy = jest
@@ -453,6 +473,7 @@ describe('SignOrExecute hooks', () => {
           data: '0x0001',
           staticPart: () => '',
           dynamicPart: () => '',
+          isContractSignature: false,
         })
         return Promise.resolve(tx)
       })
@@ -473,13 +494,15 @@ describe('SignOrExecute hooks', () => {
 
       jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
         safe: {
+          ...extendedSafeInfo,
+          ...extendedSafeInfoBuilder().build(),
           version: '1.3.0',
           address: { value: zeroPadValue('0x0000', 20) },
           nonce: 100,
           threshold: 2,
           owners: [{ value: zeroPadValue('0x0123', 20) }, { value: zeroPadValue('0x0456', 20) }],
           chainId: '1',
-        } as SafeInfo,
+        },
         safeAddress: '0x123',
         safeError: undefined,
         safeLoading: false,
@@ -492,6 +515,7 @@ describe('SignOrExecute hooks', () => {
         data: '0x0001',
         staticPart: () => '',
         dynamicPart: () => '',
+        isContractSignature: false,
       })
 
       const proposeSpy = jest
@@ -503,6 +527,7 @@ describe('SignOrExecute hooks', () => {
           data: '0x0001',
           staticPart: () => '',
           dynamicPart: () => '',
+          isContractSignature: false,
         })
         return Promise.resolve(tx)
       })
@@ -535,6 +560,7 @@ describe('SignOrExecute hooks', () => {
         data: '0x0001',
         staticPart: () => '',
         dynamicPart: () => '',
+        isContractSignature: false,
       })
       const { result } = renderHook(() => useAlreadySigned(tx))
       expect(result.current).toEqual(true)
@@ -554,6 +580,7 @@ describe('SignOrExecute hooks', () => {
       data: '0x0001',
       staticPart: () => '',
       dynamicPart: () => '',
+      isContractSignature: false,
     })
     const { result } = renderHook(() => useAlreadySigned(tx))
     expect(result.current).toEqual(false)
diff --git a/src/components/tx/SignOrExecuteForm/hooks.ts b/src/components/tx/SignOrExecuteForm/hooks.ts
index 8628c33745..27b2279d1b 100644
--- a/src/components/tx/SignOrExecuteForm/hooks.ts
+++ b/src/components/tx/SignOrExecuteForm/hooks.ts
@@ -1,3 +1,4 @@
+import { assertTx, assertWallet, assertOnboard } from '@/utils/helpers'
 import { useMemo } from 'react'
 import { type TransactionOptions, type SafeTransaction } from '@safe-global/safe-core-sdk-types'
 import { sameString } from '@safe-global/protocol-kit/dist/src/utils'
@@ -13,8 +14,6 @@ import {
   dispatchTxSigning,
 } from '@/services/tx/tx-sender'
 import { useHasPendingTxs } from '@/hooks/usePendingTxs'
-import type { ConnectedWallet } from '@/hooks/wallets/useOnboard'
-import type { OnboardAPI } from '@web3-onboard/core'
 import { getSafeTxGas, getNonces } from '@/services/tx/tx-sender/recommendedNonce'
 import useAsync from '@/hooks/useAsync'
 import { useUpdateBatch } from '@/hooks/useDraftBatch'
@@ -32,16 +31,6 @@ type TxActions = {
   ) => Promise<string>
 }
 
-function assertTx(safeTx: SafeTransaction | undefined): asserts safeTx {
-  if (!safeTx) throw new Error('Transaction not provided')
-}
-function assertWallet(wallet: ConnectedWallet | null): asserts wallet {
-  if (!wallet) throw new Error('Wallet not connected')
-}
-function assertOnboard(onboard: OnboardAPI | undefined): asserts onboard {
-  if (!onboard) throw new Error('Onboard not connected')
-}
-
 export const useTxActions = (): TxActions => {
   const { safe } = useSafeInfo()
   const onboard = useOnboard()
@@ -135,7 +124,7 @@ export const useTxActions = (): TxActions => {
     }
 
     return { addToBatch, signTx, executeTx }
-  }, [safe, onboard, wallet, addTxToBatch])
+  }, [safe, wallet, addTxToBatch, onboard])
 }
 
 export const useValidateNonce = (safeTx: SafeTransaction | undefined): boolean => {
@@ -162,6 +151,7 @@ export const useRecommendedNonce = (): number | undefined => {
   const [recommendedNonce] = useAsync(
     async () => {
       if (!safe.chainId || !safeAddress) return
+      if (!safe.deployed) return 0
 
       const nonces = await getNonces(safe.chainId, safeAddress)
 
diff --git a/src/components/tx/SignOrExecuteForm/index.tsx b/src/components/tx/SignOrExecuteForm/index.tsx
index 87ee435a0e..eb5b0712aa 100644
--- a/src/components/tx/SignOrExecuteForm/index.tsx
+++ b/src/components/tx/SignOrExecuteForm/index.tsx
@@ -1,3 +1,5 @@
+import CounterfactualForm from '@/features/counterfactual/CounterfactualForm'
+import useSafeInfo from '@/hooks/useSafeInfo'
 import { type ReactElement, type ReactNode, useState, useContext, useCallback } from 'react'
 import madProps from '@/utils/mad-props'
 import DecodedTx from '../DecodedTx'
@@ -71,6 +73,9 @@ export const SignOrExecuteForm = ({
   const [decodedData, decodedDataError, decodedDataLoading] = useDecodeTx(safeTx)
   const isBatchable = props.isBatchable !== false && safeTx && !isDelegateCall(safeTx)
 
+  const { safe } = useSafeInfo()
+  const isCounterfactualSafe = !safe.deployed
+
   // If checkbox is checked and the transaction is executable, execute it, otherwise sign it
   const canExecute = isCorrectNonce && (props.isExecutable || isNewExecutableTx)
   const willExecute = (props.onlyExecute || shouldExecute) && canExecute
@@ -122,7 +127,7 @@ export const SignOrExecuteForm = ({
           </ErrorMessage>
         )}
 
-        {canExecute && !props.onlyExecute && <ExecuteCheckbox onChange={setShouldExecute} />}
+        {canExecute && !props.onlyExecute && !isCounterfactualSafe && <ExecuteCheckbox onChange={setShouldExecute} />}
 
         <WrongChainWarning />
 
@@ -130,7 +135,9 @@ export const SignOrExecuteForm = ({
 
         <RiskConfirmationError />
 
-        {willExecute ? (
+        {isCounterfactualSafe ? (
+          <CounterfactualForm {...props} safeTx={safeTx} isCreation={isCreation} onSubmit={onFormSubmit} onlyExecute />
+        ) : willExecute ? (
           <ExecuteForm {...props} safeTx={safeTx} isCreation={isCreation} onSubmit={onFormSubmit} />
         ) : (
           <SignForm
diff --git a/src/components/welcome/MyAccounts/AccountItem.tsx b/src/components/welcome/MyAccounts/AccountItem.tsx
new file mode 100644
index 0000000000..06ef5412b3
--- /dev/null
+++ b/src/components/welcome/MyAccounts/AccountItem.tsx
@@ -0,0 +1,66 @@
+import { useMemo } from 'react'
+import { ListItemButton, Box, Typography } from '@mui/material'
+import Link from 'next/link'
+import SafeIcon from '@/components/common/SafeIcon'
+import Track from '@/components/common/Track'
+import { OPEN_SAFE_LABELS, OVERVIEW_EVENTS } from '@/services/analytics'
+import { AppRoutes } from '@/config/routes'
+import { useAppSelector } from '@/store'
+import { selectChainById } from '@/store/chainsSlice'
+import ChainIndicator from '@/components/common/ChainIndicator'
+import css from './styles.module.css'
+import { selectAllAddressBooks } from '@/store/addressBookSlice'
+import { shortenAddress } from '@/utils/formatters'
+import SafeListContextMenu from '@/components/sidebar/SafeListContextMenu'
+
+type AccountItemProps = {
+  chainId: string
+  address: string
+  threshold?: number
+  owners?: number
+}
+
+const getSafeHref = (prefix: string, address: string) => ({
+  pathname: AppRoutes.home,
+  query: { safe: `${prefix}:${address}` },
+})
+
+const AccountItem = ({ chainId, address, ...rest }: AccountItemProps) => {
+  const chain = useAppSelector((state) => selectChainById(state, chainId))
+
+  const href = useMemo(() => {
+    return chain ? getSafeHref(chain.shortName, address) : ''
+  }, [chain, address])
+
+  const name = useAppSelector(selectAllAddressBooks)[chainId]?.[address]
+
+  return (
+    <ListItemButton className={css.listItem}>
+      <Track {...OVERVIEW_EVENTS.OPEN_SAFE} label={OPEN_SAFE_LABELS.login_page}>
+        <Link href={href} className={css.safeLink}>
+          <SafeIcon address={address} {...rest} />
+
+          <Typography variant="body2" component="div" className={css.safeAddress}>
+            {name && (
+              <Typography fontWeight="bold" fontSize="inherit">
+                {name}
+              </Typography>
+            )}
+            <b>{chain?.shortName}: </b>
+            <Typography color="text.secondary" fontSize="inherit" component="span">
+              {shortenAddress(address)}
+            </Typography>
+          </Typography>
+
+          <Box flex={1} />
+
+          <ChainIndicator chainId={chainId} responsive />
+        </Link>
+      </Track>
+
+      <SafeListContextMenu name={name} address={address} chainId={chainId} />
+    </ListItemButton>
+  )
+}
+
+export default AccountItem
diff --git a/src/components/welcome/MyAccounts/CreateButton.tsx b/src/components/welcome/MyAccounts/CreateButton.tsx
new file mode 100644
index 0000000000..6cef3dae4e
--- /dev/null
+++ b/src/components/welcome/MyAccounts/CreateButton.tsx
@@ -0,0 +1,28 @@
+import { Button } from '@mui/material'
+import Link from 'next/link'
+import { AppRoutes } from '@/config/routes'
+import { OVERVIEW_EVENTS, trackEvent } from '@/services/analytics'
+
+const buttonSx = { width: ['100%', 'auto'] }
+
+const onClick = () => {
+  trackEvent(OVERVIEW_EVENTS.CREATE_NEW_SAFE)
+}
+
+const CreateButton = () => (
+  <Link href={AppRoutes.newSafe.create} passHref legacyBehavior>
+    <Button
+      data-testid="create-safe-btn"
+      disableElevation
+      size="small"
+      variant="contained"
+      sx={buttonSx}
+      component="a"
+      onClick={onClick}
+    >
+      Create account
+    </Button>
+  </Link>
+)
+
+export default CreateButton
diff --git a/src/components/welcome/MyAccounts/index.tsx b/src/components/welcome/MyAccounts/index.tsx
new file mode 100644
index 0000000000..2a19f8d582
--- /dev/null
+++ b/src/components/welcome/MyAccounts/index.tsx
@@ -0,0 +1,77 @@
+import { useMemo, useState } from 'react'
+import { Button, Box, Paper, Typography } from '@mui/material'
+import madProps from '@/utils/mad-props'
+import AccountItem from './AccountItem'
+import CreateButton from './CreateButton'
+import useAllSafes, { type SafeItems } from './useAllSafes'
+import Track from '@/components/common/Track'
+import { OVERVIEW_EVENTS } from '@/services/analytics'
+import { DataWidget } from '@/components/welcome/SafeListDrawer/DataWidget'
+import css from './styles.module.css'
+
+type AccountsListProps = {
+  safes: SafeItems
+}
+
+const DEFAULT_SHOWN = 5
+const MAX_DEFAULT_SHOWN = 7
+
+const AccountsList = ({ safes }: AccountsListProps) => {
+  const [maxShown, setMaxShown] = useState<number>(DEFAULT_SHOWN)
+
+  const shownSafes = useMemo(() => {
+    if (safes.length <= MAX_DEFAULT_SHOWN) {
+      return safes
+    }
+    return safes.slice(0, maxShown)
+  }, [safes, maxShown])
+
+  const onShowMore = () => {
+    const pageSize = 100 // DEFAULT_SHOWN
+    setMaxShown((prev) => prev + pageSize)
+  }
+
+  return (
+    <Box display="flex" justifyContent="center">
+      <Box className={css.container} m={2}>
+        <Box display="flex" flexWrap="wrap" justifyContent="space-between" py={3} gap={2}>
+          <Typography variant="h1" fontWeight={700}>
+            My Safe accounts
+            <Typography component="span" color="text.secondary" fontSize="inherit" fontWeight="normal">
+              {' '}
+              ({safes.length})
+            </Typography>
+          </Typography>
+
+          <CreateButton />
+        </Box>
+
+        <Paper sx={{ p: 3, mb: 3 }}>
+          {shownSafes.length ? (
+            shownSafes.map((item) => <AccountItem {...item} key={item.chainId + item.address} />)
+          ) : (
+            <Typography variant="body2" color="primary.light" textAlign="center" my={3}>
+              You don&apos;t have any Safe Accounts yet
+            </Typography>
+          )}
+
+          {safes.length > shownSafes.length && (
+            <Box display="flex" justifyContent="center">
+              <Track {...OVERVIEW_EVENTS.SHOW_MORE_SAFES}>
+                <Button onClick={onShowMore}>Show more</Button>
+              </Track>
+            </Box>
+          )}
+        </Paper>
+
+        <DataWidget />
+      </Box>
+    </Box>
+  )
+}
+
+const MyAccounts = madProps(AccountsList, {
+  safes: useAllSafes,
+})
+
+export default MyAccounts
diff --git a/src/components/welcome/MyAccounts/styles.module.css b/src/components/welcome/MyAccounts/styles.module.css
new file mode 100644
index 0000000000..df7742fec5
--- /dev/null
+++ b/src/components/welcome/MyAccounts/styles.module.css
@@ -0,0 +1,37 @@
+.container {
+  width: 600px;
+}
+
+.listItem {
+  border: 1px solid var(--color-border-light);
+  border-radius: var(--space-1);
+  margin-bottom: 12px;
+  padding-top: var(--space-2);
+  padding-bottom: var(--space-2);
+}
+
+.listItem > :first-child {
+  flex: 1;
+}
+
+.safeLink {
+  display: flex;
+  align-items: center;
+  padding-right: var(--space-1);
+}
+
+.safeAddress {
+  flex: 1;
+  white-space: nowrap;
+  padding-left: var(--space-2);
+}
+
+@media (max-width: 899.95px) {
+  .container {
+    width: auto;
+  }
+
+  .safeLink {
+    padding-right: 0;
+  }
+}
diff --git a/src/components/welcome/MyAccounts/useAllOwnedSafes.ts b/src/components/welcome/MyAccounts/useAllOwnedSafes.ts
new file mode 100644
index 0000000000..023bc00b91
--- /dev/null
+++ b/src/components/welcome/MyAccounts/useAllOwnedSafes.ts
@@ -0,0 +1,11 @@
+import { getAllOwnedSafes } from '@safe-global/safe-gateway-typescript-sdk'
+import useAsync from '@/hooks/useAsync'
+
+const useAllOwnedSafes = (address: string) => {
+  return useAsync(() => {
+    if (!address) return
+    return getAllOwnedSafes(address)
+  }, [address])
+}
+
+export default useAllOwnedSafes
diff --git a/src/components/welcome/MyAccounts/useAllSafes.ts b/src/components/welcome/MyAccounts/useAllSafes.ts
new file mode 100644
index 0000000000..4b064818c3
--- /dev/null
+++ b/src/components/welcome/MyAccounts/useAllSafes.ts
@@ -0,0 +1,57 @@
+import { useMemo } from 'react'
+import uniq from 'lodash/uniq'
+import isEmpty from 'lodash/isEmpty'
+import { useAppSelector } from '@/store'
+import { selectAllAddedSafes } from '@/store/addedSafesSlice'
+import useAllOwnedSafes from './useAllOwnedSafes'
+import useChains from '@/hooks/useChains'
+import useChainId from '@/hooks/useChainId'
+import useWallet from '@/hooks/wallets/useWallet'
+
+export type SafeItems = Array<{
+  chainId: string
+  address: string
+  threshold?: number
+  owners?: number
+}>
+
+const useAddedSafes = () => {
+  const allAdded = useAppSelector(selectAllAddedSafes)
+  return allAdded
+}
+
+export const useHasSafes = () => {
+  const { address = '' } = useWallet() || {}
+  const allAdded = useAddedSafes()
+  const hasAdded = isEmpty(allAdded)
+  const [allOwned] = useAllOwnedSafes(!hasAdded ? address : '') // pass an empty string to not fetch owned safes
+  return hasAdded || !isEmpty(allOwned)
+}
+
+const useAllSafes = (): SafeItems => {
+  const { address = '' } = useWallet() || {}
+  const [allOwned = {}] = useAllOwnedSafes(address)
+  const allAdded = useAddedSafes()
+  const { configs } = useChains()
+  const currentChainId = useChainId()
+
+  return useMemo<SafeItems>(() => {
+    const chains = uniq([currentChainId].concat(Object.keys(allAdded)).concat(Object.keys(allOwned)))
+
+    return chains.flatMap((chainId) => {
+      if (!configs.some((item) => item.chainId === chainId)) return []
+      const addedOnChain = Object.keys(allAdded[chainId] || {})
+      const ownedOnChain = allOwned[chainId]
+      const uniqueAddresses = uniq(addedOnChain.concat(ownedOnChain)).filter(Boolean)
+
+      return uniqueAddresses.map((address) => ({
+        address,
+        chainId,
+        threshold: allAdded[chainId]?.[address]?.threshold,
+        owners: allAdded[chainId]?.[address]?.owners.length,
+      }))
+    })
+  }, [configs, allAdded, allOwned, currentChainId])
+}
+
+export default useAllSafes
diff --git a/src/components/welcome/WelcomeLogin/WalletLogin.tsx b/src/components/welcome/WelcomeLogin/WalletLogin.tsx
index 8add385375..fa8138974f 100644
--- a/src/components/welcome/WelcomeLogin/WalletLogin.tsx
+++ b/src/components/welcome/WelcomeLogin/WalletLogin.tsx
@@ -2,9 +2,9 @@ import useConnectWallet from '@/components/common/ConnectWallet/useConnectWallet
 import Track from '@/components/common/Track'
 import useWallet from '@/hooks/wallets/useWallet'
 import { isSocialLoginWallet } from '@/services/mpc/SocialLoginModule'
-import { CREATE_SAFE_EVENTS } from '@/services/analytics'
 import { Box, Button, Typography } from '@mui/material'
 import EthHashInfo from '@/components/common/EthHashInfo'
+import { CREATE_SAFE_EVENTS } from '@/services/analytics'
 
 const WalletLogin = ({ onLogin }: { onLogin: () => void }) => {
   const wallet = useWallet()
@@ -15,7 +15,7 @@ const WalletLogin = ({ onLogin }: { onLogin: () => void }) => {
   if (wallet !== null && !isSocialLogin) {
     return (
       <Box sx={{ width: '100%' }}>
-        <Track {...CREATE_SAFE_EVENTS.CONTINUE_TO_CREATION}>
+        <Track {...CREATE_SAFE_EVENTS.CONTINUE_TO_MY_ACCOUNTS}>
           <Button variant="contained" sx={{ padding: '8px 16px' }} fullWidth onClick={onLogin}>
             <Box
               width="100%"
diff --git a/src/components/welcome/WelcomeLogin/index.tsx b/src/components/welcome/WelcomeLogin/index.tsx
index 7cdb42ae16..7d5245dd7d 100644
--- a/src/components/welcome/WelcomeLogin/index.tsx
+++ b/src/components/welcome/WelcomeLogin/index.tsx
@@ -1,15 +1,16 @@
 import { AppRoutes } from '@/config/routes'
 import { useHasFeature } from '@/hooks/useChains'
 import { FEATURES } from '@/utils/chains'
-import { Paper, SvgIcon, Typography, Divider, Link, Box, Skeleton } from '@mui/material'
+import { Paper, SvgIcon, Typography, Divider, Box, Skeleton } from '@mui/material'
 import SafeLogo from '@/public/images/logo-text.svg'
 import dynamic from 'next/dynamic'
 import css from './styles.module.css'
 import { useRouter } from 'next/router'
 import WalletLogin from './WalletLogin'
-import { LOAD_SAFE_EVENTS, CREATE_SAFE_EVENTS } from '@/services/analytics/events/createLoadSafe'
-import Track from '@/components/common/Track'
+import { CREATE_SAFE_EVENTS } from '@/services/analytics/events/createLoadSafe'
 import { trackEvent } from '@/services/analytics'
+import useWallet from '@/hooks/wallets/useWallet'
+import { useHasSafes } from '../MyAccounts/useAllSafes'
 
 const SocialSigner = dynamic(() => import('@/components/common/SocialSigner'), {
   loading: () => <Skeleton variant="rounded" height={42} width="100%" />,
@@ -17,11 +18,17 @@ const SocialSigner = dynamic(() => import('@/components/common/SocialSigner'), {
 
 const WelcomeLogin = () => {
   const router = useRouter()
+  const wallet = useWallet()
   const isSocialLoginEnabled = useHasFeature(FEATURES.SOCIAL_LOGIN)
+  const hasSafes = useHasSafes()
 
   const continueToCreation = () => {
-    trackEvent(CREATE_SAFE_EVENTS.OPEN_SAFE_CREATION)
-    router.push({ pathname: AppRoutes.newSafe.create, query: router.query })
+    if (hasSafes) {
+      router.push({ pathname: AppRoutes.welcome.accounts, query: router.query })
+    } else {
+      trackEvent(CREATE_SAFE_EVENTS.OPEN_SAFE_CREATION)
+      router.push({ pathname: AppRoutes.newSafe.create, query: router.query })
+    }
   }
 
   return (
@@ -30,12 +37,15 @@ const WelcomeLogin = () => {
         <SvgIcon component={SafeLogo} inheritViewBox sx={{ height: '24px', width: '80px', ml: '-8px' }} />
 
         <Typography variant="h6" mt={6} fontWeight={700}>
-          Create Account
+          Get started
         </Typography>
 
         <Typography mb={2} textAlign="center">
-          Choose how you would like to create your Safe Account
+          {wallet
+            ? 'Open your existing Safe Accounts or create a new one'
+            : 'Connect your wallet to create a new Safe Account or open an existing one'}
         </Typography>
+
         <WalletLogin onLogin={continueToCreation} />
 
         {isSocialLoginEnabled && (
@@ -49,15 +59,6 @@ const WelcomeLogin = () => {
             <SocialSigner onLogin={continueToCreation} />
           </>
         )}
-
-        <Typography mt={2} textAlign="center">
-          Already have a Safe Account?
-        </Typography>
-        <Track {...LOAD_SAFE_EVENTS.LOAD_BUTTON}>
-          <Link color="primary" href={AppRoutes.newSafe.load}>
-            Add existing one
-          </Link>
-        </Track>
       </Box>
     </Paper>
   )
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 459a1a51e5..7742697469 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -37,7 +37,7 @@ export const SAFE_TOKEN_ADDRESSES: { [chainId: string]: string } = {
 export const SAFE_APPS_INFURA_TOKEN = process.env.NEXT_PUBLIC_SAFE_APPS_INFURA_TOKEN || INFURA_TOKEN
 export const SAFE_APPS_THIRD_PARTY_COOKIES_CHECK_URL = 'https://third-party-cookies-check.gnosis-safe.com'
 export const SAFE_APPS_DEMO_SAFE_MAINNET = 'eth:0xfF501B324DC6d78dC9F983f140B9211c3EdB4dc7'
-export const SAFE_APPS_SDK_DOCS_URL = 'https://docs.safe.global/safe-core-aa-sdk/safe-apps'
+export const SAFE_APPS_SDK_DOCS_URL = 'https://docs.safe.global/apps-sdk-overview'
 
 // Google Tag Manager
 export const GOOGLE_TAG_MANAGER_ID = process.env.NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID || ''
diff --git a/src/config/routes.ts b/src/config/routes.ts
index 4ea91c3249..fbc4c0f96e 100644
--- a/src/config/routes.ts
+++ b/src/config/routes.ts
@@ -1,6 +1,5 @@
 export const AppRoutes = {
   '404': '/404',
-  _offline: '/_offline',
   wc: '/wc',
   terms: '/terms',
   privacy: '/privacy',
@@ -11,6 +10,7 @@ export const AppRoutes = {
   cookie: '/cookie',
   addressBook: '/address-book',
   addOwner: '/addOwner',
+  _offline: '/_offline',
   apps: {
     open: '/apps/open',
     index: '/apps',
@@ -52,5 +52,6 @@ export const AppRoutes = {
   welcome: {
     socialLogin: '/welcome/social-login',
     index: '/welcome',
+    accounts: '/welcome/accounts',
   },
 }
diff --git a/src/features/counterfactual/ActivateAccount.tsx b/src/features/counterfactual/ActivateAccount.tsx
new file mode 100644
index 0000000000..27101f6fa9
--- /dev/null
+++ b/src/features/counterfactual/ActivateAccount.tsx
@@ -0,0 +1,241 @@
+import { createNewSafe, relaySafeCreation } from '@/components/new-safe/create/logic'
+import NetworkWarning from '@/components/new-safe/create/NetworkWarning'
+import { NetworkFee, SafeSetupOverview } from '@/components/new-safe/create/steps/ReviewStep'
+import { SafeCreationStatus } from '@/components/new-safe/create/steps/StatusStep/useSafeCreation'
+import ReviewRow from '@/components/new-safe/ReviewRow'
+import { TxModalContext } from '@/components/tx-flow'
+import TxCard from '@/components/tx-flow/common/TxCard'
+
+import TxLayout from '@/components/tx-flow/common/TxLayout'
+import ErrorMessage from '@/components/tx/ErrorMessage'
+import { ExecutionMethod, ExecutionMethodSelector } from '@/components/tx/ExecutionMethodSelector'
+import useDeployGasLimit from '@/features/counterfactual/hooks/useDeployGasLimit'
+import { removeUndeployedSafe, selectUndeployedSafe } from '@/features/counterfactual/store/undeployedSafesSlice'
+import { CF_TX_GROUP_KEY, showSubmitNotification } from '@/features/counterfactual/utils'
+import useChainId from '@/hooks/useChainId'
+import { useCurrentChain } from '@/hooks/useChains'
+import useGasPrice, { getTotalFeeFormatted } from '@/hooks/useGasPrice'
+import useIsWrongChain from '@/hooks/useIsWrongChain'
+import { useLeastRemainingRelays } from '@/hooks/useRemainingRelays'
+import useSafeInfo from '@/hooks/useSafeInfo'
+import useWalletCanPay from '@/hooks/useWalletCanPay'
+import useWallet from '@/hooks/wallets/useWallet'
+import { useWeb3 } from '@/hooks/wallets/web3'
+import { asError } from '@/services/exceptions/utils'
+import { isSocialLoginWallet } from '@/services/mpc/SocialLoginModule'
+import { txDispatch, TxEvent } from '@/services/tx/txEvents'
+import { waitForCreateSafeTx } from '@/services/tx/txMonitor'
+import { useAppDispatch, useAppSelector } from '@/store'
+import { hasFeature } from '@/utils/chains'
+import { hasRemainingRelays } from '@/utils/relaying'
+import { Alert, Box, Button, CircularProgress, Divider, Grid, Typography } from '@mui/material'
+import type { DeploySafeProps } from '@safe-global/protocol-kit'
+import { FEATURES } from '@safe-global/safe-gateway-typescript-sdk'
+import React, { useContext, useState } from 'react'
+
+const useActivateAccount = () => {
+  const chain = useCurrentChain()
+  const [gasPrice] = useGasPrice()
+  const { gasLimit } = useDeployGasLimit()
+
+  const isEIP1559 = chain && hasFeature(chain, FEATURES.EIP1559)
+  const maxFeePerGas = gasPrice?.maxFeePerGas
+  const maxPriorityFeePerGas = gasPrice?.maxPriorityFeePerGas
+
+  const options: DeploySafeProps['options'] = isEIP1559
+    ? {
+        maxFeePerGas: maxFeePerGas?.toString(),
+        maxPriorityFeePerGas: maxPriorityFeePerGas?.toString(),
+        gasLimit: gasLimit?.totalGas.toString(),
+      }
+    : { gasPrice: maxFeePerGas?.toString(), gasLimit: gasLimit?.totalGas.toString() }
+
+  const totalFee = getTotalFeeFormatted(maxFeePerGas, maxPriorityFeePerGas, gasLimit?.totalGas, chain)
+  const walletCanPay = useWalletCanPay({ gasLimit: gasLimit?.totalGas, maxFeePerGas, maxPriorityFeePerGas })
+
+  return { options, totalFee, walletCanPay }
+}
+
+const ActivateAccountFlow = () => {
+  const [isSubmittable, setIsSubmittable] = useState<boolean>(true)
+  const [submitError, setSubmitError] = useState<Error | undefined>()
+  const [executionMethod, setExecutionMethod] = useState(ExecutionMethod.RELAY)
+
+  const isWrongChain = useIsWrongChain()
+  const chain = useCurrentChain()
+  const chainId = useChainId()
+  const { safeAddress } = useSafeInfo()
+  const provider = useWeb3()
+  const undeployedSafe = useAppSelector((state) => selectUndeployedSafe(state, chainId, safeAddress))
+  const { setTxFlow } = useContext(TxModalContext)
+  const dispatch = useAppDispatch()
+  const wallet = useWallet()
+  const { options, totalFee, walletCanPay } = useActivateAccount()
+
+  const ownerAddresses = undeployedSafe?.safeAccountConfig.owners || []
+  const [minRelays] = useLeastRemainingRelays(ownerAddresses)
+
+  // Every owner has remaining relays and relay method is selected
+  const canRelay = hasRemainingRelays(minRelays)
+  const willRelay = canRelay && executionMethod === ExecutionMethod.RELAY
+
+  if (!undeployedSafe) return null
+
+  const onSuccess = () => {
+    dispatch(removeUndeployedSafe({ chainId, address: safeAddress }))
+    txDispatch(TxEvent.SUCCESS, { groupKey: CF_TX_GROUP_KEY })
+  }
+
+  const onSubmit = (txHash?: string) => {
+    showSubmitNotification(dispatch, chain, txHash)
+    setTxFlow(undefined)
+  }
+
+  const createSafe = async () => {
+    if (!provider || !chain) return
+
+    setIsSubmittable(false)
+    setSubmitError(undefined)
+
+    try {
+      if (willRelay) {
+        const taskId = await relaySafeCreation(
+          chain,
+          undeployedSafe.safeAccountConfig.owners,
+          undeployedSafe.safeAccountConfig.threshold,
+          Number(undeployedSafe.safeDeploymentConfig?.saltNonce!),
+          undeployedSafe.safeDeploymentConfig?.safeVersion,
+        )
+
+        onSubmit()
+
+        waitForCreateSafeTx(taskId, (status) => {
+          if (status === SafeCreationStatus.SUCCESS) {
+            onSuccess()
+          }
+        })
+      } else {
+        await createNewSafe(
+          provider,
+          {
+            safeAccountConfig: undeployedSafe.safeAccountConfig,
+            saltNonce: undeployedSafe.safeDeploymentConfig?.saltNonce,
+            options,
+
+            callback: onSubmit,
+          },
+          undeployedSafe.safeDeploymentConfig?.safeVersion,
+        )
+        onSuccess()
+      }
+    } catch (_err) {
+      const err = asError(_err)
+      setIsSubmittable(true)
+      setSubmitError(err)
+      return
+    }
+  }
+
+  const submitDisabled = !isSubmittable
+  const isSocialLogin = isSocialLoginWallet(wallet?.label)
+
+  return (
+    <TxLayout title="Activate account" hideNonce>
+      <TxCard>
+        <Typography>
+          You&apos;re about to deploy this Safe Account and will have to confirm the transaction with your connected
+          wallet.
+        </Typography>
+
+        <Divider sx={{ mx: -3, my: 2 }} />
+
+        <SafeSetupOverview
+          owners={undeployedSafe.safeAccountConfig.owners.map((owner) => ({ name: '', address: owner }))}
+          threshold={undeployedSafe.safeAccountConfig.threshold}
+        />
+
+        <Divider sx={{ mx: -3, mt: 2, mb: 1 }} />
+        <Box display="flex" flexDirection="column" gap={3}>
+          {canRelay && !isSocialLogin && (
+            <Grid container spacing={3}>
+              <ReviewRow
+                name="Execution method"
+                value={
+                  <ExecutionMethodSelector
+                    executionMethod={executionMethod}
+                    setExecutionMethod={setExecutionMethod}
+                    relays={minRelays}
+                  />
+                }
+              />
+            </Grid>
+          )}
+
+          <Grid data-testid="network-fee-section" container spacing={3}>
+            <ReviewRow
+              name="Est. network fee"
+              value={
+                <>
+                  <NetworkFee totalFee={totalFee} willRelay={willRelay} chain={chain} />
+
+                  {!willRelay && !isSocialLogin && (
+                    <Typography variant="body2" color="text.secondary" mt={1}>
+                      You will have to confirm a transaction with your connected wallet.
+                    </Typography>
+                  )}
+                </>
+              }
+            />
+          </Grid>
+
+          {submitError && (
+            <Box mt={1}>
+              <ErrorMessage error={submitError}>Error submitting the transaction. Please try again.</ErrorMessage>
+            </Box>
+          )}
+
+          {isWrongChain && <NetworkWarning />}
+
+          {!walletCanPay && !willRelay && (
+            <ErrorMessage>
+              Your connected wallet doesn&apos;t have enough funds to execute this transaction
+            </ErrorMessage>
+          )}
+        </Box>
+
+        <Divider sx={{ mx: -3, mt: 2, mb: 1 }} />
+
+        <Box display="flex" flexDirection="row" justifyContent="flex-end" gap={3}>
+          <Button onClick={createSafe} variant="contained" size="stretched" disabled={submitDisabled}>
+            {!isSubmittable ? <CircularProgress size={20} /> : 'Activate'}
+          </Button>
+        </Box>
+      </TxCard>
+    </TxLayout>
+  )
+}
+
+const ActivateAccount = () => {
+  const { safe } = useSafeInfo()
+  const { setTxFlow } = useContext(TxModalContext)
+
+  if (safe.deployed) return null
+
+  const activateAccount = () => {
+    setTxFlow(<ActivateAccountFlow />)
+  }
+
+  return (
+    <Alert severity="info" sx={{ mb: 3 }}>
+      <Typography fontWeight="bold">Activate your account?</Typography>
+      <Typography variant="body2" mb={3}>
+        Activate your account now by deploying it and paying a network fee.
+      </Typography>
+      <Button variant="contained" size="small" onClick={activateAccount}>
+        Activate now
+      </Button>
+    </Alert>
+  )
+}
+
+export default ActivateAccount
diff --git a/src/features/counterfactual/CheckBalance.tsx b/src/features/counterfactual/CheckBalance.tsx
new file mode 100644
index 0000000000..b8e2c97229
--- /dev/null
+++ b/src/features/counterfactual/CheckBalance.tsx
@@ -0,0 +1,43 @@
+import CooldownButton from '@/components/common/CooldownButton'
+import ExternalLink from '@/components/common/ExternalLink'
+import { getCounterfactualBalance } from '@/features/counterfactual/utils'
+import { useCurrentChain } from '@/hooks/useChains'
+import useSafeInfo from '@/hooks/useSafeInfo'
+import { useWeb3 } from '@/hooks/wallets/web3'
+import { getBlockExplorerLink } from '@/utils/chains'
+import { Box, Typography } from '@mui/material'
+
+const CheckBalance = () => {
+  const { safe, safeAddress } = useSafeInfo()
+  const chain = useCurrentChain()
+  const provider = useWeb3()
+
+  if (safe.deployed) return null
+
+  const handleBalanceRefresh = async () => {
+    void getCounterfactualBalance(safeAddress, provider, chain, true)
+  }
+
+  const blockExplorerLink = chain ? getBlockExplorerLink(chain, safeAddress) : undefined
+
+  return (
+    <Box textAlign="center" p={3}>
+      <Typography variant="h4" fontWeight="bold" mb={2}>
+        Don&apos;t see your tokens?
+      </Typography>
+      <Box display="flex" flexDirection="column" gap={1} alignItems="center">
+        <CooldownButton cooldown={15} onClick={handleBalanceRefresh}>
+          Refresh balance
+        </CooldownButton>
+        <Typography>or</Typography>
+        {blockExplorerLink && (
+          <Typography>
+            check on <ExternalLink href={blockExplorerLink.href}>Block Explorer</ExternalLink>
+          </Typography>
+        )}
+      </Box>
+    </Box>
+  )
+}
+
+export default CheckBalance
diff --git a/src/features/counterfactual/CounterfactualForm.tsx b/src/features/counterfactual/CounterfactualForm.tsx
new file mode 100644
index 0000000000..a4b3753086
--- /dev/null
+++ b/src/features/counterfactual/CounterfactualForm.tsx
@@ -0,0 +1,199 @@
+import { TxModalContext } from '@/components/tx-flow'
+import useDeployGasLimit from '@/features/counterfactual/hooks/useDeployGasLimit'
+import { removeUndeployedSafe } from '@/features/counterfactual/store/undeployedSafesSlice'
+import { deploySafeAndExecuteTx } from '@/features/counterfactual/utils'
+import useChainId from '@/hooks/useChainId'
+import { getTotalFeeFormatted } from '@/hooks/useGasPrice'
+import useSafeInfo from '@/hooks/useSafeInfo'
+import useWalletCanPay from '@/hooks/useWalletCanPay'
+import useOnboard from '@/hooks/wallets/useOnboard'
+import useWallet from '@/hooks/wallets/useWallet'
+import { useAppDispatch } from '@/store'
+import madProps from '@/utils/mad-props'
+import React, { type ReactElement, type SyntheticEvent, useContext, useState } from 'react'
+import { CircularProgress, Box, Button, CardActions, Divider, Alert } from '@mui/material'
+import classNames from 'classnames'
+
+import ErrorMessage from '@/components/tx/ErrorMessage'
+import { trackError, Errors } from '@/services/exceptions'
+import { useCurrentChain } from '@/hooks/useChains'
+import { getTxOptions } from '@/utils/transactions'
+import CheckWallet from '@/components/common/CheckWallet'
+import { useIsExecutionLoop } from '@/components/tx/SignOrExecuteForm/hooks'
+import type { SignOrExecuteProps } from '@/components/tx/SignOrExecuteForm'
+import type { SafeTransaction } from '@safe-global/safe-core-sdk-types'
+import AdvancedParams, { useAdvancedParams } from '@/components/tx/AdvancedParams'
+import { asError } from '@/services/exceptions/utils'
+
+import css from '@/components/tx/SignOrExecuteForm/styles.module.css'
+import commonCss from '@/components/tx-flow/common/styles.module.css'
+import { TxSecurityContext } from '@/components/tx/security/shared/TxSecurityContext'
+import useIsSafeOwner from '@/hooks/useIsSafeOwner'
+import NonOwnerError from '@/components/tx/SignOrExecuteForm/NonOwnerError'
+
+export const CounterfactualForm = ({
+  safeTx,
+  disableSubmit = false,
+  onlyExecute,
+  isCreation,
+  isOwner,
+  isExecutionLoop,
+  txSecurity,
+}: SignOrExecuteProps & {
+  isOwner: ReturnType<typeof useIsSafeOwner>
+  isExecutionLoop: ReturnType<typeof useIsExecutionLoop>
+  txSecurity: ReturnType<typeof useTxSecurityContext>
+  safeTx?: SafeTransaction
+}): ReactElement => {
+  const wallet = useWallet()
+  const onboard = useOnboard()
+  const chain = useCurrentChain()
+  const chainId = useChainId()
+  const dispatch = useAppDispatch()
+  const { safeAddress } = useSafeInfo()
+
+  // Form state
+  const [isSubmittable, setIsSubmittable] = useState<boolean>(true)
+  const [submitError, setSubmitError] = useState<Error | undefined>()
+
+  // Hooks
+  const currentChain = useCurrentChain()
+  const { needsRiskConfirmation, isRiskConfirmed, setIsRiskIgnored } = txSecurity
+  const { setTxFlow } = useContext(TxModalContext)
+
+  // Estimate gas limit
+  const { gasLimit, gasLimitError } = useDeployGasLimit(safeTx)
+  const [advancedParams, setAdvancedParams] = useAdvancedParams(gasLimit?.totalGas)
+
+  // On modal submit
+  const handleSubmit = async (e: SyntheticEvent) => {
+    e.preventDefault()
+
+    if (needsRiskConfirmation && !isRiskConfirmed) {
+      setIsRiskIgnored(true)
+      return
+    }
+
+    setIsSubmittable(false)
+    setSubmitError(undefined)
+
+    const txOptions = getTxOptions(advancedParams, currentChain)
+
+    const onSuccess = () => {
+      dispatch(removeUndeployedSafe({ chainId, address: safeAddress }))
+    }
+
+    try {
+      await deploySafeAndExecuteTx(txOptions, chainId, wallet, safeTx, onboard, onSuccess)
+    } catch (_err) {
+      const err = asError(_err)
+      trackError(Errors._804, err)
+      setIsSubmittable(true)
+      setSubmitError(err)
+      return
+    }
+
+    setTxFlow(undefined)
+  }
+
+  const walletCanPay = useWalletCanPay({
+    gasLimit: gasLimit?.totalGas,
+    maxFeePerGas: advancedParams.maxFeePerGas,
+    maxPriorityFeePerGas: advancedParams.maxPriorityFeePerGas,
+  })
+
+  const cannotPropose = !isOwner && !onlyExecute
+  const submitDisabled =
+    !safeTx ||
+    !isSubmittable ||
+    disableSubmit ||
+    isExecutionLoop ||
+    cannotPropose ||
+    (needsRiskConfirmation && !isRiskConfirmed)
+
+  return (
+    <>
+      <form onSubmit={handleSubmit}>
+        <Alert severity="info" sx={{ mb: 2 }}>
+          Executing this transaction will also activate your account. Additional network fees will apply. Base fee is{' '}
+          <strong>
+            {getTotalFeeFormatted(
+              advancedParams.maxFeePerGas,
+              advancedParams.maxPriorityFeePerGas,
+              BigInt(gasLimit?.baseGas || '0') + BigInt(gasLimit?.safeTxGas || '0'),
+              chain,
+            )}{' '}
+            {chain?.nativeCurrency.symbol}
+          </strong>
+          , one time activation fee is{' '}
+          <strong>
+            {getTotalFeeFormatted(
+              advancedParams.maxFeePerGas,
+              advancedParams.maxPriorityFeePerGas,
+              BigInt(gasLimit?.safeDeploymentGas || '0'),
+              chain,
+            )}{' '}
+            {chain?.nativeCurrency.symbol}
+          </strong>
+          . This is an estimation and the final cost can be higher.
+        </Alert>
+
+        <div className={classNames(css.params)}>
+          <AdvancedParams
+            willExecute
+            params={advancedParams}
+            recommendedGasLimit={gasLimit}
+            onFormSubmit={setAdvancedParams}
+            gasLimitError={gasLimitError}
+            willRelay={false}
+          />
+        </div>
+
+        {/* Error messages */}
+        {cannotPropose ? (
+          <NonOwnerError />
+        ) : isExecutionLoop ? (
+          <ErrorMessage>
+            Cannot execute a transaction from the Safe Account itself, please connect a different account.
+          </ErrorMessage>
+        ) : !walletCanPay ? (
+          <ErrorMessage>Your connected wallet doesn&apos;t have enough funds to execute this transaction.</ErrorMessage>
+        ) : (
+          gasLimitError && (
+            <ErrorMessage error={gasLimitError}>
+              This transaction will most likely fail.
+              {` To save gas costs, ${isCreation ? 'avoid creating' : 'reject'} this transaction.`}
+            </ErrorMessage>
+          )
+        )}
+
+        {submitError && (
+          <Box mt={1}>
+            <ErrorMessage error={submitError}>Error submitting the transaction. Please try again.</ErrorMessage>
+          </Box>
+        )}
+
+        <Divider className={commonCss.nestedDivider} sx={{ pt: 3 }} />
+
+        <CardActions>
+          {/* Submit button */}
+          <CheckWallet allowNonOwner={onlyExecute}>
+            {(isOk) => (
+              <Button variant="contained" type="submit" disabled={!isOk || submitDisabled} sx={{ minWidth: '112px' }}>
+                {!isSubmittable ? <CircularProgress size={20} /> : 'Execute'}
+              </Button>
+            )}
+          </CheckWallet>
+        </CardActions>
+      </form>
+    </>
+  )
+}
+
+const useTxSecurityContext = () => useContext(TxSecurityContext)
+
+export default madProps(CounterfactualForm, {
+  isOwner: useIsSafeOwner,
+  isExecutionLoop: useIsExecutionLoop,
+  txSecurity: useTxSecurityContext,
+})
diff --git a/src/features/counterfactual/PayNowPayLater.tsx b/src/features/counterfactual/PayNowPayLater.tsx
new file mode 100644
index 0000000000..51da30bea6
--- /dev/null
+++ b/src/features/counterfactual/PayNowPayLater.tsx
@@ -0,0 +1,113 @@
+import type { ChangeEvent, Dispatch, SetStateAction } from 'react'
+import classnames from 'classnames'
+import { useCurrentChain } from '@/hooks/useChains'
+import CheckRoundedIcon from '@mui/icons-material/CheckRounded'
+import {
+  FormControl,
+  FormControlLabel,
+  List,
+  ListItem,
+  ListItemIcon,
+  Radio,
+  RadioGroup,
+  Typography,
+} from '@mui/material'
+
+import css from './styles.module.css'
+
+export const enum PayMethod {
+  PayNow = 'PayNow',
+  PayLater = 'PayLater',
+}
+
+const PayNowPayLater = ({
+  totalFee,
+  canRelay,
+  payMethod,
+  setPayMethod,
+}: {
+  totalFee: string
+  canRelay: boolean
+  payMethod: PayMethod
+  setPayMethod: Dispatch<SetStateAction<PayMethod>>
+}) => {
+  const chain = useCurrentChain()
+
+  const onChoosePayMethod = (_: ChangeEvent<HTMLInputElement>, newPayMethod: string) => {
+    setPayMethod(newPayMethod as PayMethod)
+  }
+
+  return (
+    <>
+      <Typography variant="h4" fontWeight="bold">
+        Before you continue
+      </Typography>
+      <List>
+        <ListItem disableGutters>
+          <ListItemIcon sx={{ minWidth: 0, mr: 1, color: 'black' }}>
+            <CheckRoundedIcon fontSize="small" color="inherit" />
+          </ListItemIcon>
+          <Typography variant="body2">
+            There will be a one-time network fee to activate your smart account wallet.
+          </Typography>
+        </ListItem>
+        <ListItem disableGutters>
+          <ListItemIcon sx={{ minWidth: 0, mr: 1, color: 'black' }}>
+            <CheckRoundedIcon fontSize="small" color="inherit" />
+          </ListItemIcon>
+          <Typography variant="body2">
+            If you choose to pay later, the fee will be included with the first transaction you make.
+          </Typography>
+        </ListItem>
+        <ListItem disableGutters>
+          <ListItemIcon sx={{ minWidth: 0, mr: 1, color: 'black' }}>
+            <CheckRoundedIcon fontSize="small" color="inherit" />
+          </ListItemIcon>
+          <Typography variant="body2">Safe doesn&apos;t profit from the fees.</Typography>
+        </ListItem>
+      </List>
+      <FormControl fullWidth>
+        <RadioGroup row value={payMethod} onChange={onChoosePayMethod} className={css.radioGroup}>
+          <FormControlLabel
+            sx={{ flex: 1 }}
+            value={PayMethod.PayNow}
+            className={classnames(css.radioContainer, { [css.active]: payMethod === PayMethod.PayNow })}
+            label={
+              <>
+                <Typography className={css.radioTitle}>Pay now</Typography>
+                <Typography className={css.radioSubtitle} variant="body2" color="text.secondary">
+                  {canRelay ? (
+                    'Sponsored free transaction'
+                  ) : (
+                    <>
+                      &asymp; {totalFee} {chain?.nativeCurrency.symbol}
+                    </>
+                  )}
+                </Typography>
+              </>
+            }
+            control={<Radio />}
+          />
+
+          <FormControlLabel
+            data-testid="connected-wallet-execution-method"
+            sx={{ flex: 1 }}
+            value={PayMethod.PayLater}
+            className={classnames(css.radioContainer, { [css.active]: payMethod === PayMethod.PayLater })}
+            label={
+              <>
+                <Typography className={css.radioTitle}>Pay later</Typography>
+                <Typography className={css.radioSubtitle} variant="body2" color="text.secondary">
+                  with the first transaction
+                </Typography>
+              </>
+            }
+            control={<Radio />}
+          />
+        </RadioGroup>
+      </FormControl>
+    </>
+  )
+}
+
+export default PayNowPayLater
diff --git a/src/features/counterfactual/__tests__/useDeployGasLimit.test.ts b/src/features/counterfactual/__tests__/useDeployGasLimit.test.ts
new file mode 100644
index 0000000000..27764a7344
--- /dev/null
+++ b/src/features/counterfactual/__tests__/useDeployGasLimit.test.ts
@@ -0,0 +1,65 @@
+import useDeployGasLimit from '@/features/counterfactual/hooks/useDeployGasLimit'
+import * as onboard from '@/hooks/wallets/useOnboard'
+import * as sdk from '@/services/tx/tx-sender/sdk'
+import { safeTxBuilder } from '@/tests/builders/safeTx'
+import * as protocolKit from '@safe-global/protocol-kit'
+import { renderHook } from '@/tests/test-utils'
+import { waitFor } from '@testing-library/react'
+import type { OnboardAPI } from '@web3-onboard/core'
+
+describe('useDeployGasLimit hook', () => {
+  it('returns undefined in onboard is not initialized', () => {
+    jest.spyOn(onboard, 'default').mockReturnValue(undefined)
+    const { result } = renderHook(() => useDeployGasLimit())
+
+    expect(result.current.gasLimit).toBeUndefined()
+  })
+
+  it('returns safe deployment gas estimation', async () => {
+    const mockGas = '100'
+    jest.spyOn(onboard, 'default').mockImplementation(jest.fn(() => ({} as OnboardAPI)))
+    jest.spyOn(sdk, 'getSafeSDKWithSigner').mockImplementation(jest.fn())
+    const mockEstimateSafeDeploymentGas = jest
+      .spyOn(protocolKit, 'estimateSafeDeploymentGas')
+      .mockReturnValue(Promise.resolve(mockGas))
+
+    const { result } = renderHook(() => useDeployGasLimit())
+
+    await waitFor(() => {
+      expect(mockEstimateSafeDeploymentGas).toHaveBeenCalled()
+      expect(result.current.gasLimit?.safeDeploymentGas).toEqual(mockGas)
+    })
+  })
+
+  it('does not estimate baseGas and safeTxGas if there is no safeTx and returns 0 for them instead', async () => {
+    jest.spyOn(onboard, 'default').mockImplementation(jest.fn(() => ({} as OnboardAPI)))
+    jest.spyOn(sdk, 'getSafeSDKWithSigner').mockImplementation(jest.fn())
+    jest.spyOn(protocolKit, 'estimateSafeDeploymentGas').mockReturnValue(Promise.resolve('100'))
+
+    const mockEstimateTxBaseGas = jest.spyOn(protocolKit, 'estimateTxBaseGas')
+    const mockEstimateSafeTxGas = jest.spyOn(protocolKit, 'estimateSafeTxGas')
+
+    const { result } = renderHook(() => useDeployGasLimit())
+
+    await waitFor(() => {
+      expect(mockEstimateTxBaseGas).not.toHaveBeenCalled()
+      expect(mockEstimateSafeTxGas).not.toHaveBeenCalled()
+      expect(result.current.gasLimit?.baseGas).toEqual('0')
+      expect(result.current.gasLimit?.safeTxGas).toEqual('0')
+    })
+  })
+
+  it('returns the totalFee', async () => {
+    jest.spyOn(onboard, 'default').mockImplementation(jest.fn(() => ({} as OnboardAPI)))
+    jest.spyOn(sdk, 'getSafeSDKWithSigner').mockImplementation(jest.fn())
+    jest.spyOn(protocolKit, 'estimateSafeDeploymentGas').mockReturnValue(Promise.resolve('100'))
+    jest.spyOn(protocolKit, 'estimateTxBaseGas').mockReturnValue(Promise.resolve('100'))
+    jest.spyOn(protocolKit, 'estimateSafeTxGas').mockReturnValue(Promise.resolve('100'))
+
+    const { result } = renderHook(() => useDeployGasLimit(safeTxBuilder().build()))
+
+    await waitFor(() => {
+      expect(result.current.gasLimit?.totalGas).toEqual(300n)
+    })
+  })
+})
diff --git a/src/features/counterfactual/__tests__/utils.test.ts b/src/features/counterfactual/__tests__/utils.test.ts
new file mode 100644
index 0000000000..b13a4ef13b
--- /dev/null
+++ b/src/features/counterfactual/__tests__/utils.test.ts
@@ -0,0 +1,148 @@
+import {
+  getCounterfactualBalance,
+  getNativeBalance,
+  getUndeployedSafeInfo,
+  setNativeBalance,
+} from '@/features/counterfactual/utils'
+import * as web3 from '@/hooks/wallets/web3'
+import { chainBuilder } from '@/tests/builders/chains'
+import { faker } from '@faker-js/faker'
+import type { PredictedSafeProps } from '@safe-global/protocol-kit'
+import { ZERO_ADDRESS } from '@safe-global/protocol-kit/dist/src/utils/constants'
+import { TokenType } from '@safe-global/safe-gateway-typescript-sdk'
+import { type BrowserProvider, type JsonRpcProvider } from 'ethers'
+
+describe('Counterfactual utils', () => {
+  describe('getUndeployedSafeInfo', () => {
+    it('should return undeployed safe info', async () => {
+      const undeployedSafe: PredictedSafeProps = {
+        safeAccountConfig: {
+          owners: [faker.finance.ethereumAddress()],
+          threshold: 1,
+        },
+        safeDeploymentConfig: {},
+      }
+      const mockAddress = faker.finance.ethereumAddress()
+      const mockChainId = '1'
+
+      const result = await getUndeployedSafeInfo(undeployedSafe, mockAddress, mockChainId)
+
+      expect(result.nonce).toEqual(0)
+      expect(result.deployed).toEqual(false)
+      expect(result.address.value).toEqual(mockAddress)
+      expect(result.chainId).toEqual(mockChainId)
+      expect(result.threshold).toEqual(undeployedSafe.safeAccountConfig.threshold)
+      expect(result.owners[0].value).toEqual(undeployedSafe.safeAccountConfig.owners[0])
+    })
+  })
+
+  describe('getCounterfactualBalance', () => {
+    const mockSafeAddress = faker.finance.ethereumAddress()
+    const mockChain = chainBuilder().build()
+
+    beforeEach(() => {
+      jest.clearAllMocks()
+    })
+
+    it('should fall back to readonly provider if there is no provider', async () => {
+      const mockBalance = 123n
+      const mockReadOnlyProvider = {
+        getBalance: jest.fn(() => Promise.resolve(mockBalance)),
+      } as unknown as JsonRpcProvider
+      jest.spyOn(web3, 'getWeb3ReadOnly').mockImplementationOnce(() => mockReadOnlyProvider)
+
+      const result = await getCounterfactualBalance(mockSafeAddress, undefined, mockChain)
+      const nativeBalanceCache = getNativeBalance()
+
+      expect(mockReadOnlyProvider.getBalance).toHaveBeenCalledTimes(1)
+      expect(nativeBalanceCache).toEqual(mockBalance)
+      expect(result).toEqual({
+        fiatTotal: '0',
+        items: [
+          {
+            tokenInfo: {
+              type: TokenType.NATIVE_TOKEN,
+              address: ZERO_ADDRESS,
+              ...mockChain.nativeCurrency,
+            },
+            balance: mockBalance.toString(),
+            fiatBalance: '0',
+            fiatConversion: '0',
+          },
+        ],
+      })
+
+      // Should use the cache now
+      const newResult = await getCounterfactualBalance(mockSafeAddress, undefined, mockChain)
+      expect(mockReadOnlyProvider.getBalance).toHaveBeenCalledTimes(1)
+      expect(newResult?.items[0].balance).toEqual('123')
+    })
+
+    it('should return undefined if there is no chain info', async () => {
+      const mockProvider = { getBalance: jest.fn(() => Promise.resolve(1n)) } as unknown as BrowserProvider
+
+      const result = await getCounterfactualBalance(mockSafeAddress, mockProvider, undefined)
+
+      expect(result).toBeUndefined()
+    })
+
+    it('should return the native balance', async () => {
+      const mockBalance = 1000000n
+      const mockProvider = { getBalance: jest.fn(() => Promise.resolve(mockBalance)) } as unknown as BrowserProvider
+
+      const result = await getCounterfactualBalance(mockSafeAddress, mockProvider, mockChain)
+
+      expect(mockProvider.getBalance).toHaveBeenCalled()
+      expect(result).toEqual({
+        fiatTotal: '0',
+        items: [
+          {
+            tokenInfo: {
+              type: TokenType.NATIVE_TOKEN,
+              address: ZERO_ADDRESS,
+              ...mockChain.nativeCurrency,
+            },
+            balance: mockBalance.toString(),
+            fiatBalance: '0',
+            fiatConversion: '0',
+          },
+        ],
+      })
+    })
+
+    it('should not use the cache if the ignoreCache flag is passed', async () => {
+      const mockBalance = 123n
+      const mockReadOnlyProvider = {
+        getBalance: jest.fn(() => Promise.resolve(mockBalance)),
+      } as unknown as JsonRpcProvider
+      jest.spyOn(web3, 'getWeb3ReadOnly').mockImplementationOnce(() => mockReadOnlyProvider)
+
+      // Set local cache
+      const mockCacheBalance = 10n
+      setNativeBalance(mockCacheBalance)
+      const nativeBalanceCache = getNativeBalance()
+      expect(nativeBalanceCache).toEqual(mockCacheBalance)
+
+      // Call function and ignore cache
+      const result = await getCounterfactualBalance(mockSafeAddress, undefined, mockChain, true)
+
+      expect(mockReadOnlyProvider.getBalance).toHaveBeenCalled()
+      expect(result?.items[0].balance).not.toEqual(mockCacheBalance)
+      expect(result).toEqual({
+        fiatTotal: '0',
+        items: [
+          {
+            tokenInfo: {
+              type: TokenType.NATIVE_TOKEN,
+              address: ZERO_ADDRESS,
+              ...mockChain.nativeCurrency,
+            },
+            balance: mockBalance.toString(),
+            fiatBalance: '0',
+            fiatConversion: '0',
+          },
+        ],
+      })
+    })
+  })
+})
diff --git a/src/features/counterfactual/hooks/useDeployGasLimit.ts b/src/features/counterfactual/hooks/useDeployGasLimit.ts
new file mode 100644
index 0000000000..0807869423
--- /dev/null
+++ b/src/features/counterfactual/hooks/useDeployGasLimit.ts
@@ -0,0 +1,60 @@
+import { id } from 'ethers'
+import useAsync from '@/hooks/useAsync'
+import useChainId from '@/hooks/useChainId'
+import useOnboard from '@/hooks/wallets/useOnboard'
+import { getSafeSDKWithSigner } from '@/services/tx/tx-sender/sdk'
+import { estimateSafeDeploymentGas, estimateSafeTxGas, estimateTxBaseGas } from '@safe-global/protocol-kit'
+import type { SafeTransaction } from '@safe-global/safe-core-sdk-types'
+
+const ADD_OWNER_WITH_THRESHOLD_SIG_HASH = id('addOwnerWithThreshold(address,uint256)').slice(0, 10)
+const SWAP_OWNER_SIG_HASH = id('swapOwner(address,address,address)').slice(0, 10)
+
+/**
+ * The estimation from the protocol-kit is too low for swapOwner and addOwnerWithThreshold,
+ * so we add a fixed amount
+ * @param safeTx
+ */
+const getExtraGasForSafety = (safeTx?: SafeTransaction): bigint => {
+  return safeTx?.data.data.startsWith(ADD_OWNER_WITH_THRESHOLD_SIG_HASH) ||
+    safeTx?.data.data.startsWith(SWAP_OWNER_SIG_HASH)
+    ? 25000n
+    : 0n
+}
+
+type DeployGasLimitProps = {
+  baseGas: string
+  safeTxGas: string
+  safeDeploymentGas: string
+  totalGas: bigint
+}
+
+const useDeployGasLimit = (safeTx?: SafeTransaction) => {
+  const onboard = useOnboard()
+  const chainId = useChainId()
+
+  const [gasLimit, gasLimitError, gasLimitLoading] = useAsync<DeployGasLimitProps | undefined>(
+    async () => {
+      if (!onboard) return
+
+      const sdk = await getSafeSDKWithSigner(onboard, chainId)
+
+      const extraGasForSafety = getExtraGasForSafety(safeTx)
+
+      const [baseGas, safeTxGas, safeDeploymentGas] = await Promise.all([
+        safeTx ? estimateTxBaseGas(sdk, safeTx) : '0',
+        safeTx ? estimateSafeTxGas(sdk, safeTx) : '0',
+        estimateSafeDeploymentGas(sdk),
+      ])
+
+      const totalGas = BigInt(baseGas) + BigInt(safeTxGas) + BigInt(safeDeploymentGas) + extraGasForSafety
+
+      return { baseGas, safeTxGas, safeDeploymentGas, totalGas }
+    },
+    [onboard, chainId, safeTx],
+    false,
+  )
+
+  return { gasLimit, gasLimitError, gasLimitLoading }
+}
+
+export default useDeployGasLimit
diff --git a/src/features/counterfactual/store/undeployedSafesSlice.ts b/src/features/counterfactual/store/undeployedSafesSlice.ts
new file mode 100644
index 0000000000..5d17fbf4ca
--- /dev/null
+++ b/src/features/counterfactual/store/undeployedSafesSlice.ts
@@ -0,0 +1,52 @@
+import { type RootState } from '@/store'
+import { createSelector, createSlice, type PayloadAction } from '@reduxjs/toolkit'
+import type { PredictedSafeProps } from '@safe-global/protocol-kit'
+
+type UndeployedSafesSlice = { [address: string]: PredictedSafeProps }
+
+type UndeployedSafesState = { [chainId: string]: UndeployedSafesSlice }
+
+const initialState: UndeployedSafesState = {}
+
+export const undeployedSafesSlice = createSlice({
+  name: 'undeployedSafes',
+  initialState,
+  reducers: {
+    addUndeployedSafe: (
+      state,
+      action: PayloadAction<{ chainId: string; address: string; safeProps: PredictedSafeProps }>,
+    ) => {
+      const { chainId, address, safeProps } = action.payload
+
+      if (!state[chainId]) {
+        state[chainId] = {}
+      }
+
+      state[chainId][address] = safeProps
+    },
+
+    removeUndeployedSafe: (state, action: PayloadAction<{ chainId: string; address: string }>) => {
+      const { chainId, address } = action.payload
+      if (!state[chainId]) return state
+
+      delete state[chainId][address]
+
+      if (Object.keys(state[chainId]).length > 0) return state
+
+      delete state[chainId]
+    },
+  },
+})
+
+export const { removeUndeployedSafe, addUndeployedSafe } = undeployedSafesSlice.actions
+
+export const selectUndeployedSafes = (state: RootState): UndeployedSafesState => {
+  return state[undeployedSafesSlice.name]
+}
+
+export const selectUndeployedSafe = createSelector(
+  [selectUndeployedSafes, (_, chainId: string, address: string) => [chainId, address]],
+  (undeployedSafes, [chainId, address]): PredictedSafeProps | undefined => {
+    return undeployedSafes[chainId]?.[address]
+  },
+)
diff --git a/src/features/counterfactual/styles.module.css b/src/features/counterfactual/styles.module.css
new file mode 100644
index 0000000000..a487c0b9fe
--- /dev/null
+++ b/src/features/counterfactual/styles.module.css
@@ -0,0 +1,32 @@
+.radioContainer {
+  border: 1px solid var(--color-border-light);
+  margin: 0;
+  border-radius: 6px;
+  height: 72px;
+  flex-basis: 72px;
+  padding: 0 var(--space-1);
+}
+
+.radioGroup {
+  gap: var(--space-2);
+  flex-wrap: wrap;
+}
+
+.active {
+  outline: 1px solid var(--color-primary-main);
+  border-color: var(--color-primary-main);
+}
+
+.active .radioTitle {
+  font-weight: bold;
+}
+
+.active .radioSubtitle {
+  color: var(--color-text-primary);
+}
+
+@media (max-width: 400px) {
+  .radioGroup {
+    flex-direction: column;
+  }
+}
diff --git a/src/features/counterfactual/utils.ts b/src/features/counterfactual/utils.ts
new file mode 100644
index 0000000000..f481da8fa5
--- /dev/null
+++ b/src/features/counterfactual/utils.ts
@@ -0,0 +1,222 @@
+import type { NewSafeFormData } from '@/components/new-safe/create'
+import { CREATION_MODAL_QUERY_PARM } from '@/components/new-safe/create/logic'
+import { LATEST_SAFE_VERSION } from '@/config/constants'
+import { AppRoutes } from '@/config/routes'
+import { addUndeployedSafe } from '@/features/counterfactual/store/undeployedSafesSlice'
+import { getWeb3ReadOnly } from '@/hooks/wallets/web3'
+import ExternalStore from '@/services/ExternalStore'
+import { type ConnectedWallet } from '@/hooks/wallets/useOnboard'
+import { asError } from '@/services/exceptions/utils'
+import { assertWalletChain, getUncheckedSafeSDK, tryOffChainTxSigning } from '@/services/tx/tx-sender/sdk'
+import { txDispatch, TxEvent } from '@/services/tx/txEvents'
+import type { AppDispatch } from '@/store'
+import { addOrUpdateSafe } from '@/store/addedSafesSlice'
+import { upsertAddressBookEntry } from '@/store/addressBookSlice'
+import { showNotification } from '@/store/notificationsSlice'
+import { defaultSafeInfo } from '@/store/safeInfoSlice'
+import { getBlockExplorerLink } from '@/utils/chains'
+import { didReprice, didRevert, type EthersError } from '@/utils/ethers-utils'
+import { assertOnboard, assertTx, assertWallet } from '@/utils/helpers'
+import type { DeploySafeProps, PredictedSafeProps } from '@safe-global/protocol-kit'
+import type { SafeTransaction, TransactionOptions } from '@safe-global/safe-core-sdk-types'
+import type { OnboardAPI } from '@web3-onboard/core'
+import type { ContractTransactionResponse } from 'ethers'
+import { ZERO_ADDRESS } from '@safe-global/protocol-kit/dist/src/utils/constants'
+import type { SafeVersion } from '@safe-global/safe-core-sdk-types'
+import {
+  type ChainInfo,
+  ImplementationVersionState,
+  type SafeBalanceResponse,
+  TokenType,
+  type SafeInfo,
+} from '@safe-global/safe-gateway-typescript-sdk'
+import type { BrowserProvider } from 'ethers'
+import { createWeb3 } from '@/hooks/wallets/web3'
+import type { NextRouter } from 'next/router'
+
+export const getUndeployedSafeInfo = (undeployedSafe: PredictedSafeProps, address: string, chainId: string) => {
+  return Promise.resolve({
+    ...defaultSafeInfo,
+    address: { value: address },
+    chainId,
+    owners: undeployedSafe.safeAccountConfig.owners.map((owner) => ({ value: owner })),
+    nonce: 0,
+    threshold: undeployedSafe.safeAccountConfig.threshold,
+    implementationVersionState: ImplementationVersionState.UP_TO_DATE,
+    fallbackHandler: { value: undeployedSafe.safeAccountConfig.fallbackHandler! },
+    version: LATEST_SAFE_VERSION,
+    deployed: false,
+  })
+}
+
+export const CF_TX_GROUP_KEY = 'cf-tx'
+
+export const dispatchTxExecutionAndDeploySafe = async (
+  safeTx: SafeTransaction,
+  txOptions: TransactionOptions,
+  onboard: OnboardAPI,
+  chainId: SafeInfo['chainId'],
+  onSuccess?: () => void,
+) => {
+  const sdkUnchecked = await getUncheckedSafeSDK(onboard, chainId)
+  const eventParams = { groupKey: CF_TX_GROUP_KEY }
+
+  let result: ContractTransactionResponse | undefined
+  try {
+    const signedTx = await tryOffChainTxSigning(safeTx, await sdkUnchecked.getContractVersion(), sdkUnchecked)
+
+    const wallet = await assertWalletChain(onboard, chainId)
+    const provider = createWeb3(wallet.provider)
+    const signer = await provider.getSigner()
+
+    const deploymentTx = await sdkUnchecked.wrapSafeTransactionIntoDeploymentBatch(signedTx, txOptions)
+
+    // We need to estimate the actual gasLimit after the user has signed since it is more accurate than what useDeployGasLimit returns
+    const gas = await signer.estimateGas({ data: deploymentTx.data, value: deploymentTx.value, to: deploymentTx.to })
+
+    // @ts-ignore TODO: Check why TransactionResponse type doesn't work
+    result = await signer.sendTransaction({ ...deploymentTx, gasLimit: gas })
+    txDispatch(TxEvent.EXECUTING, eventParams)
+  } catch (error) {
+    txDispatch(TxEvent.FAILED, { ...eventParams, error: asError(error) })
+    throw error
+  }
+
+  txDispatch(TxEvent.PROCESSING, { ...eventParams, txHash: result!.hash })
+
+  result
+    ?.wait()
+    .then((receipt) => {
+      if (receipt === null) {
+        txDispatch(TxEvent.FAILED, { ...eventParams, error: new Error('No transaction receipt found') })
+      } else if (didRevert(receipt)) {
+        txDispatch(TxEvent.REVERTED, { ...eventParams, error: new Error('Transaction reverted by EVM') })
+      } else {
+        txDispatch(TxEvent.SUCCESS, eventParams)
+        onSuccess?.()
+      }
+    })
+    .catch((err) => {
+      const error = err as EthersError
+
+      if (didReprice(error)) {
+        txDispatch(TxEvent.SUCCESS, eventParams)
+        onSuccess?.()
+      } else {
+        txDispatch(TxEvent.FAILED, { ...eventParams, error: asError(error) })
+      }
+    })
+
+  return result!.hash
+}
+
+export const deploySafeAndExecuteTx = async (
+  txOptions: TransactionOptions,
+  chainId: string,
+  wallet: ConnectedWallet | null,
+  safeTx?: SafeTransaction,
+  onboard?: OnboardAPI,
+  onSuccess?: () => void,
+) => {
+  assertTx(safeTx)
+  assertWallet(wallet)
+  assertOnboard(onboard)
+
+  return dispatchTxExecutionAndDeploySafe(safeTx, txOptions, onboard, chainId, onSuccess)
+}
+
+export const { getStore: getNativeBalance, setStore: setNativeBalance } = new ExternalStore<bigint>(0n)
+
+export const getCounterfactualBalance = async (
+  safeAddress: string,
+  provider?: BrowserProvider,
+  chain?: ChainInfo,
+  ignoreCache?: boolean,
+) => {
+  let balance: bigint | undefined
+
+  if (!chain) return undefined
+
+  // Fetch balance via the connected wallet.
+  // If there is no wallet connected we fetch and cache the balance instead
+  if (provider) {
+    balance = await provider.getBalance(safeAddress)
+  } else {
+    const cachedBalance = getNativeBalance()
+    const useCache = cachedBalance && cachedBalance > 0n && !ignoreCache
+    balance = useCache ? cachedBalance : (await getWeb3ReadOnly()?.getBalance(safeAddress)) || 0n
+    setNativeBalance(balance)
+  }
+
+  return <SafeBalanceResponse>{
+    fiatTotal: '0',
+    items: [
+      {
+        tokenInfo: {
+          type: TokenType.NATIVE_TOKEN,
+          address: ZERO_ADDRESS,
+          ...chain?.nativeCurrency,
+        },
+        balance: balance?.toString(),
+        fiatBalance: '0',
+        fiatConversion: '0',
+      },
+    ],
+  }
+}
+
+export const createCounterfactualSafe = (
+  chain: ChainInfo,
+  safeAddress: string,
+  saltNonce: string,
+  data: NewSafeFormData,
+  dispatch: AppDispatch,
+  props: DeploySafeProps,
+  router: NextRouter,
+) => {
+  const undeployedSafe = {
+    chainId: chain.chainId,
+    address: safeAddress,
+    safeProps: {
+      safeAccountConfig: props.safeAccountConfig,
+      safeDeploymentConfig: {
+        saltNonce,
+        safeVersion: LATEST_SAFE_VERSION as SafeVersion,
+      },
+    },
+  }
+
+  dispatch(addUndeployedSafe(undeployedSafe))
+  dispatch(upsertAddressBookEntry({ chainId: chain.chainId, address: safeAddress, name: data.name }))
+  dispatch(
+    addOrUpdateSafe({
+      safe: {
+        ...defaultSafeInfo,
+        address: { value: safeAddress, name: data.name },
+        threshold: data.threshold,
+        owners: data.owners.map((owner) => ({
+          value: owner.address,
+          name: owner.name || owner.ens,
+        })),
+        chainId: chain.chainId,
+      },
+    }),
+  )
+  router.push({
+    pathname: AppRoutes.home,
+    query: { safe: `${chain.shortName}:${safeAddress}`, [CREATION_MODAL_QUERY_PARM]: true },
+  })
+}
+
+export const showSubmitNotification = (dispatch: AppDispatch, chain?: ChainInfo, txHash?: string) => {
+  const link = chain && txHash ? getBlockExplorerLink(chain, txHash) : undefined
+  dispatch(
+    showNotification({
+      variant: 'info',
+      groupKey: CF_TX_GROUP_KEY,
+      message: 'Safe Account activation in progress',
+      detailedMessage: 'Your Safe Account will be deployed onchain after the transaction is executed.',
+      link: link ? { href: link.href, title: link.title } : undefined,
+    }),
+  )
+}
diff --git a/src/features/walletconnect/__tests__/WalletConnectContext.test.tsx b/src/features/walletconnect/__tests__/WalletConnectContext.test.tsx
index 1019fad1b8..54ecde09ed 100644
--- a/src/features/walletconnect/__tests__/WalletConnectContext.test.tsx
+++ b/src/features/walletconnect/__tests__/WalletConnectContext.test.tsx
@@ -1,3 +1,4 @@
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { toBeHex } from 'ethers'
 import { useContext } from 'react'
 import type { SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
@@ -42,6 +43,14 @@ const TestComponent = () => {
 }
 
 describe('WalletConnectProvider', () => {
+  const extendedSafeInfo = {
+    ...extendedSafeInfoBuilder().build(),
+    address: {
+      value: toBeHex('0x123', 20),
+    },
+    chainId: '5',
+  }
+
   beforeEach(() => {
     jest.resetAllMocks()
     jest.restoreAllMocks()
@@ -59,12 +68,7 @@ describe('WalletConnectProvider', () => {
         initialReduxState: {
           safeInfo: {
             loading: false,
-            data: {
-              address: {
-                value: toBeHex('0x123', 20),
-              },
-              chainId: '5',
-            } as SafeInfo,
+            data: extendedSafeInfo,
           },
         },
       },
@@ -89,12 +93,7 @@ describe('WalletConnectProvider', () => {
         initialReduxState: {
           safeInfo: {
             loading: false,
-            data: {
-              address: {
-                value: toBeHex('0x123', 20),
-              },
-              chainId: '5',
-            } as SafeInfo,
+            data: extendedSafeInfo,
           },
         },
       },
@@ -106,6 +105,14 @@ describe('WalletConnectProvider', () => {
   })
 
   describe('updateSessions', () => {
+    const extendedSafeInfo = {
+      ...extendedSafeInfoBuilder().build(),
+      address: {
+        value: toBeHex('0x123', 20),
+      },
+      chainId: '5',
+    }
+
     const getUpdateSafeInfoComponent = (safeInfo: SafeInfo) => {
       // eslint-disable-next-line react/display-name
       return () => {
@@ -114,7 +121,7 @@ describe('WalletConnectProvider', () => {
           dispatch(
             safeInfoSlice.actions.set({
               loading: false,
-              data: safeInfo,
+              data: { ...extendedSafeInfo, ...safeInfo },
             }),
           )
         }
@@ -141,12 +148,7 @@ describe('WalletConnectProvider', () => {
           initialReduxState: {
             safeInfo: {
               loading: false,
-              data: {
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-                chainId: '5',
-              } as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
@@ -183,11 +185,12 @@ describe('WalletConnectProvider', () => {
             safeInfo: {
               loading: false,
               data: {
+                ...extendedSafeInfo,
                 address: {
                   value: toBeHex('0x123', 20),
                 },
                 chainId: '5',
-              } as SafeInfo,
+              },
             },
           },
         },
@@ -220,11 +223,12 @@ describe('WalletConnectProvider', () => {
             safeInfo: {
               loading: false,
               data: {
+                ...extendedSafeInfo,
                 address: {
                   value: toBeHex('0x123', 20),
                 },
                 chainId: '5',
-              } as SafeInfo,
+              },
             },
           },
         },
@@ -237,6 +241,14 @@ describe('WalletConnectProvider', () => {
   })
 
   describe('onRequest', () => {
+    const extendedSafeInfo = {
+      ...extendedSafeInfoBuilder().build(),
+      address: {
+        value: toBeHex('0x123', 20),
+      },
+      chainId: '5',
+    }
+
     it('does not continue with the request if there is no matching topic', async () => {
       jest.spyOn(WalletConnectWallet.prototype, 'init').mockImplementation(() => Promise.resolve())
       jest.spyOn(WalletConnectWallet.prototype, 'updateSessions').mockImplementation(() => Promise.resolve())
@@ -261,12 +273,7 @@ describe('WalletConnectProvider', () => {
           initialReduxState: {
             safeInfo: {
               loading: false,
-              data: {
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-                chainId: '5',
-              } as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
@@ -325,12 +332,7 @@ describe('WalletConnectProvider', () => {
           initialReduxState: {
             safeInfo: {
               loading: false,
-              data: {
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-                chainId: '5',
-              } as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
@@ -397,12 +399,7 @@ describe('WalletConnectProvider', () => {
           initialReduxState: {
             safeInfo: {
               loading: false,
-              data: {
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-                chainId: '5',
-              } as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
@@ -477,12 +474,7 @@ describe('WalletConnectProvider', () => {
           initialReduxState: {
             safeInfo: {
               loading: false,
-              data: {
-                address: {
-                  value: toBeHex('0x123', 20),
-                },
-                chainId: '5',
-              } as SafeInfo,
+              data: extendedSafeInfo,
             },
           },
         },
diff --git a/src/features/walletconnect/components/WcProposalForm/__tests__/useCompatibilityWarning.test.ts b/src/features/walletconnect/components/WcProposalForm/__tests__/useCompatibilityWarning.test.ts
index 747bf1eff9..039fe6d1f8 100644
--- a/src/features/walletconnect/components/WcProposalForm/__tests__/useCompatibilityWarning.test.ts
+++ b/src/features/walletconnect/components/WcProposalForm/__tests__/useCompatibilityWarning.test.ts
@@ -1,5 +1,6 @@
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { renderHook } from '@/tests/test-utils'
-import type { ChainInfo, SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
+import type { ChainInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import type { Web3WalletTypes } from '@walletconnect/web3wallet'
 import { useCompatibilityWarning } from '../useCompatibilityWarning'
 import * as wcUtils from '@/features/walletconnect/services/utils'
@@ -141,9 +142,10 @@ describe('useCompatibilityWarning', () => {
             loading: false,
             error: undefined,
             data: {
-              address: {},
+              ...extendedSafeInfoBuilder().build(),
+              address: { value: '' },
               chainId: '1',
-            } as unknown as SafeInfo,
+            },
           },
         },
       })
diff --git a/src/features/walletconnect/services/__tests__/WalletConnectWallet.test.ts b/src/features/walletconnect/services/__tests__/WalletConnectWallet.test.ts
index c963bfbbcf..ce86f0dbbb 100644
--- a/src/features/walletconnect/services/__tests__/WalletConnectWallet.test.ts
+++ b/src/features/walletconnect/services/__tests__/WalletConnectWallet.test.ts
@@ -274,6 +274,7 @@ describe('WalletConnectWallet', () => {
             },
             requiredNamespaces: {} as ProposalTypes.RequiredNamespaces,
             optionalNamespaces: {} as ProposalTypes.OptionalNamespaces,
+            expiryTimestamp: 2,
           },
           verifyContext: {} as Verify.Context,
         },
@@ -311,6 +312,7 @@ describe('WalletConnectWallet', () => {
             },
             requiredNamespaces: {} as ProposalTypes.RequiredNamespaces,
             optionalNamespaces: {} as ProposalTypes.OptionalNamespaces,
+            expiryTimestamp: 2,
           },
           verifyContext: {} as Verify.Context,
         },
diff --git a/src/hooks/__tests__/useChainId.test.ts b/src/hooks/__tests__/useChainId.test.ts
index 521e871432..b93c047509 100644
--- a/src/hooks/__tests__/useChainId.test.ts
+++ b/src/hooks/__tests__/useChainId.test.ts
@@ -1,7 +1,5 @@
 import { useParams } from 'next/navigation'
 import useChainId from '@/hooks/useChainId'
-import { useAppDispatch } from '@/store'
-import { setLastChainId } from '@/store/sessionSlice'
 import { renderHook } from '@/tests/test-utils'
 import * as useWalletHook from '@/hooks/wallets/useWallet'
 import * as useChains from '@/hooks/useChains'
@@ -24,22 +22,6 @@ describe('useChainId hook', () => {
     })
   })
 
-  it('should read location.pathname if useRouter query.safe is empty', () => {
-    ;(useParams as any).mockImplementation(() => ({}))
-
-    Object.defineProperty(window, 'location', {
-      writable: true,
-      value: {
-        pathname: '/avax:0x0000000000000000000000000000000000000123/balances',
-        search: '',
-      },
-    })
-
-    const { result } = renderHook(() => useChainId())
-
-    expect(result.current).toEqual('43114')
-  })
-
   it('should read location.search if useRouter query.safe is empty', () => {
     ;(useParams as any).mockImplementation(() => ({}))
 
@@ -95,7 +77,7 @@ describe('useChainId hook', () => {
     expect(result.current).toBe('137')
   })
 
-  it('should return the wallet chain id if no chain in the URL and it is present in the chain configs', () => {
+  it('should return the wallet chain id if no chain in the URL and no last chain id', () => {
     ;(useParams as any).mockImplementation(() => ({}))
 
     jest.spyOn(useWalletHook, 'default').mockImplementation(
@@ -113,28 +95,10 @@ describe('useChainId hook', () => {
     expect(result.current).toBe('1337')
   })
 
-  it('should return the last used chain id if no chain in the URL and the connect wallet chain id is not present in the chain configs', () => {
-    ;(useParams as any).mockImplementation(() => ({}))
-
-    jest.spyOn(useWalletHook, 'default').mockImplementation(
-      () =>
-        ({
-          chainId: '1337',
-        } as ConnectedWallet),
-    )
-
-    jest.spyOn(useChains, 'default').mockImplementation(() => ({
-      configs: [],
-    }))
-
-    const { result } = renderHook(() => useChainId())
-    expect(result.current).toBe('11155111')
-  })
-
-  it('should return the last used chain id if no wallet is connected and there is no chain in the URL', () => {
+  it('should return the last chain id', () => {
     ;(useParams as any).mockImplementation(() => ({}))
 
-    renderHook(() => useAppDispatch()(setLastChainId('100')))
+    localStorage.setItem('SAFE_v2__session', `{"lastChainId": "100"}`)
 
     const { result } = renderHook(() => useChainId())
     expect(result.current).toBe('100')
diff --git a/src/hooks/__tests__/usePendingActions.test.ts b/src/hooks/__tests__/usePendingActions.test.ts
index cb476277cd..09c560a544 100644
--- a/src/hooks/__tests__/usePendingActions.test.ts
+++ b/src/hooks/__tests__/usePendingActions.test.ts
@@ -1,6 +1,7 @@
 import usePendingActions from '@/hooks/usePendingActions'
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { renderHook, waitFor } from '@/tests/test-utils'
-import type { SafeInfo, TransactionListPage, TransactionSummary } from '@safe-global/safe-gateway-typescript-sdk'
+import type { TransactionListPage, TransactionSummary } from '@safe-global/safe-gateway-typescript-sdk'
 import {
   ConflictType,
   DetailedExecutionInfoType,
@@ -46,8 +47,9 @@ describe('usePendingActions hook', () => {
     jest.spyOn(useSafeInfo, 'default').mockReturnValue({
       safeAddress: mockSafeAddress,
       safe: {
+        ...extendedSafeInfoBuilder().build(),
         chainId: '5',
-      } as SafeInfo,
+      },
       safeError: undefined,
       safeLoading: false,
       safeLoaded: true,
@@ -82,8 +84,9 @@ describe('usePendingActions hook', () => {
     jest.spyOn(useSafeInfo, 'default').mockReturnValue({
       safeAddress: mockSafeAddress,
       safe: {
+        ...extendedSafeInfoBuilder().build(),
         chainId: '5',
-      } as SafeInfo,
+      },
       safeError: undefined,
       safeLoading: false,
       safeLoaded: true,
@@ -153,8 +156,9 @@ describe('usePendingActions hook', () => {
     jest.spyOn(useSafeInfo, 'default').mockReturnValue({
       safeAddress: mockSafeAddress,
       safe: {
+        ...extendedSafeInfoBuilder().build(),
         chainId: '5',
-      } as SafeInfo,
+      },
       safeError: undefined,
       safeLoading: false,
       safeLoaded: true,
diff --git a/src/hooks/__tests__/usePendingTxs.test.ts b/src/hooks/__tests__/usePendingTxs.test.ts
index a40d25f367..724964d5b5 100644
--- a/src/hooks/__tests__/usePendingTxs.test.ts
+++ b/src/hooks/__tests__/usePendingTxs.test.ts
@@ -1,6 +1,7 @@
 import { type PendingTx } from '@/store/pendingTxsSlice'
+import { extendedSafeInfoBuilder } from '@/tests/builders/safe'
 import { act, renderHook } from '@/tests/test-utils'
-import type { Label, SafeInfo, Transaction } from '@safe-global/safe-gateway-typescript-sdk'
+import type { Label, Transaction } from '@safe-global/safe-gateway-typescript-sdk'
 import * as useSafeInfoHook from '@/hooks/useSafeInfo'
 import { useHasPendingTxs, usePendingTxsQueue } from '../usePendingTxs'
 
@@ -39,11 +40,12 @@ describe('usePendingTxsQueue', () => {
 
     jest.spyOn(useSafeInfoHook, 'default').mockImplementation(() => ({
       safe: {
+        ...extendedSafeInfoBuilder().build(),
         nonce: 100,
         threshold: 1,
         owners: [{ value: '0x123' }],
         chainId: '5',
-      } as SafeInfo,
+      },
       safeAddress: '0x0000000000000000000000000000000000000001',
       safeError: undefined,
       safeLoading: false,
diff --git a/src/hooks/coreSDK/__tests__/useInitSafeCoreSDK.test.ts b/src/hooks/coreSDK/__tests__/useInitSafeCoreSDK.test.ts
index d11c92f58b..c47cd38ca3 100644
--- a/src/hooks/coreSDK/__tests__/useInitSafeCoreSDK.test.ts
+++ b/src/hooks/coreSDK/__tests__/useInitSafeCoreSDK.test.ts
@@ -1,10 +1,10 @@
+import type { ExtendedSafeInfo } from '@/store/safeInfoSlice'
 import { renderHook } from '@/tests/test-utils'
 import { useInitSafeCoreSDK } from '@/hooks/coreSDK/useInitSafeCoreSDK'
 import * as web3 from '@/hooks/wallets/web3'
 import * as router from 'next/router'
 import * as useSafeInfo from '@/hooks/useSafeInfo'
 import * as coreSDK from '@/hooks/coreSDK/safeCoreSDK'
-import type { SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import { ImplementationVersionState } from '@safe-global/safe-gateway-typescript-sdk'
 import { waitFor } from '@testing-library/react'
 import type Safe from '@safe-global/protocol-kit'
@@ -24,7 +24,7 @@ describe('useInitSafeCoreSDK hook', () => {
         value: '0x1',
       },
       implementationVersionState: ImplementationVersionState.UP_TO_DATE,
-    } as SafeInfo,
+    } as ExtendedSafeInfo,
     safeAddress: mockSafeAddress,
     safeLoaded: true,
     safeError: undefined,
@@ -58,6 +58,7 @@ describe('useInitSafeCoreSDK hook', () => {
       provider: mockProvider,
       address: mockSafeInfo.safe.address.value,
       implementation: mockSafeInfo.safe.implementation.value,
+      undeployedSafe: undefined,
     })
 
     await waitFor(() => {
diff --git a/src/hooks/coreSDK/safeCoreSDK.ts b/src/hooks/coreSDK/safeCoreSDK.ts
index e3771f8a50..66d9e5eb67 100644
--- a/src/hooks/coreSDK/safeCoreSDK.ts
+++ b/src/hooks/coreSDK/safeCoreSDK.ts
@@ -5,7 +5,7 @@ import ExternalStore from '@/services/ExternalStore'
 import { Gnosis_safe__factory } from '@/types/contracts'
 import { invariant } from '@/utils/helpers'
 import type { BrowserProvider, Provider } from 'ethers'
-import Safe from '@safe-global/protocol-kit'
+import Safe, { type PredictedSafeProps } from '@safe-global/protocol-kit'
 import type { SafeVersion } from '@safe-global/safe-core-sdk-types'
 import { EthersAdapter } from '@safe-global/protocol-kit'
 import type { SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
@@ -54,6 +54,7 @@ type SafeCoreSDKProps = {
   version: SafeInfo['version']
   implementationVersionState: SafeInfo['implementationVersionState']
   implementation: SafeInfo['implementation']['value']
+  undeployedSafe?: PredictedSafeProps
 }
 
 // Safe Core SDK
@@ -64,6 +65,7 @@ export const initSafeSDK = async ({
   version,
   implementationVersionState,
   implementation,
+  undeployedSafe,
 }: SafeCoreSDKProps): Promise<Safe | undefined> => {
   const safeVersion = version ?? (await Gnosis_safe__factory.connect(address, provider).VERSION())
   let isL1SafeSingleton = chainId === chains.eth
@@ -88,6 +90,14 @@ export const initSafeSDK = async ({
     isL1SafeSingleton = true
   }
 
+  if (undeployedSafe) {
+    return Safe.create({
+      ethAdapter: createReadOnlyEthersAdapter(provider),
+      isL1SafeSingleton: isL1SafeSingleton,
+      predictedSafe: undeployedSafe,
+    })
+  }
+
   return Safe.create({
     ethAdapter: createReadOnlyEthersAdapter(provider),
     safeAddress: address,
diff --git a/src/hooks/coreSDK/useInitSafeCoreSDK.ts b/src/hooks/coreSDK/useInitSafeCoreSDK.ts
index 36912162c9..012502131e 100644
--- a/src/hooks/coreSDK/useInitSafeCoreSDK.ts
+++ b/src/hooks/coreSDK/useInitSafeCoreSDK.ts
@@ -1,10 +1,11 @@
+import { selectUndeployedSafe } from '@/features/counterfactual/store/undeployedSafesSlice'
 import { useEffect } from 'react'
 import { useRouter } from 'next/router'
 import useSafeInfo from '@/hooks/useSafeInfo'
 import { initSafeSDK, setSafeSDK } from '@/hooks/coreSDK/safeCoreSDK'
 import { trackError } from '@/services/exceptions'
 import ErrorCodes from '@/services/exceptions/ErrorCodes'
-import { useAppDispatch } from '@/store'
+import { useAppDispatch, useAppSelector } from '@/store'
 import { showNotification } from '@/store/notificationsSlice'
 import { useWeb3ReadOnly } from '@/hooks/wallets/web3'
 import { parsePrefixedAddress, sameAddress } from '@/utils/addresses'
@@ -18,6 +19,7 @@ export const useInitSafeCoreSDK = () => {
   const { query } = useRouter()
   const prefixedAddress = Array.isArray(query.safe) ? query.safe[0] : query.safe
   const { address } = parsePrefixedAddress(prefixedAddress || '')
+  const undeployedSafe = useAppSelector((state) => selectUndeployedSafe(state, safe.chainId, address))
 
   useEffect(() => {
     if (!safeLoaded || !web3ReadOnly || !sameAddress(address, safe.address.value)) {
@@ -34,6 +36,7 @@ export const useInitSafeCoreSDK = () => {
       version: safe.version,
       implementationVersionState: safe.implementationVersionState,
       implementation: safe.implementation.value,
+      undeployedSafe,
     })
       .then(setSafeSDK)
       .catch((_e) => {
@@ -58,5 +61,6 @@ export const useInitSafeCoreSDK = () => {
     safe.version,
     safeLoaded,
     web3ReadOnly,
+    undeployedSafe,
   ])
 }
diff --git a/src/hooks/loadables/useLoadBalances.ts b/src/hooks/loadables/useLoadBalances.ts
index a48c455146..3d52ffe067 100644
--- a/src/hooks/loadables/useLoadBalances.ts
+++ b/src/hooks/loadables/useLoadBalances.ts
@@ -1,3 +1,5 @@
+import { getCounterfactualBalance } from '@/features/counterfactual/utils'
+import { useWeb3 } from '@/hooks/wallets/web3'
 import { useEffect, useMemo } from 'react'
 import { getBalances, type SafeBalanceResponse } from '@safe-global/safe-gateway-typescript-sdk'
 import { useAppSelector } from '@/store'
@@ -27,19 +29,25 @@ export const useLoadBalances = (): AsyncResult<SafeBalanceResponse> => {
   const currency = useAppSelector(selectCurrency)
   const isTrustedTokenList = useTokenListSetting()
   const { safe, safeAddress } = useSafeInfo()
+  const web3 = useWeb3()
+  const chain = useCurrentChain()
   const chainId = safe.chainId
 
   // Re-fetch assets when the entire SafeInfo updates
-  const [data, error, loading] = useAsync<SafeBalanceResponse>(
+  const [data, error, loading] = useAsync<SafeBalanceResponse | undefined>(
     () => {
       if (!chainId || !safeAddress || isTrustedTokenList === undefined) return
 
+      if (!safe.deployed) {
+        return getCounterfactualBalance(safeAddress, web3, chain)
+      }
+
       return getBalances(chainId, safeAddress, currency, {
         trusted: isTrustedTokenList,
       })
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [safeAddress, chainId, currency, isTrustedTokenList, pollCount],
+    [safeAddress, chainId, currency, isTrustedTokenList, pollCount, safe.deployed, web3, chain],
     false, // don't clear data between polls
   )
 
diff --git a/src/hooks/loadables/useLoadSafeInfo.ts b/src/hooks/loadables/useLoadSafeInfo.ts
index 4a694444b1..96ae19e4ac 100644
--- a/src/hooks/loadables/useLoadSafeInfo.ts
+++ b/src/hooks/loadables/useLoadSafeInfo.ts
@@ -1,3 +1,6 @@
+import { selectUndeployedSafe } from '@/features/counterfactual/store/undeployedSafesSlice'
+import { getUndeployedSafeInfo } from '@/features/counterfactual/utils'
+import { useAppSelector } from '@/store'
 import { useEffect } from 'react'
 import { getSafeInfo, type SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import useAsync, { type AsyncResult } from '../useAsync'
@@ -14,12 +17,22 @@ export const useLoadSafeInfo = (): AsyncResult<SafeInfo> => {
   const [pollCount, resetPolling] = useIntervalCounter(POLLING_INTERVAL)
   const { safe } = useSafeInfo()
   const isStoredSafeValid = safe.chainId === chainId && safe.address.value === address
+  const undeployedSafe = useAppSelector((state) => selectUndeployedSafe(state, chainId, address))
 
-  const [data, error, loading] = useAsync<SafeInfo>(() => {
+  const [data, error, loading] = useAsync<SafeInfo | undefined>(async () => {
     if (!chainId || !address) return
-    return getSafeInfo(chainId, address)
+
+    /**
+     * This is the one place where we can't check for `safe.deployed` as we want to update that value
+     * when the local storage is cleared, so we have to check undeployedSafe
+     */
+    if (undeployedSafe) return getUndeployedSafeInfo(undeployedSafe, address, chainId)
+
+    const safeInfo = await getSafeInfo(chainId, address)
+
+    return { ...safeInfo, deployed: true }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [chainId, address, pollCount])
+  }, [chainId, address, pollCount, undeployedSafe])
 
   // Reset the counter when safe address/chainId changes
   useEffect(() => {
diff --git a/src/hooks/loadables/useLoadSafeMessages.ts b/src/hooks/loadables/useLoadSafeMessages.ts
index 7c695b39d8..867da23dcc 100644
--- a/src/hooks/loadables/useLoadSafeMessages.ts
+++ b/src/hooks/loadables/useLoadSafeMessages.ts
@@ -12,13 +12,13 @@ export const useLoadSafeMessages = (): AsyncResult<SafeMessageListPage> => {
 
   const [data, error, loading] = useAsync<SafeMessageListPage>(
     () => {
-      if (!safeLoaded) {
-        return
-      }
+      if (!safeLoaded) return
+      if (!safe.deployed) return Promise.resolve({ results: [] })
+
       return getSafeMessages(safe.chainId, safeAddress)
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [safeLoaded, safe.chainId, safeAddress, safe.messagesTag],
+    [safeLoaded, safe.chainId, safeAddress, safe.messagesTag, safe.deployed],
     false,
   )
 
diff --git a/src/hooks/loadables/useLoadTxHistory.ts b/src/hooks/loadables/useLoadTxHistory.ts
index a9b8dbeef3..284e139619 100644
--- a/src/hooks/loadables/useLoadTxHistory.ts
+++ b/src/hooks/loadables/useLoadTxHistory.ts
@@ -19,10 +19,12 @@ export const useLoadTxHistory = (): AsyncResult<TransactionListPage> => {
   const [data, error, loading] = useAsync<TransactionListPage>(
     () => {
       if (!safeLoaded) return
+      if (!safe.deployed) return Promise.resolve({ results: [] })
+
       return getTxHistory(chainId, safeAddress, hasDefaultTokenlist && showOnlyTrustedTransactions)
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [safeLoaded, chainId, safeAddress, showOnlyTrustedTransactions, hasDefaultTokenlist, txHistoryTag],
+    [safeLoaded, chainId, safeAddress, showOnlyTrustedTransactions, hasDefaultTokenlist, txHistoryTag, safe.deployed],
     false,
   )
 
diff --git a/src/hooks/loadables/useLoadTxQueue.ts b/src/hooks/loadables/useLoadTxQueue.ts
index 8cbaeacf66..b0e5c55078 100644
--- a/src/hooks/loadables/useLoadTxQueue.ts
+++ b/src/hooks/loadables/useLoadTxQueue.ts
@@ -10,16 +10,18 @@ export const useLoadTxQueue = (): AsyncResult<TransactionListPage> => {
   const { chainId, txQueuedTag, txHistoryTag } = safe
   const [proposedId, setProposedId] = useState<string>('')
   // N.B. we reload when txQueuedTag/txHistoryTag/proposedId changes as txQueuedTag alone is not enough
-  const reloadTag = txQueuedTag + txHistoryTag + proposedId
+  const reloadTag = (txQueuedTag ?? '') + (txHistoryTag ?? '') + proposedId
 
   // Re-fetch when chainId/address, or txQueueTag change
   const [data, error, loading] = useAsync<TransactionListPage>(
     () => {
       if (!safeLoaded) return
+      if (!safe.deployed) return Promise.resolve({ results: [] })
+
       return getTransactionQueue(chainId, safeAddress)
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [safeLoaded, chainId, safeAddress, reloadTag],
+    [safeLoaded, chainId, safeAddress, reloadTag, safe.deployed],
     false,
   )
 
diff --git a/src/hooks/useChainId.ts b/src/hooks/useChainId.ts
index 64ad9ec8c6..e5cc237be0 100644
--- a/src/hooks/useChainId.ts
+++ b/src/hooks/useChainId.ts
@@ -5,7 +5,6 @@ import chains from '@/config/chains'
 import { useAppSelector } from '@/store'
 import { selectSession } from '@/store/sessionSlice'
 import { parsePrefixedAddress } from '@/utils/addresses'
-import { prefixedAddressRe } from '@/utils/url'
 import useWallet from './wallets/useWallet'
 import useChains from './useChains'
 
@@ -14,19 +13,7 @@ const defaultChainId = IS_PRODUCTION ? chains.eth : chains.sep
 // Use the location object directly because Next.js's router.query is available only on mount
 const getLocationQuery = (): ParsedUrlQuery => {
   if (typeof location === 'undefined') return {}
-
   const query = parse(location.search.slice(1))
-
-  if (!query.safe) {
-    const pathParam = location.pathname.split('/')[1]
-    const safeParam = prefixedAddressRe.test(pathParam) ? pathParam : ''
-
-    // Path param -> query param
-    if (prefixedAddressRe.test(pathParam)) {
-      query.safe = safeParam
-    }
-  }
-
   return query
 }
 
@@ -47,16 +34,20 @@ export const useUrlChainId = (): string | undefined => {
   return chains[shortName] || configs.find((item) => item.shortName === shortName)?.chainId
 }
 
-export const useChainId = (): string => {
-  const session = useAppSelector(selectSession)
-  const urlChainId = useUrlChainId()
+const useWalletChainId = (): string | undefined => {
   const wallet = useWallet()
   const { configs } = useChains()
-
   const walletChainId =
     wallet?.chainId && configs.some(({ chainId }) => chainId === wallet.chainId) ? wallet.chainId : undefined
+  return walletChainId
+}
+
+export const useChainId = (): string => {
+  const session = useAppSelector(selectSession)
+  const urlChainId = useUrlChainId()
+  const walletChainId = useWalletChainId()
 
-  return urlChainId || walletChainId || session.lastChainId || defaultChainId
+  return urlChainId || session.lastChainId || walletChainId || defaultChainId
 }
 
 export default useChainId
diff --git a/src/hooks/useCollectibles.ts b/src/hooks/useCollectibles.ts
index f6257de6ac..ee1601ce08 100644
--- a/src/hooks/useCollectibles.ts
+++ b/src/hooks/useCollectibles.ts
@@ -9,8 +9,10 @@ export const useCollectibles = (pageUrl?: string): AsyncResult<SafeCollectiblesP
 
   const [data, error, loading] = useAsync<SafeCollectiblesPage>(() => {
     if (!safeAddress) return
+    if (!safe.deployed) return Promise.resolve({ results: [] })
+
     return getCollectiblesPage(safe.chainId, safeAddress, undefined, pageUrl)
-  }, [safeAddress, safe.chainId, pageUrl])
+  }, [safeAddress, safe.chainId, pageUrl, safe.deployed])
 
   // Log errors
   useEffect(() => {
diff --git a/src/hooks/useGasPrice.ts b/src/hooks/useGasPrice.ts
index 6074cd65f2..a5c6ba9ef5 100644
--- a/src/hooks/useGasPrice.ts
+++ b/src/hooks/useGasPrice.ts
@@ -1,5 +1,7 @@
+import { formatVisualAmount } from '@/utils/formatters'
 import type { FeeData } from 'ethers'
 import type {
+  ChainInfo,
   GasPrice,
   GasPriceFixed,
   GasPriceFixedEIP1559,
@@ -133,6 +135,17 @@ export const getTotalFee = (
   return (maxFeePerGas + (maxPriorityFeePerGas || 0n)) * gasLimit
 }
 
+export const getTotalFeeFormatted = (
+  maxFeePerGas: bigint | null | undefined,
+  maxPriorityFeePerGas: bigint | null | undefined,
+  gasLimit: bigint | undefined,
+  chain: ChainInfo | undefined,
+) => {
+  return gasLimit && maxFeePerGas
+    ? formatVisualAmount(getTotalFee(maxFeePerGas, maxPriorityFeePerGas, gasLimit), chain?.nativeCurrency.decimals)
+    : '> 0.001'
+}
+
 const useGasPrice = (): AsyncResult<GasFeeParams> => {
   const chain = useCurrentChain()
   const gasPriceConfigs = chain?.gasPrice
diff --git a/src/hooks/useIsSidebarRoute.ts b/src/hooks/useIsSidebarRoute.ts
index 287fc689cd..1b89b2f606 100644
--- a/src/hooks/useIsSidebarRoute.ts
+++ b/src/hooks/useIsSidebarRoute.ts
@@ -9,6 +9,7 @@ const NO_SIDEBAR_ROUTES = [
   AppRoutes.index,
   AppRoutes.welcome.index,
   AppRoutes.welcome.socialLogin,
+  AppRoutes.welcome.accounts,
   AppRoutes.imprint,
   AppRoutes.privacy,
   AppRoutes.cookie,
diff --git a/src/hooks/useSafeInfo.ts b/src/hooks/useSafeInfo.ts
index 6575e20f95..ea22d5b197 100644
--- a/src/hooks/useSafeInfo.ts
+++ b/src/hooks/useSafeInfo.ts
@@ -1,11 +1,10 @@
 import { useMemo } from 'react'
 import isEqual from 'lodash/isEqual'
-import { type SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import { useAppSelector } from '@/store'
-import { defaultSafeInfo, selectSafeInfo } from '@/store/safeInfoSlice'
+import { defaultSafeInfo, type ExtendedSafeInfo, selectSafeInfo } from '@/store/safeInfoSlice'
 
 const useSafeInfo = (): {
-  safe: SafeInfo
+  safe: ExtendedSafeInfo
   safeAddress: string
   safeLoaded: boolean
   safeLoading: boolean
diff --git a/src/hooks/useWalletCanPay.ts b/src/hooks/useWalletCanPay.ts
index f3990f023b..339c5a19bd 100644
--- a/src/hooks/useWalletCanPay.ts
+++ b/src/hooks/useWalletCanPay.ts
@@ -1,3 +1,4 @@
+import { getTotalFee } from '@/hooks/useGasPrice'
 import useWalletBalance from '@/hooks/wallets/useWalletBalance'
 
 const useWalletCanPay = ({
@@ -15,7 +16,7 @@ const useWalletCanPay = ({
   // if gasLimit, maxFeePerGas or their walletBalance are missing
   if (!gasLimit || !maxFeePerGas || walletBalance === undefined) return true
 
-  const totalFee = (maxFeePerGas + BigInt(maxPriorityFeePerGas || 0)) * gasLimit
+  const totalFee = getTotalFee(maxFeePerGas, maxPriorityFeePerGas, gasLimit)
 
   return walletBalance >= totalFee
 }
diff --git a/src/hooks/wallets/useInitWeb3.ts b/src/hooks/wallets/useInitWeb3.ts
index 1015214a39..e9e897ef35 100644
--- a/src/hooks/wallets/useInitWeb3.ts
+++ b/src/hooks/wallets/useInitWeb3.ts
@@ -9,7 +9,6 @@ import { selectRpc } from '@/store/settingsSlice'
 export const useInitWeb3 = () => {
   const chain = useCurrentChain()
   const chainId = chain?.chainId
-  const rpcUri = chain?.rpcUri
   const wallet = useWallet()
   const customRpc = useAppSelector(selectRpc)
   const customRpcUrl = chain ? customRpc?.[chain.chainId] : undefined
@@ -24,11 +23,11 @@ export const useInitWeb3 = () => {
   }, [wallet, chainId])
 
   useEffect(() => {
-    if (!rpcUri) {
+    if (!chain) {
       setWeb3ReadOnly(undefined)
       return
     }
-    const web3ReadOnly = createWeb3ReadOnly(rpcUri, customRpcUrl)
+    const web3ReadOnly = createWeb3ReadOnly(chain, customRpcUrl)
     setWeb3ReadOnly(web3ReadOnly)
-  }, [rpcUri, customRpcUrl])
+  }, [chain, customRpcUrl])
 }
diff --git a/src/hooks/wallets/web3.ts b/src/hooks/wallets/web3.ts
index 181b1875ef..a80cfdc1bb 100644
--- a/src/hooks/wallets/web3.ts
+++ b/src/hooks/wallets/web3.ts
@@ -1,4 +1,4 @@
-import { RPC_AUTHENTICATION, type RpcUri } from '@safe-global/safe-gateway-typescript-sdk'
+import { type ChainInfo, RPC_AUTHENTICATION, type RpcUri } from '@safe-global/safe-gateway-typescript-sdk'
 import { INFURA_TOKEN, SAFE_APPS_INFURA_TOKEN } from '@/config/constants'
 import { JsonRpcProvider, BrowserProvider, type Eip1193Provider, type Provider } from 'ethers'
 import ExternalStore from '@/services/ExternalStore'
@@ -20,20 +20,24 @@ export const getRpcServiceUrl = (rpcUri: RpcUri): string => {
   return formatRpcServiceUrl(rpcUri, INFURA_TOKEN)
 }
 
-export const createWeb3ReadOnly = (rpcUri: RpcUri, customRpc?: string): JsonRpcProvider | undefined => {
-  const url = customRpc || getRpcServiceUrl(rpcUri)
+export const createWeb3ReadOnly = (chain: ChainInfo, customRpc?: string): JsonRpcProvider | undefined => {
+  const url = customRpc || getRpcServiceUrl(chain.rpcUri)
   if (!url) return
-  return new JsonRpcProvider(url)
+  return new JsonRpcProvider(url, undefined, {
+    staticNetwork: true,
+  })
 }
 
 export const createWeb3 = (walletProvider: Eip1193Provider): BrowserProvider => {
   return new BrowserProvider(walletProvider)
 }
 
-export const createSafeAppsWeb3Provider = (safeAppsRpcUri: RpcUri, customRpc?: string): JsonRpcProvider | undefined => {
-  const url = customRpc || formatRpcServiceUrl(safeAppsRpcUri, SAFE_APPS_INFURA_TOKEN)
+export const createSafeAppsWeb3Provider = (chain: ChainInfo, customRpc?: string): JsonRpcProvider | undefined => {
+  const url = customRpc || formatRpcServiceUrl(chain.rpcUri, SAFE_APPS_INFURA_TOKEN)
   if (!url) return
-  return new JsonRpcProvider(url)
+  return new JsonRpcProvider(url, undefined, {
+    staticNetwork: true,
+  })
 }
 
 export const { setStore: setWeb3, useStore: useWeb3 } = new ExternalStore<BrowserProvider>()
diff --git a/src/pages/settings/setup.tsx b/src/pages/settings/setup.tsx
index 3229762803..414c1f0da7 100644
--- a/src/pages/settings/setup.tsx
+++ b/src/pages/settings/setup.tsx
@@ -1,3 +1,4 @@
+import ActivateAccount from '@/features/counterfactual/ActivateAccount'
 import type { NextPage } from 'next'
 import Head from 'next/head'
 import { Grid, Paper, Skeleton, SvgIcon, Tooltip, Typography } from '@mui/material'
@@ -24,6 +25,8 @@ const Setup: NextPage = () => {
       <SettingsHeader />
 
       <main>
+        <ActivateAccount />
+
         <Paper data-testid="setup-section" sx={{ p: 4, mb: 2 }}>
           <Grid container spacing={3}>
             <Grid item lg={4} xs={12}>
diff --git a/src/pages/welcome/accounts.tsx b/src/pages/welcome/accounts.tsx
new file mode 100644
index 0000000000..b85f0a906e
--- /dev/null
+++ b/src/pages/welcome/accounts.tsx
@@ -0,0 +1,17 @@
+import type { NextPage } from 'next'
+import Head from 'next/head'
+import MyAccounts from '@/components/welcome/MyAccounts'
+
+const Accounts: NextPage = () => {
+  return (
+    <>
+      <Head>
+        <title>{'Safe{Wallet} – My accounts'}</title>
+      </Head>
+
+      <MyAccounts />
+    </>
+  )
+}
+
+export default Accounts
diff --git a/src/services/analytics/__tests__/tx-tracking.test.ts b/src/services/analytics/__tests__/tx-tracking.test.ts
index 7c0dac6150..dc2abb999e 100644
--- a/src/services/analytics/__tests__/tx-tracking.test.ts
+++ b/src/services/analytics/__tests__/tx-tracking.test.ts
@@ -161,7 +161,7 @@ describe('getTransactionTrackingType', () => {
       },
     } as unknown)
 
-    expect(txType).toEqual(TX_TYPES.safeapps)
+    expect(txType).toEqual('https://gnosis-safe.io/app')
   })
 
   it('should return batch for multisend transactions', async () => {
diff --git a/src/services/analytics/events/createLoadSafe.ts b/src/services/analytics/events/createLoadSafe.ts
index 29c1ddaa36..f385527f4f 100644
--- a/src/services/analytics/events/createLoadSafe.ts
+++ b/src/services/analytics/events/createLoadSafe.ts
@@ -8,6 +8,11 @@ export const CREATE_SAFE_EVENTS = {
     category: CREATE_SAFE_CATEGORY,
     event: EventType.META,
   },
+  CONTINUE_TO_MY_ACCOUNTS: {
+    action: 'Continue to my accounts',
+    category: CREATE_SAFE_CATEGORY,
+    event: EventType.META,
+  },
   OPEN_SAFE_CREATION: {
     action: 'Open stepper',
     category: CREATE_SAFE_CATEGORY,
diff --git a/src/services/analytics/events/overview.ts b/src/services/analytics/events/overview.ts
index 514a3b7286..d5f6f0b28e 100644
--- a/src/services/analytics/events/overview.ts
+++ b/src/services/analytics/events/overview.ts
@@ -108,10 +108,19 @@ export const OVERVIEW_EVENTS = {
     action: 'Buy crypto button',
     category: OVERVIEW_CATEGORY,
   },
+  SHOW_MORE_SAFES: {
+    action: 'Show more Safes',
+    category: OVERVIEW_CATEGORY,
+  },
+  CREATE_NEW_SAFE: {
+    action: 'Create new Safe',
+    category: OVERVIEW_CATEGORY,
+  },
 }
 
 export enum OPEN_SAFE_LABELS {
   sidebar = 'sidebar',
   after_create = 'after_create',
   after_add = 'after_add',
+  login_page = 'login_page',
 }
diff --git a/src/services/analytics/events/transactions.ts b/src/services/analytics/events/transactions.ts
index 1ba910a40e..cbb3c1d1c9 100644
--- a/src/services/analytics/events/transactions.ts
+++ b/src/services/analytics/events/transactions.ts
@@ -19,7 +19,6 @@ export enum TX_TYPES {
   batch = 'batch',
   rejection = 'rejection',
   typed_message = 'typed_message',
-  safeapps = 'safeapps',
   walletconnect = 'walletconnect',
   custom = 'custom',
 }
diff --git a/src/services/analytics/tx-tracking.ts b/src/services/analytics/tx-tracking.ts
index 05b7354b57..6ba2d7462a 100644
--- a/src/services/analytics/tx-tracking.ts
+++ b/src/services/analytics/tx-tracking.ts
@@ -56,7 +56,7 @@ export const getTransactionTrackingType = async (chainId: string, txId: string):
     }
 
     if (details.safeAppInfo) {
-      return isWalletConnectSafeApp(details.safeAppInfo.url) ? TX_TYPES.walletconnect : TX_TYPES.safeapps
+      return isWalletConnectSafeApp(details.safeAppInfo.url) ? TX_TYPES.walletconnect : details.safeAppInfo.url
     }
 
     if (isMultiSendTxInfo(txInfo)) {
diff --git a/src/services/ens/config.ts b/src/services/ens/config.ts
deleted file mode 100644
index 7f96cde9f6..0000000000
--- a/src/services/ens/config.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * @see https://docs.ens.domains/ens-deployments
- */
-export const CUSTOM_REGISTRIES: Record<string, string> = {
-  '11155111': '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e', // ENS on Sepolia
-}
diff --git a/src/services/ens/custom.ts b/src/services/ens/custom.ts
deleted file mode 100644
index ca6d629596..0000000000
--- a/src/services/ens/custom.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Contract, namehash, ZeroAddress, type Provider } from 'ethers'
-
-// ENS Registry ABI (simplified version)
-const ensRegistryAbi = ['function resolver(bytes32 node) external view returns (address)']
-const resolverAbi = ['function addr(bytes32 node) external view returns (address)']
-
-export const customResolveName = async (
-  registryAddress: string,
-  rpcProvider: Provider,
-  name: string,
-): Promise<string | undefined> => {
-  const ensRegistry = new Contract(registryAddress, ensRegistryAbi, rpcProvider)
-  const nhash = namehash(name)
-  const resolverAddress = await ensRegistry.resolver(nhash)
-
-  if (resolverAddress === ZeroAddress) {
-    return undefined
-  }
-
-  const resolver = new Contract(resolverAddress, resolverAbi, rpcProvider)
-  const address = await resolver.addr(nhash)
-
-  return address || undefined
-}
diff --git a/src/services/ens/index.test.ts b/src/services/ens/index.test.ts
index 42ac92a54a..c66abf42d8 100644
--- a/src/services/ens/index.test.ts
+++ b/src/services/ens/index.test.ts
@@ -4,7 +4,7 @@ import { logError } from '../exceptions'
 
 // mock rpcProvider
 const rpcProvider = {
-  resolveName: jest.fn(() => Promise.resolve('0x0000000000000000000000000000000000000000')),
+  resolveName: jest.fn(() => Promise.resolve('0x0000000000000000000000000000000000000001')),
   lookupAddress: jest.fn(() => Promise.resolve('safe.eth')),
   getNetwork: jest.fn(() => Promise.resolve({ chainId: 1 })),
 } as unknown as JsonRpcProvider
@@ -20,10 +20,6 @@ jest.mock('../exceptions', () => ({
   logError: jest.fn(),
 }))
 
-jest.mock('./custom', () => ({
-  customResolveName: jest.fn(() => Promise.resolve('0x0000001111111111111111111111111111111111')),
-}))
-
 describe('domains', () => {
   describe('isDomain', () => {
     it('should check the domain format', async () => {
@@ -37,7 +33,7 @@ describe('domains', () => {
 
   describe('resolveName', () => {
     it('should resolve names', async () => {
-      expect(await resolveName(rpcProvider, 'test.eth')).toBe('0x0000000000000000000000000000000000000000')
+      expect(await resolveName(rpcProvider, 'test.eth')).toBe('0x0000000000000000000000000000000000000001')
     })
 
     it('should return undefined and log on error', async () => {
@@ -45,15 +41,6 @@ describe('domains', () => {
       expect(address).toBe(undefined)
       expect(logError).toHaveBeenCalledWith('101: Failed to resolve the address', 'bad resolveName')
     })
-
-    it('should look up names on Sepolia', async () => {
-      // mock rpcProvider
-      const rpcProvider = {
-        getNetwork: jest.fn(() => Promise.resolve({ chainId: 11155111 })),
-      } as unknown as JsonRpcProvider
-
-      expect(await resolveName(rpcProvider, 'sepolia.eth')).toBe('0x0000001111111111111111111111111111111111')
-    })
   })
 
   describe('lookupAddress', () => {
diff --git a/src/services/ens/index.ts b/src/services/ens/index.ts
index 60b98da554..295f1368fc 100644
--- a/src/services/ens/index.ts
+++ b/src/services/ens/index.ts
@@ -1,8 +1,6 @@
 import { type Provider } from 'ethers'
 import { logError } from '../exceptions'
 import ErrorCodes from '../exceptions/ErrorCodes'
-import { CUSTOM_REGISTRIES } from './config'
-import { customResolveName } from './custom'
 
 type EthersError = Error & {
   reason?: string
@@ -22,12 +20,6 @@ export const resolveName = async (rpcProvider: Provider, name: string): Promise<
   } catch {}
 
   try {
-    // Try custom resolvers first
-    if (chainId && CUSTOM_REGISTRIES[chainId]) {
-      return await customResolveName(CUSTOM_REGISTRIES[chainId], rpcProvider, name)
-    }
-
-    // The default ENS resolver
     return (await rpcProvider.resolveName(name)) || undefined
   } catch (e) {
     const err = e as EthersError
diff --git a/src/services/safe-wallet-provider/useSafeWalletProvider.test.tsx b/src/services/safe-wallet-provider/useSafeWalletProvider.test.tsx
index 37c84502da..9150a12166 100644
--- a/src/services/safe-wallet-provider/useSafeWalletProvider.test.tsx
+++ b/src/services/safe-wallet-provider/useSafeWalletProvider.test.tsx
@@ -1,3 +1,4 @@
+import type { ExtendedSafeInfo } from '@/store/safeInfoSlice'
 import * as gateway from '@safe-global/safe-gateway-typescript-sdk'
 import * as router from 'next/router'
 
@@ -43,7 +44,8 @@ describe('useSafeWalletProvider', () => {
               address: {
                 value: '0x1234567890000000000000000000000000000000',
               },
-            } as gateway.SafeInfo,
+              deployed: true,
+            } as unknown as ExtendedSafeInfo,
           },
         },
       })
diff --git a/src/services/tx/__tests__/encodeSignatures.test.ts b/src/services/tx/__tests__/encodeSignatures.test.ts
index 28a7271806..c66c44bd41 100644
--- a/src/services/tx/__tests__/encodeSignatures.test.ts
+++ b/src/services/tx/__tests__/encodeSignatures.test.ts
@@ -32,6 +32,7 @@ describe('encodeSignatures', () => {
       data: '0xEEE',
       staticPart: () => '0xEEE',
       dynamicPart: () => '',
+      isContractSignature: false,
     })
 
     safeTx.addSignature({
@@ -39,6 +40,7 @@ describe('encodeSignatures', () => {
       data: '0xAAA',
       staticPart: () => '0xAAA',
       dynamicPart: () => '',
+      isContractSignature: false,
     })
 
     const owner = '0x123'
@@ -57,6 +59,7 @@ describe('encodeSignatures', () => {
       data: '0xAAA',
       staticPart: () => '0xAAA',
       dynamicPart: () => '',
+      isContractSignature: false,
     })
 
     const owner = '0x123'
diff --git a/src/services/tx/tx-sender/create.ts b/src/services/tx/tx-sender/create.ts
index edd5dd6cea..d0b71e067d 100644
--- a/src/services/tx/tx-sender/create.ts
+++ b/src/services/tx/tx-sender/create.ts
@@ -1,4 +1,7 @@
-import type { TransactionDetails } from '@safe-global/safe-gateway-typescript-sdk'
+import { LATEST_SAFE_VERSION } from '@/config/constants'
+import { getReadOnlyGnosisSafeContract } from '@/services/contracts/safeContracts'
+import { SENTINEL_ADDRESS } from '@safe-global/protocol-kit/dist/src/utils/constants'
+import type { ChainInfo, TransactionDetails } from '@safe-global/safe-gateway-typescript-sdk'
 import { getTransactionDetails } from '@safe-global/safe-gateway-typescript-sdk'
 import type { AddOwnerTxParams, RemoveOwnerTxParams, SwapOwnerTxParams } from '@safe-global/protocol-kit'
 import type { MetaTransactionData, SafeTransaction, SafeTransactionDataPartial } from '@safe-global/safe-core-sdk-types'
@@ -28,14 +31,49 @@ export const createRemoveOwnerTx = async (txParams: RemoveOwnerTxParams): Promis
   return safeSDK.createRemoveOwnerTx(txParams)
 }
 
-export const createAddOwnerTx = async (txParams: AddOwnerTxParams): Promise<SafeTransaction> => {
+export const createAddOwnerTx = async (
+  chain: ChainInfo,
+  isDeployed: boolean,
+  txParams: AddOwnerTxParams,
+): Promise<SafeTransaction> => {
   const safeSDK = getAndValidateSafeSDK()
-  return safeSDK.createAddOwnerTx(txParams)
+  if (isDeployed) return safeSDK.createAddOwnerTx(txParams)
+
+  const contract = await getReadOnlyGnosisSafeContract(chain, LATEST_SAFE_VERSION)
+  // @ts-ignore TODO: Fix overload issue
+  const data = contract.encode('addOwnerWithThreshold', [txParams.ownerAddress, txParams.threshold])
+
+  const tx = {
+    to: await safeSDK.getAddress(),
+    value: '0',
+    data,
+  }
+
+  return safeSDK.createTransaction({
+    transactions: [tx],
+  })
 }
 
-export const createSwapOwnerTx = async (txParams: SwapOwnerTxParams): Promise<SafeTransaction> => {
+export const createSwapOwnerTx = async (
+  chain: ChainInfo,
+  isDeployed: boolean,
+  txParams: SwapOwnerTxParams,
+): Promise<SafeTransaction> => {
   const safeSDK = getAndValidateSafeSDK()
-  return safeSDK.createSwapOwnerTx(txParams)
+  if (isDeployed) return safeSDK.createSwapOwnerTx(txParams)
+
+  const contract = await getReadOnlyGnosisSafeContract(chain, LATEST_SAFE_VERSION)
+  const data = contract.encode('swapOwner', [SENTINEL_ADDRESS, txParams.oldOwnerAddress, txParams.newOwnerAddress])
+
+  const tx = {
+    to: await safeSDK.getAddress(),
+    value: '0',
+    data,
+  }
+
+  return safeSDK.createTransaction({
+    transactions: [tx],
+  })
 }
 
 export const createUpdateThresholdTx = async (threshold: number): Promise<SafeTransaction> => {
diff --git a/src/store/index.ts b/src/store/index.ts
index 5053c84f8a..8258a6d6ba 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -29,6 +29,7 @@ import { safeAppsSlice } from './safeAppsSlice'
 import { safeMessagesListener, safeMessagesSlice } from './safeMessagesSlice'
 import { pendingSafeMessagesSlice } from './pendingSafeMessagesSlice'
 import { batchSlice } from './batchSlice'
+import { undeployedSafesSlice } from '@/features/counterfactual/store/undeployedSafesSlice'
 
 const rootReducer = combineReducers({
   [chainsSlice.name]: chainsSlice.reducer,
@@ -49,6 +50,7 @@ const rootReducer = combineReducers({
   [safeMessagesSlice.name]: safeMessagesSlice.reducer,
   [pendingSafeMessagesSlice.name]: pendingSafeMessagesSlice.reducer,
   [batchSlice.name]: batchSlice.reducer,
+  [undeployedSafesSlice.name]: undeployedSafesSlice.reducer,
 })
 
 const persistedSlices: (keyof PreloadedState<RootState>)[] = [
@@ -61,6 +63,7 @@ const persistedSlices: (keyof PreloadedState<RootState>)[] = [
   safeAppsSlice.name,
   pendingSafeMessagesSlice.name,
   batchSlice.name,
+  undeployedSafesSlice.name,
 ]
 
 export const getPersistedState = () => {
diff --git a/src/store/safeInfoSlice.ts b/src/store/safeInfoSlice.ts
index a7dbcfafa7..d6a122f3a3 100644
--- a/src/store/safeInfoSlice.ts
+++ b/src/store/safeInfoSlice.ts
@@ -1,7 +1,9 @@
 import { type SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import { makeLoadableSlice } from './common'
 
-export const defaultSafeInfo: SafeInfo = {
+export type ExtendedSafeInfo = SafeInfo & { deployed: boolean }
+
+export const defaultSafeInfo: ExtendedSafeInfo = {
   address: { value: '' },
   chainId: '',
   nonce: -1,
@@ -17,9 +19,10 @@ export const defaultSafeInfo: SafeInfo = {
   txQueuedTag: '',
   txHistoryTag: '',
   messagesTag: '',
+  deployed: true,
 }
 
-const { slice, selector } = makeLoadableSlice('safeInfo', undefined as SafeInfo | undefined)
+const { slice, selector } = makeLoadableSlice('safeInfo', undefined as ExtendedSafeInfo | undefined)
 
 export const safeInfoSlice = slice
 export const selectSafeInfo = selector
diff --git a/src/tests/builders/safe.ts b/src/tests/builders/safe.ts
index d1b6fbf6c5..91db6ba631 100644
--- a/src/tests/builders/safe.ts
+++ b/src/tests/builders/safe.ts
@@ -1,3 +1,4 @@
+import type { ExtendedSafeInfo } from '@/store/safeInfoSlice'
 import { faker } from '@faker-js/faker'
 import { ImplementationVersionState } from '@safe-global/safe-gateway-typescript-sdk'
 import type { SafeInfo, AddressEx } from '@safe-global/safe-gateway-typescript-sdk'
@@ -37,3 +38,10 @@ export function safeInfoBuilder(): IBuilder<SafeInfo> {
     messagesTag: faker.string.numeric(),
   })
 }
+
+export function extendedSafeInfoBuilder(): IBuilder<ExtendedSafeInfo> {
+  return Builder.new<ExtendedSafeInfo>().with({
+    ...safeInfoBuilder().build(),
+    deployed: faker.datatype.boolean(),
+  })
+}
diff --git a/src/tests/mocks/chains.ts b/src/tests/mocks/chains.ts
index dd99cfadeb..9d0f6cfeb8 100644
--- a/src/tests/mocks/chains.ts
+++ b/src/tests/mocks/chains.ts
@@ -8,6 +8,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Ethereum',
     shortName: 'eth',
     l2: false,
+    isTestnet: false,
     description: 'The main Ethereum network',
     rpcUri: { authentication: RPC_AUTHENTICATION.API_KEY_PATH, value: 'https://mainnet.infura.io/v3/' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.API_KEY_PATH, value: 'https://mainnet.infura.io/v3/' },
@@ -57,6 +58,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Gnosis Chain',
     shortName: 'gno',
     l2: true,
+    isTestnet: false,
     description: '',
     rpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://rpc.gnosischain.com/' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://rpc.gnosischain.com/' },
@@ -105,6 +107,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Polygon',
     shortName: 'matic',
     l2: true,
+    isTestnet: false,
     description: 'L2 chain (MATIC)',
     rpcUri: { authentication: RPC_AUTHENTICATION.API_KEY_PATH, value: 'https://polygon-mainnet.infura.io/v3/' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.API_KEY_PATH, value: 'https://polygon-mainnet.infura.io/v3/' },
@@ -159,6 +162,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'BNB Smart Chain',
     shortName: 'bnb',
     l2: true,
+    isTestnet: false,
     description: '',
     rpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://bsc-dataseed.binance.org/' },
     safeAppsRpcUri: {
@@ -209,6 +213,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Energy Web Chain',
     shortName: 'ewt',
     l2: true,
+    isTestnet: false,
     description: '',
     rpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://rpc.energyweb.org' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://rpc.energyweb.org' },
@@ -257,6 +262,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Arbitrum',
     shortName: 'arb1',
     l2: true,
+    isTestnet: false,
     description: '',
     rpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://arb1.arbitrum.io/rpc' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://arb1.arbitrum.io/rpc' },
@@ -303,6 +309,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Aurora',
     shortName: 'aurora',
     l2: true,
+    isTestnet: false,
     description: '',
     rpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://mainnet.aurora.dev' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://mainnet.aurora.dev' },
@@ -344,6 +351,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Avalanche',
     shortName: 'avax',
     l2: true,
+    isTestnet: false,
     description: '',
     rpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://api.avax.network/ext/bc/C/rpc' },
     safeAppsRpcUri: {
@@ -397,6 +405,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Optimism',
     shortName: 'oeth',
     l2: true,
+    isTestnet: false,
     description: '',
     rpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://mainnet.optimism.io/' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://mainnet.optimism.io/' },
@@ -443,6 +452,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Goerli',
     shortName: 'gor',
     l2: true,
+    isTestnet: true,
     description: 'Ethereum Testnet Görli',
     rpcUri: { authentication: RPC_AUTHENTICATION.API_KEY_PATH, value: 'https://goerli.infura.io/v3/' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.API_KEY_PATH, value: 'https://goerli.infura.io/v3/' },
@@ -492,6 +502,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Rinkeby',
     shortName: 'rin',
     l2: false,
+    isTestnet: true,
     description: 'Ethereum testnet',
     rpcUri: { authentication: RPC_AUTHENTICATION.API_KEY_PATH, value: 'https://rinkeby.infura.io/v3/' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.API_KEY_PATH, value: 'https://rinkeby.infura.io/v3/' },
@@ -531,6 +542,7 @@ const CONFIG_SERVICE_CHAINS: ChainInfo[] = [
     chainName: 'Volta',
     shortName: 'vt',
     l2: true,
+    isTestnet: false,
     description: '',
     rpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://volta-rpc.energyweb.org' },
     safeAppsRpcUri: { authentication: RPC_AUTHENTICATION.NO_AUTHENTICATION, value: 'https://volta-rpc.energyweb.org' },
diff --git a/src/utils/chains.ts b/src/utils/chains.ts
index 471ca5bbdc..016458fd1e 100644
--- a/src/utils/chains.ts
+++ b/src/utils/chains.ts
@@ -18,6 +18,7 @@ export enum FEATURES {
   NATIVE_WALLETCONNECT = 'NATIVE_WALLETCONNECT',
   RECOVERY = 'RECOVERY',
   SOCIAL_LOGIN = 'SOCIAL_LOGIN',
+  COUNTERFACTUAL = 'COUNTERFACTUAL',
 }
 
 export const hasFeature = (chain: ChainInfo, feature: FEATURES): boolean => {
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index 6592417b31..0c90822e51 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -1,4 +1,8 @@
 // `assert` does not work with arrow functions
+import type { ConnectedWallet } from '@/hooks/wallets/useOnboard'
+import type { SafeTransaction } from '@safe-global/safe-core-sdk-types'
+import type { OnboardAPI } from '@web3-onboard/core'
+
 export function invariant<T extends unknown>(condition: T, error: string): asserts condition {
   if (condition) {
     return
@@ -6,3 +10,15 @@ export function invariant<T extends unknown>(condition: T, error: string): asser
 
   throw new Error(error)
 }
+
+export function assertTx(safeTx: SafeTransaction | undefined): asserts safeTx {
+  return invariant(safeTx, 'Transaction not provided')
+}
+
+export function assertWallet(wallet: ConnectedWallet | null): asserts wallet {
+  return invariant(wallet, 'Wallet not connected')
+}
+
+export function assertOnboard(onboard: OnboardAPI | undefined): asserts onboard {
+  return invariant(onboard, 'Onboard not connected')
+}
diff --git a/yarn.lock b/yarn.lock
index e7dfb5e69a..49b97edeec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4003,10 +4003,10 @@
     "@safe-global/safe-core-sdk-utils" "^1.7.4"
     ethers "5.7.2"
 
-"@safe-global/safe-gateway-typescript-sdk@^3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@safe-global/safe-gateway-typescript-sdk/-/safe-gateway-typescript-sdk-3.14.0.tgz#9581c524c1ea4956555f40761eb6b4007392aa82"
-  integrity sha512-/dqU66RvHw50n+7x3nwnJedq8V6iLQyoWitNdjx5cFTBmae+rpP+LvHq+LqZfXJVkB1qNytMdjFjdyES0t79gQ==
+"@safe-global/safe-gateway-typescript-sdk@^3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@safe-global/safe-gateway-typescript-sdk/-/safe-gateway-typescript-sdk-3.15.0.tgz#2a99e7eca7aecfad1f5e00744ffdd949cefa4f6a"
+  integrity sha512-zAzhPgUwzdp89ZrZwCAOImUyAQMQE0LQKcK4vLO5eMbfAcNOxz5g4eVdBRBRa+kVXxjyW5wii58ZlGaYUVBa7g==
 
 "@safe-global/safe-gateway-typescript-sdk@^3.5.3":
   version "3.12.0"
@@ -5749,6 +5749,29 @@
     lodash.isequal "4.5.0"
     uint8arrays "^3.1.0"
 
+"@walletconnect/core@2.11.1":
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.11.1.tgz#da2be26b8b6514c74f06dc9a5ffb450bdec3456d"
+  integrity sha512-T57Vd7YdbHPsy3tthBuwrhaZNafN0+PqjISFRNeJy/bsKdXxpJg2hGSARuOTpCO7V6VcaatqlaSMuG3DrnG5rA==
+  dependencies:
+    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/jsonrpc-provider" "1.0.13"
+    "@walletconnect/jsonrpc-types" "1.0.3"
+    "@walletconnect/jsonrpc-utils" "1.0.8"
+    "@walletconnect/jsonrpc-ws-connection" "1.0.14"
+    "@walletconnect/keyvaluestorage" "^1.1.1"
+    "@walletconnect/logger" "^2.0.1"
+    "@walletconnect/relay-api" "^1.0.9"
+    "@walletconnect/relay-auth" "^1.0.4"
+    "@walletconnect/safe-json" "^1.0.2"
+    "@walletconnect/time" "^1.0.2"
+    "@walletconnect/types" "2.11.1"
+    "@walletconnect/utils" "2.11.1"
+    events "^3.3.0"
+    isomorphic-unfetch "3.1.0"
+    lodash.isequal "4.5.0"
+    uint8arrays "^3.1.0"
+
 "@walletconnect/environment@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.1.tgz#1d7f82f0009ab821a2ba5ad5e5a7b8ae3b214cd7"
@@ -5919,6 +5942,21 @@
     "@walletconnect/utils" "2.11.0"
     events "^3.3.0"
 
+"@walletconnect/sign-client@2.11.1":
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.11.1.tgz#c073b8d2d594e792bb783d36c8b021bd37a9d4f6"
+  integrity sha512-s3oKSx6/F5X2WmkV1jfJImBFACf9Km5HpTb+n5q+mobJVpUQw/clvoVyIrNNppLhm1V1S/ylHXh0qCrDppDpCA==
+  dependencies:
+    "@walletconnect/core" "2.11.1"
+    "@walletconnect/events" "^1.0.1"
+    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/jsonrpc-utils" "1.0.8"
+    "@walletconnect/logger" "^2.0.1"
+    "@walletconnect/time" "^1.0.2"
+    "@walletconnect/types" "2.11.1"
+    "@walletconnect/utils" "2.11.1"
+    events "^3.3.0"
+
 "@walletconnect/time@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/time/-/time-1.0.2.tgz#6c5888b835750ecb4299d28eecc5e72c6d336523"
@@ -5926,7 +5964,7 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/types@2.11.0", "@walletconnect/types@^2.11.0":
+"@walletconnect/types@2.11.0":
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.11.0.tgz#474a009c56faa9ef4063b76ed84415c801dc9f1e"
   integrity sha512-AB5b1lrEbCGHxqS2vqfCkIoODieH+ZAUp9rA1O2ftrhnqDJiJK983Df87JhYhECsQUBHHfALphA8ydER0q+9sw==
@@ -5938,6 +5976,18 @@
     "@walletconnect/logger" "^2.0.1"
     events "^3.3.0"
 
+"@walletconnect/types@2.11.1", "@walletconnect/types@^2.11.1":
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.11.1.tgz#4f705b43ddc286b69eb9bf91bb6e9496d20de0e3"
+  integrity sha512-UbdbX+d6MOK0AXKxt5imV3KvAcLVpZUHylaRDIP5ffwVylM/p4DHnKppil1Qq5N+IGDr3RsUwLGFkKjqsQYRKw==
+  dependencies:
+    "@walletconnect/events" "^1.0.1"
+    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/jsonrpc-types" "1.0.3"
+    "@walletconnect/keyvaluestorage" "^1.1.1"
+    "@walletconnect/logger" "^2.0.1"
+    events "^3.3.0"
+
 "@walletconnect/types@~1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.8.0.tgz#3f5e85b2d6b149337f727ab8a71b8471d8d9a195"
@@ -5958,7 +6008,7 @@
     "@walletconnect/utils" "2.11.0"
     events "^3.3.0"
 
-"@walletconnect/utils@2.11.0", "@walletconnect/utils@^2.10.1", "@walletconnect/utils@^2.11.0":
+"@walletconnect/utils@2.11.0", "@walletconnect/utils@^2.10.1":
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.11.0.tgz#31c95151c823022077883dda61800cdea71879b7"
   integrity sha512-hxkHPlTlDQILHfIKXlmzgNJau/YcSBC3XHUSuZuKZbNEw3duFT6h6pm3HT/1+j1a22IG05WDsNBuTCRkwss+BQ==
@@ -5978,19 +6028,39 @@
     query-string "7.1.3"
     uint8arrays "^3.1.0"
 
-"@walletconnect/web3wallet@^1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/web3wallet/-/web3wallet-1.10.0.tgz#5a7f181bbea213e8fb5961900a0069e58da36d18"
-  integrity sha512-JyaYdnBKL1hVpsE5hpjZhohpX1Ak2mwai3GYr8nI1FfK8Z3IPIh+4ImeDMnEao1cQFoItQNompp5y5C7WlI69A==
+"@walletconnect/utils@2.11.1", "@walletconnect/utils@^2.11.1":
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.11.1.tgz#56116d9c410c6f2ae8d562017cf6876cccb366f1"
+  integrity sha512-wRFDHN86dZ05mCET1H3912odIeQa8j7cZKxl1FlWRpV2YsILj9HCYSX6Uq2brwO02Kv2vryke44G1r8XI/LViA==
+  dependencies:
+    "@stablelib/chacha20poly1305" "1.0.1"
+    "@stablelib/hkdf" "1.0.1"
+    "@stablelib/random" "^1.0.2"
+    "@stablelib/sha256" "1.0.1"
+    "@stablelib/x25519" "^1.0.3"
+    "@walletconnect/relay-api" "^1.0.9"
+    "@walletconnect/safe-json" "^1.0.2"
+    "@walletconnect/time" "^1.0.2"
+    "@walletconnect/types" "2.11.1"
+    "@walletconnect/window-getters" "^1.0.1"
+    "@walletconnect/window-metadata" "^1.0.1"
+    detect-browser "5.3.0"
+    query-string "7.1.3"
+    uint8arrays "^3.1.0"
+
+"@walletconnect/web3wallet@^1.10.1":
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/web3wallet/-/web3wallet-1.10.1.tgz#62271183b72b3e0ec47c683bf021549d47225f39"
+  integrity sha512-lXyfljLLQ/76F5ftgaKaIoPfj/R2Mi2Tv2JnIXNonlIlAITdghYVby+xYbh4b+0yldf8fr8lqxFuHBuVoWhMjw==
   dependencies:
     "@walletconnect/auth-client" "2.1.2"
-    "@walletconnect/core" "2.11.0"
+    "@walletconnect/core" "2.11.1"
     "@walletconnect/jsonrpc-provider" "1.0.13"
     "@walletconnect/jsonrpc-utils" "1.0.8"
     "@walletconnect/logger" "2.0.1"
-    "@walletconnect/sign-client" "2.11.0"
-    "@walletconnect/types" "2.11.0"
-    "@walletconnect/utils" "2.11.0"
+    "@walletconnect/sign-client" "2.11.1"
+    "@walletconnect/types" "2.11.1"
+    "@walletconnect/utils" "2.11.1"
 
 "@walletconnect/window-getters@^1.0.1":
   version "1.0.1"