feat: filter historical transactions

package.json

@@ -82,14 +82,15 @@
     "@gnosis.pm/safe-deployments": "^1.8.0",
     "@gnosis.pm/safe-modules-deployments": "^1.0.0",
     "@gnosis.pm/safe-react-components": "^1.1.2",
-    "@gnosis.pm/safe-react-gateway-sdk": "^3.0.1",
+    "@gnosis.pm/safe-react-gateway-sdk": "^3.1.1",
     "@gnosis.pm/safe-web3-lib": "^1.0.0",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.0",
     "@material-ui/lab": "4.0.0-alpha.60",
     "@openzeppelin/contracts": "4.4.2",
     "@sentry/react": "^6.10.0",
     "@sentry/tracing": "^6.10.0",
+    "@truffle/hdwallet-provider": "^2.0.8",
     "@unstoppabledomains/resolution": "^1.17.0",
     "abi-decoder": "^2.4.0",
     "axios": "0.21.4",
@@ -139,8 +140,7 @@
     "web3": "1.7.0",
     "web3-core": "^1.7.0",
     "web3-eth-contract": "^1.7.0",
-    "web3-utils": "^1.7.0",
-    "@truffle/hdwallet-provider": "^2.0.8"
+    "web3-utils": "^1.7.0"
   },
   "devDependencies": {
     "@gnosis.pm/safe-core-sdk-types": "1.0.0",

src/logic/currencyValues/store/actions/updateAvailableCurrencies.ts

@@ -3,8 +3,8 @@ import { ThunkDispatch } from 'redux-thunk'
 import { AppReduxState } from 'src/store'
 import { AvailableCurrenciesPayload } from 'src/logic/currencyValues/store/reducer/currencyValues'
 import { setAvailableCurrencies } from 'src/logic/currencyValues/store/actions/setAvailableCurrencies'
-import { Errors, logError } from 'src/logic/exceptions/CodedException'
 import { getFiatCurrencies } from '@gnosis.pm/safe-react-gateway-sdk'
+import { Errors, logError } from 'src/logic/exceptions/CodedException'
 
 export const updateAvailableCurrencies =
   () =>

src/logic/safe/store/actions/transactions/fetchTransactions/index.ts

@@ -7,23 +7,30 @@ import {
 } from 'src/logic/safe/store/actions/transactions/gatewayTransactions'
 import { loadHistoryTransactions, loadQueuedTransactions } from './loadGatewayTransactions'
 import { AppReduxState } from 'src/store'
+import { history } from 'src/routes/routes'
+import { isTxFilter } from 'src/routes/safe/components/Transactions/TxList/Filter/utils'
 
 export default (chainId: string, safeAddress: string) =>
   async (dispatch: ThunkDispatch<AppReduxState, undefined, AnyAction>): Promise<void> => {
-    const loadTxs = async (
-      loadFn: typeof loadHistoryTransactions | typeof loadQueuedTransactions,
-      actionFn: typeof addHistoryTransactions | typeof addQueuedTransactions,
-    ) => {
+    const loadHistory = async () => {
       try {
-        const values = (await loadFn(safeAddress)) as any[]
-        dispatch(actionFn({ chainId, safeAddress, values }))
+        const query = Object.fromEntries(new URLSearchParams(history.location.search))
+        const filter = isTxFilter(query) ? query : undefined
+        const values = await loadHistoryTransactions(safeAddress, filter)
+        dispatch(addHistoryTransactions({ chainId, safeAddress, values }))
       } catch (e) {
         e.log()
       }
     }
 
-    await Promise.all([
-      loadTxs(loadHistoryTransactions, addHistoryTransactions),
-      loadTxs(loadQueuedTransactions, addQueuedTransactions),
-    ])
+    const loadQueue = async () => {
+      try {
+        const values = await loadQueuedTransactions(safeAddress)
+        dispatch(addQueuedTransactions({ chainId, safeAddress, values }))
+      } catch (e) {
+        e.log()
+      }
+    }
+
+    await Promise.all([loadHistory(), loadQueue()])
   }

src/logic/safe/store/actions/transactions/fetchTransactions/loadGatewayTransactions.ts

@@ -1,13 +1,96 @@
-import { getTransactionHistory, getTransactionQueue } from '@gnosis.pm/safe-react-gateway-sdk'
+import {
+  getTransactionHistory,
+  getTransactionQueue,
+  TransactionListPage,
+  getIncomingTransfers,
+  getMultisigTransactions,
+  getModuleTransactions,
+} from '@gnosis.pm/safe-react-gateway-sdk'
 import { _getChainId } from 'src/config'
 import { HistoryGatewayResponse, QueuedGatewayResponse } from 'src/logic/safe/store/models/types/gateway.d'
 import { checksumAddress } from 'src/utils/checksumAddress'
 import { Errors, CodedException } from 'src/logic/exceptions/CodedException'
+import { FilterForm, FilterType, FILTER_TYPE_FIELD_NAME } from 'src/routes/safe/components/Transactions/TxList/Filter'
+import {
+  getIncomingFilter,
+  getMultisigFilter,
+  getModuleFilter,
+} from 'src/routes/safe/components/Transactions/TxList/Filter/utils'
+import { ChainId } from 'src/config/chain.d'
+import { operations } from '@gnosis.pm/safe-react-gateway-sdk/dist/types/api'
 
 /*************/
 /*  HISTORY  */
 /*************/
-const historyPointers: { [chainId: string]: { [safeAddress: string]: { next?: string; previous?: string } } } = {}
+const historyPointers: {
+  [chainId: string]: {
+    [safeAddress: string]: {
+      next?: string
+      previous?: string
+      filterType?: FilterType
+    }
+  }
+} = {}
+
+const getHistoryTxListPage = async (
+  chainId: ChainId,
+  safeAddress: string,
+  filter?: FilterForm | Partial<FilterForm>,
+): Promise<TransactionListPage> => {
+  let txListPage: TransactionListPage = {
+    next: undefined,
+    previous: undefined,
+    results: [],
+  }
+
+  const { next, filterType } = historyPointers[chainId]?.[safeAddress] || {}
+
+  let query:
+    | operations['incoming_transfers' | 'incoming_transfers' | 'module_transactions']['parameters']['query']
+    | undefined
+
+  switch (filterType) {
+    case FilterType.INCOMING: {
+      query = filter ? getIncomingFilter(filter) : undefined
+      txListPage = await getIncomingTransfers(chainId, safeAddress, query, next)
+      break
+    }
+    case FilterType.MULTISIG: {
+      query = filter ? getMultisigFilter(filter, true) : undefined
+      txListPage = await getMultisigTransactions(chainId, safeAddress, query, next)
+      break
+    }
+    case FilterType.MODULE: {
+      query = filter ? getModuleFilter(filter) : undefined
+      txListPage = await getModuleTransactions(chainId, safeAddress, query, next)
+      break
+    }
+    default: {
+      txListPage = await getTransactionHistory(chainId, safeAddress, next)
+    }
+  }
+
+  const getPageUrl = (pageUrl?: string): string | undefined => {
+    if (!pageUrl || !filterType || !query) {
+      return pageUrl
+    }
+
+    const url = new URL(pageUrl)
+
+    Object.entries(query).forEach(([key, value]) => {
+      url.searchParams.set(key, value)
+    })
+
+    console.log(url.toString())
+
+    return url.toString()
+  }
+
+  historyPointers[chainId][safeAddress].next = getPageUrl(txListPage?.next)
+  historyPointers[chainId][safeAddress].previous = getPageUrl(txListPage?.previous)
+
+  return txListPage
+}
 
 /**
  * Fetch next page if there is a next pointer for the safeAddress.
@@ -18,39 +101,41 @@ export const loadPagedHistoryTransactions = async (
   safeAddress: string,
 ): Promise<{ values: HistoryGatewayResponse['results']; next?: string } | undefined> => {
   const chainId = _getChainId()
-  // if `historyPointers[safeAddress] is `undefined` it means `loadHistoryTransactions` wasn't called
-  // if `historyPointers[safeAddress].next is `null`, it means it reached the last page in gateway-client
-  if (!historyPointers[chainId][safeAddress]?.next) {
+
+  if (!historyPointers[chainId]?.[safeAddress]?.next) {
     throw new CodedException(Errors._608)
   }
 
   try {
-    const { results, next, previous } = await getTransactionHistory(
-      chainId,
-      checksumAddress(safeAddress),
-      historyPointers[chainId][safeAddress].next,
-    )
+    const { results, next } = await getHistoryTxListPage(chainId, safeAddress)
 
-    historyPointers[chainId][safeAddress] = { next, previous }
-
-    return { values: results, next: historyPointers[chainId][safeAddress].next }
+    return { values: results, next }
   } catch (e) {
     throw new CodedException(Errors._602, e.message)
   }
 }
 
-export const loadHistoryTransactions = async (safeAddress: string): Promise<HistoryGatewayResponse['results']> => {
+export const loadHistoryTransactions = async (
+  safeAddress: string,
+  filter?: FilterForm | Partial<FilterForm>,
+): Promise<HistoryGatewayResponse['results']> => {
   const chainId = _getChainId()
-  try {
-    const { results, next, previous } = await getTransactionHistory(chainId, checksumAddress(safeAddress))
 
-    if (!historyPointers[chainId]) {
-      historyPointers[chainId] = {}
-    }
+  if (!historyPointers[chainId]) {
+    historyPointers[chainId] = {}
+  }
 
-    if (!historyPointers[chainId][safeAddress]) {
-      historyPointers[chainId][safeAddress] = { next, previous }
+  const isNewFilter = filter?.type !== historyPointers?.[chainId]?.[safeAddress]?.filterType
+  if (!historyPointers[chainId][safeAddress] || isNewFilter) {
+    historyPointers[chainId][safeAddress] = {
+      next: undefined,
+      previous: undefined,
+      filterType: filter?.[FILTER_TYPE_FIELD_NAME],
     }
+  }
+
+  try {
+    const { results } = await getHistoryTxListPage(chainId, safeAddress, filter)
 
     return results
   } catch (e) {

src/logic/safe/store/actions/transactions/gatewayTransactions.ts

@@ -1,9 +1,12 @@
 import { createAction } from 'redux-actions'
 
-import { HistoryPayload, QueuedPayload } from 'src/logic/safe/store/reducer/gatewayTransactions'
+import { HistoryPayload, QueuedPayload, RemoveHistoryPayload } from 'src/logic/safe/store/reducer/gatewayTransactions'
 
 export const ADD_HISTORY_TRANSACTIONS = 'ADD_HISTORY_TRANSACTIONS'
 export const addHistoryTransactions = createAction<HistoryPayload>(ADD_HISTORY_TRANSACTIONS)
 
+export const REMOVE_HISTORY_TRANSACTIONS = 'REMOVE_HISTORY_TRANSACTIONS'
+export const removeHistoryTransactions = createAction<RemoveHistoryPayload>(REMOVE_HISTORY_TRANSACTIONS)
+
 export const ADD_QUEUED_TRANSACTIONS = 'ADD_QUEUED_TRANSACTIONS'
 export const addQueuedTransactions = createAction<QueuedPayload>(ADD_QUEUED_TRANSACTIONS)

src/logic/safe/store/reducer/gatewayTransactions.ts

@@ -6,6 +6,7 @@ import { LabelValue } from '@gnosis.pm/safe-react-gateway-sdk'
 import {
   ADD_HISTORY_TRANSACTIONS,
   ADD_QUEUED_TRANSACTIONS,
+  REMOVE_HISTORY_TRANSACTIONS,
 } from 'src/logic/safe/store/actions/transactions/gatewayTransactions'
 import {
   HistoryGatewayResponse,
@@ -31,6 +32,8 @@ type BasePayload = { chainId: string; safeAddress: string; isTail?: boolean }
 
 export type HistoryPayload = BasePayload & { values: HistoryGatewayResponse['results'] }
 
+export type RemoveHistoryPayload = Omit<BasePayload, 'isTail'>
+
 export type QueuedPayload = BasePayload & { values: QueuedGatewayResponse['results'] }
 
 export type TransactionDetailsPayload = {
@@ -40,7 +43,7 @@ export type TransactionDetailsPayload = {
   value: Transaction['txDetails']
 }
 
-type Payload = HistoryPayload | QueuedPayload | TransactionDetailsPayload
+type Payload = HistoryPayload | RemoveHistoryPayload | QueuedPayload | TransactionDetailsPayload
 
 /**
  * Create a hash map of transactions by nonce.
@@ -106,6 +109,19 @@ export const gatewayTransactionsReducer = handleActions<GatewayTransactionsState
       }
     },
 
+    [REMOVE_HISTORY_TRANSACTIONS]: (state, action: Action<{ chainId: string; safeAddress: string }>) => {
+      const { chainId, safeAddress } = action.payload
+      return {
+        ...state,
+        [chainId]: {
+          [safeAddress]: {
+            ...state[chainId]?.[safeAddress],
+            history: {},
+          },
+        },
+      }
+    },
+
     // Queue is overwritten completely on every update
     // CGW sends a list of items where some items are LABELS (next and queued),
     // some are CONFLICT_HEADERS (ignored),

src/logic/safe/utils/mocks/getChainsConfigMock.ts

@@ -1,4 +1,4 @@
 import { ChainListResponse } from '@gnosis.pm/safe-react-gateway-sdk'
 import mockData from './remoteConfig.json'
 
-export const mockGetChainsConfigResponse = mockData as ChainListResponse
+export const mockGetChainsConfigResponse = mockData as unknown as ChainListResponse

src/routes/safe/components/CurrencyDropdown/CurrencyDropdown.test.tsx

@@ -2,7 +2,6 @@ import { fireEvent, render, screen, getByText, waitFor, queryByText } from 'src/
 import { CurrencyDropdown } from '.'
 import { history, ROOT_ROUTE } from 'src/routes/routes'
 import { mockedEndpoints } from 'src/setupTests'
-import {} from 'src/utils/constants'
 
 const mockedAvailableCurrencies = ['USD', 'EUR', 'AED', 'AFN', 'ALL', 'ARS']
 const rinkebyNetworkId = '4'