Merge branch 'main' into feat/custom-evm-networks-provider

sbpublic · web-flow · commit 9c34c4fc276f · 2026-04-20T16:29:20.000+02:00
diff --git a/src/frontend/src/btc/components/transactions/BtcTransactions.svelte b/src/frontend/src/btc/components/transactions/BtcTransactions.svelte
@@ -14,14 +14,17 @@
 	import TransactionsSkeletons from '$lib/components/transactions/TransactionsSkeletons.svelte';
 	import { TRANSACTIONS_DATE_GROUP_PREFIX } from '$lib/constants/test-ids.constants';
 	import { DEFAULT_BITCOIN_TOKEN } from '$lib/constants/tokens.constants';
+	import { exchanges } from '$lib/derived/exchange.derived';
 	import {
 		modalBtcToken,
 		modalBtcTokenData,
 		modalBtcTransaction
 	} from '$lib/derived/modal.derived';
 	import { pageToken } from '$lib/derived/page-token.derived';
+	import { hideMicroTransactions } from '$lib/derived/user-profile.derived';
 	import { modalStore } from '$lib/stores/modal.store';
 	import { groupTransactionsByDate, mapTransactionModalData } from '$lib/utils/transaction.utils';
+	import { filterReceivedMicroTransactions } from '$lib/utils/transactions.utils';
 
 	let { transaction: selectedTransaction, token: selectedToken } = $derived(
 		mapTransactionModalData<BtcTransactionUi>({
@@ -32,16 +35,22 @@
 
 	let token = $derived($pageToken ?? DEFAULT_BITCOIN_TOKEN);
 
+	let mappedTransactions = $derived(
+		$sortedBtcTransactions?.map(({ data: transaction }) => ({
+			component: 'bitcoin' as const,
+			transaction,
+			token
+		})) ?? []
+	);
+
+	let filteredTransactions = $derived(
+		$hideMicroTransactions
+			? filterReceivedMicroTransactions({ transactions: mappedTransactions, exchanges: $exchanges })
+			: mappedTransactions
+	);
+
 	let groupedTransactions = $derived(
-		nonNullish($sortedBtcTransactions)
-			? groupTransactionsByDate(
-					$sortedBtcTransactions.map(({ data: transaction }) => ({
-						component: 'bitcoin',
-						transaction,
-						token
-					}))
-				)
-			: undefined
+		nonNullish($sortedBtcTransactions) ? groupTransactionsByDate(filteredTransactions) : undefined
 	);
 </script>
 
diff --git a/src/frontend/src/eth/components/transactions/EthTransactions.svelte b/src/frontend/src/eth/components/transactions/EthTransactions.svelte
@@ -15,15 +15,18 @@
 	import Header from '$lib/components/ui/Header.svelte';
 	import { TRANSACTIONS_DATE_GROUP_PREFIX } from '$lib/constants/test-ids.constants';
 	import { ethAddress } from '$lib/derived/address.derived';
+	import { exchanges } from '$lib/derived/exchange.derived';
 	import {
 		modalEthTransaction,
 		modalEthToken,
 		modalEthTokenData
 	} from '$lib/derived/modal.derived';
 	import { tokenWithFallback } from '$lib/derived/token.derived';
+	import { hideMicroTransactions } from '$lib/derived/user-profile.derived';
 	import { i18n } from '$lib/stores/i18n.store';
 	import { modalStore } from '$lib/stores/modal.store';
 	import { groupTransactionsByDate, mapTransactionModalData } from '$lib/utils/transaction.utils';
+	import { filterReceivedMicroTransactions } from '$lib/utils/transactions.utils';
 
 	let ckMinterInfoAddresses = $derived(
 		toCkMinterInfoAddresses($ckEthMinterInfoStore?.[$nativeEthereumTokenId])
@@ -48,12 +51,22 @@
 
 	let token = $derived($tokenWithFallback);
 
+	let mappedTransactions = $derived(
+		sortedTransactionsUi.map((transaction) => ({
+			component: 'ethereum' as const,
+			transaction,
+			token
+		}))
+	);
+
+	let filteredTransactions = $derived(
+		$hideMicroTransactions
+			? filterReceivedMicroTransactions({ transactions: mappedTransactions, exchanges: $exchanges })
+			: mappedTransactions
+	);
+
 	let groupedTransactions = $derived(
-		nonNullish(sortedTransactionsUi)
-			? groupTransactionsByDate(
-					sortedTransactionsUi.map((transaction) => ({ component: 'ethereum', transaction, token }))
-				)
-			: undefined
+		nonNullish(sortedTransactionsUi) ? groupTransactionsByDate(filteredTransactions) : undefined
 	);
 </script>
 
diff --git a/src/frontend/src/icp/components/transactions/IcTransactions.svelte b/src/frontend/src/icp/components/transactions/IcTransactions.svelte
@@ -25,11 +25,14 @@
 	import TransactionsPlaceholder from '$lib/components/transactions/TransactionsPlaceholder.svelte';
 	import Header from '$lib/components/ui/Header.svelte';
 	import { TRANSACTIONS_DATE_GROUP_PREFIX } from '$lib/constants/test-ids.constants';
+	import { exchanges } from '$lib/derived/exchange.derived';
 	import { modalIcToken, modalIcTokenData, modalIcTransaction } from '$lib/derived/modal.derived';
 	import { pageToken } from '$lib/derived/page-token.derived';
+	import { hideMicroTransactions } from '$lib/derived/user-profile.derived';
 	import { i18n } from '$lib/stores/i18n.store';
 	import { modalStore } from '$lib/stores/modal.store';
 	import { groupTransactionsByDate, mapTransactionModalData } from '$lib/utils/transaction.utils';
+	import { filterReceivedMicroTransactions } from '$lib/utils/transactions.utils';
 
 	let ckEthereum = $derived($tokenCkEthLedger || $tokenCkErc20Ledger);
 
@@ -46,12 +49,22 @@
 
 	let token = $derived($pageToken ?? ICP_TOKEN);
 
+	let mappedTransactions = $derived(
+		$icTransactions.map(({ data: transaction }) => ({
+			component: 'ic' as const,
+			transaction,
+			token
+		}))
+	);
+
+	let filteredTransactions = $derived(
+		$hideMicroTransactions
+			? filterReceivedMicroTransactions({ transactions: mappedTransactions, exchanges: $exchanges })
+			: mappedTransactions
+	);
+
 	let groupedTransactions = $derived(
-		nonNullish($icTransactions)
-			? groupTransactionsByDate(
-					$icTransactions.map(({ data: transaction }) => ({ component: 'ic', transaction, token }))
-				)
-			: undefined
+		nonNullish($icTransactions) ? groupTransactionsByDate(filteredTransactions) : undefined
 	);
 </script>
 
@@ -76,7 +89,7 @@
 </Header>
 
 <IcTransactionsSkeletons>
-	{#if $icTransactions.length > 0}
+	{#if filteredTransactions.length > 0}
 		<IcTransactionsScroll {token}>
 			{#if nonNullish(groupedTransactions) && Object.values(groupedTransactions).length > 0}
 				{#each Object.entries(groupedTransactions) as [formattedDate, transactions], index (formattedDate)}
diff --git a/src/frontend/src/lib/components/transactions/AllTransactionsList.svelte b/src/frontend/src/lib/components/transactions/AllTransactionsList.svelte
@@ -21,6 +21,7 @@
 	import TransactionsPlaceholder from '$lib/components/transactions/TransactionsPlaceholder.svelte';
 	import { ACTIVITY_TRANSACTION_SKELETON_PREFIX } from '$lib/constants/test-ids.constants';
 	import { ethAddress } from '$lib/derived/address.derived';
+	import { exchanges } from '$lib/derived/exchange.derived';
 	import {
 		modalBtcTransaction,
 		modalEthTransaction,
@@ -31,15 +32,20 @@
 		enabledFungibleNetworkTokens,
 		enabledNonFungibleNetworkTokensWithoutSpam
 	} from '$lib/derived/network-tokens.derived';
+	import { hideMicroTransactions } from '$lib/derived/user-profile.derived';
 	import { modalStore } from '$lib/stores/modal.store';
 	import type { AllTransactionUiWithCmp } from '$lib/types/transaction-ui';
 	import { groupTransactionsByDate, mapTransactionModalData } from '$lib/utils/transaction.utils';
-	import { mapAllTransactionsUi, sortTransactions } from '$lib/utils/transactions.utils';
+	import {
+		filterReceivedMicroTransactions,
+		mapAllTransactionsUi,
+		sortTransactions
+	} from '$lib/utils/transactions.utils';
 	import SolTransactionModal from '$sol/components/transactions/SolTransactionModal.svelte';
 	import { solTransactionsStore } from '$sol/stores/sol-transactions.store';
 	import type { SolTransactionUi } from '$sol/types/sol-transaction';
 
-	let transactions = $derived(
+	let allTransactions = $derived(
 		mapAllTransactionsUi({
 			tokens: [...$enabledFungibleNetworkTokens, ...$enabledNonFungibleNetworkTokensWithoutSpam],
 			$btcTransactions: $btcTransactionsStore,
@@ -55,8 +61,20 @@
 		})
 	);
 
+	// Filtering is only applied on the display path. The unfiltered `allTransactions` is fed to
+	// `AllTransactionsLoader` so its `transactions.length === 0` short-circuit and `minTimestamp`
+	// pagination anchor remain based on the actual loaded set, not the filtered one.
+	let displayTransactions = $derived(
+		$hideMicroTransactions
+			? filterReceivedMicroTransactions({
+					transactions: allTransactions,
+					exchanges: $exchanges
+				})
+			: allTransactions
+	);
+
 	let sortedTransactions = $derived(
-		transactions.sort(({ transaction: a }, { transaction: b }) =>
+		displayTransactions.sort(({ transaction: a }, { transaction: b }) =>
 			sortTransactions({ transactionA: a, transactionB: b })
 		)
 	);
@@ -95,7 +113,7 @@
 </script>
 
 <AllTransactionsSkeletons testIdPrefix={ACTIVITY_TRANSACTION_SKELETON_PREFIX}>
-	<AllTransactionsLoader {transactions}>
+	<AllTransactionsLoader transactions={allTransactions}>
 		<AllTransactionsScroll {sortedTransactions} bind:transactionsToDisplay>
 			{#if Object.values(groupedTransactions).length > 0}
 				{#each Object.entries(groupedTransactions) as [formattedDate, transactions], index (formattedDate)}
diff --git a/src/frontend/src/sol/components/transactions/SolTransactions.svelte b/src/frontend/src/sol/components/transactions/SolTransactions.svelte
@@ -6,15 +6,18 @@
 	import Header from '$lib/components/ui/Header.svelte';
 	import { TRANSACTIONS_DATE_GROUP_PREFIX } from '$lib/constants/test-ids.constants';
 	import { DEFAULT_SOLANA_TOKEN } from '$lib/constants/tokens.constants';
+	import { exchanges } from '$lib/derived/exchange.derived';
 	import {
 		modalSolToken,
 		modalSolTokenData,
 		modalSolTransaction
 	} from '$lib/derived/modal.derived';
 	import { pageToken } from '$lib/derived/page-token.derived';
+	import { hideMicroTransactions } from '$lib/derived/user-profile.derived';
 	import { i18n } from '$lib/stores/i18n.store';
 	import { modalStore } from '$lib/stores/modal.store';
 	import { groupTransactionsByDate, mapTransactionModalData } from '$lib/utils/transaction.utils';
+	import { filterReceivedMicroTransactions } from '$lib/utils/transactions.utils';
 	import SolTokenModal from '$sol/components/tokens/SolTokenModal.svelte';
 	import SolTransactionModal from '$sol/components/transactions/SolTransactionModal.svelte';
 	import SolTransactionsScroll from '$sol/components/transactions/SolTransactionsScroll.svelte';
@@ -31,12 +34,22 @@
 
 	let token = $derived($pageToken ?? DEFAULT_SOLANA_TOKEN);
 
+	let mappedTransactions = $derived(
+		$solTransactions.map((transaction) => ({
+			component: 'solana' as const,
+			transaction,
+			token
+		}))
+	);
+
+	let filteredTransactions = $derived(
+		$hideMicroTransactions
+			? filterReceivedMicroTransactions({ transactions: mappedTransactions, exchanges: $exchanges })
+			: mappedTransactions
+	);
+
 	let groupedTransactions = $derived(
-		nonNullish($solTransactions)
-			? groupTransactionsByDate(
-					$solTransactions.map((transaction) => ({ component: 'solana', transaction, token }))
-				)
-			: undefined
+		nonNullish($solTransactions) ? groupTransactionsByDate(filteredTransactions) : undefined
 	);
 </script>
 
@@ -47,7 +60,7 @@
 <HiddenMicroTransactionsInfoBox />
 
 <SolTransactionsSkeletons>
-	{#if $solTransactions.length > 0}
+	{#if filteredTransactions.length > 0}
 		<SolTransactionsScroll {token}>
 			{#if nonNullish(groupedTransactions) && Object.values(groupedTransactions).length > 0}
 				{#each Object.entries(groupedTransactions) as [formattedDate, transactions], index (formattedDate)}
