fix: hide suspicious transactions by default (#4425)

* Hide suspicious transactions by default * Only default if `undefined` * Update E2E test * Fix E2E
safe-global · Oct 25, 2024 · 1b1f128 · 1b1f128
1 parent 9620abd
commit 1b1f128
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/cypress/e2e/pages/create_tx.pages.js b/cypress/e2e/pages/create_tx.pages.js
@@ -42,6 +42,7 @@ const addressItem = '[data-testid="address-item"]'
 const radioSelector = 'div[role="radiogroup"]'
 const rejectTxBtn = '[data-testid="reject-btn"]'
 const deleteTxModalBtn = '[data-testid="delete-tx-btn"]'
+const toggleUntrustedBtn = '[data-testid="toggle-untrusted"]'
 
 const viewTransactionBtn = 'View transaction'
 const transactionDetailsTitle = 'Transaction details'
@@ -607,3 +608,7 @@ export function verifyBulkExecuteBtnIsDisabled() {
   cy.get('button').contains(bulkExecuteBtnStr).trigger('mouseover', { force: true })
   cy.contains(disabledBultExecuteBtnTooltip).should('exist')
 }
+
+export function toggleUntrustedTxs() {
+  cy.get(toggleUntrustedBtn).click()
+}
diff --git a/cypress/e2e/smoke/tx_history.cy.js b/cypress/e2e/smoke/tx_history.cy.js
@@ -75,6 +75,7 @@ describe('[SMOKE] Tx history tests', () => {
   })
 
   it('[SMOKE] Verify summary for untrusted token', () => {
+    createTx.toggleUntrustedTxs()
     createTx.verifySummaryByName(
       typeUntrustedToken.summaryTitle,
       typeUntrustedToken.summaryTxInfo,
@@ -85,6 +86,7 @@ describe('[SMOKE] Tx history tests', () => {
   })
 
   it('[SMOKE] Verify that copying sender address of untrusted token shows warning popup', () => {
+    createTx.toggleUntrustedTxs()
     createTx.clickOnTransactionItemByName(typeUntrustedToken.summaryTitle, typeUntrustedToken.summaryTxInfo)
     createTx.clickOnCopyBtn(0)
     createTx.verifyWarningModalVisible()

diff --git a/src/hooks/loadables/useLoadTxHistory.ts b/src/hooks/loadables/useLoadTxHistory.ts
@@ -14,8 +14,8 @@ export const useLoadTxHistory = (): AsyncResult<TransactionListPage> => {
   const { chainId, txHistoryTag } = safe
   const { hideSuspiciousTransactions } = useAppSelector(selectSettings)
   const hasDefaultTokenlist = useHasFeature(FEATURES.DEFAULT_TOKENLIST)
-  const hideUntrustedTxs = (hasDefaultTokenlist && hideSuspiciousTransactions) || false
-  const hideImitationTxs = hideSuspiciousTransactions || false
+  const hideUntrustedTxs = (hasDefaultTokenlist && hideSuspiciousTransactions) ?? true
+  const hideImitationTxs = hideSuspiciousTransactions ?? true
 
   // Re-fetch when chainId, address, hideSuspiciousTransactions, or txHistoryTag changes
   const [data, error, loading] = useAsync<TransactionListPage>(

diff --git a/src/hooks/useTxHistory.ts b/src/hooks/useTxHistory.ts
@@ -22,8 +22,8 @@ const useTxHistory = (
   const [filter] = useTxFilter()
   const { hideSuspiciousTransactions } = useAppSelector(selectSettings)
   const hasDefaultTokenlist = useHasFeature(FEATURES.DEFAULT_TOKENLIST)
-  const hideUntrustedTxs = (hasDefaultTokenlist && hideSuspiciousTransactions) || false
-  const hideImitationTxs = hideSuspiciousTransactions || false
+  const hideUntrustedTxs = (hasDefaultTokenlist && hideSuspiciousTransactions) ?? true
+  const hideImitationTxs = hideSuspiciousTransactions ?? true
 
   const {
     safe: { chainId },

diff --git a/src/store/settingsSlice.ts b/src/store/settingsSlice.ts
@@ -53,7 +53,7 @@ export const initialState: SettingsState = {
 
   hiddenTokens: {},
 
-  hideSuspiciousTransactions: false,
+  hideSuspiciousTransactions: true,
 
   shortName: {
     copy: true,