fix: Order transfers by timestamp in descending order (#2743)

Author: falvaradorodriguez

safe_transaction_service/history/tests/test_views.py

@@ -3072,6 +3072,16 @@ def test_incoming_transfers_view(self):
             ],
         )
 
+        # Validate ordering by timestamp (descending - newest first)
+        self.assertGreater(
+            ethereum_erc_721_event.timestamp,
+            ethereum_erc_20_event.timestamp,
+        )
+        self.assertGreater(
+            ethereum_erc_20_event.timestamp,
+            internal_tx.timestamp,
+        )
+
     def test_transfers_view(self):
         safe_address = Account.create().address
         response = self.client.get(
@@ -3364,6 +3374,28 @@ def test_transfers_view(self):
         for result in response.data["results"]:
             self.assertNotEqual(result["type"], TransferType.ETHER_TRANSFER.name)
 
+        # Validate ordering by timestamp (descending - newest first)
+        self.assertGreater(
+            ethereum_erc_721_event_2.timestamp,
+            ethereum_erc_721_event.timestamp,
+        )
+        self.assertGreater(
+            ethereum_erc_721_event.timestamp,
+            ethereum_erc_20_event_2.timestamp,
+        )
+        self.assertGreater(
+            ethereum_erc_20_event_2.timestamp,
+            ethereum_erc_20_event.timestamp,
+        )
+        self.assertGreater(
+            ethereum_erc_20_event.timestamp,
+            internal_tx_2.timestamp,
+        )
+        self.assertGreater(
+            internal_tx_2.timestamp,
+            internal_tx.timestamp,
+        )
+
         # Test that the result should be cached
         # Mock get_queryset with empty queryset return value to get proper error in case of fail
         with mock.patch.object(

safe_transaction_service/history/views.py

@@ -948,13 +948,15 @@ class SafeTransferListView(ListAPIView):
 
     def get_transfers(self, address: str):
         erc20_queryset = self.filter_queryset(
-            ERC20Transfer.objects.to_or_from(address).token_txs()
+            ERC20Transfer.objects.to_or_from(address).token_txs().order_by("-timestamp")
         )[: settings.TX_SERVICE_ALL_TXS_ENDPOINT_LIMIT_TRANSFERS]
         erc721_queryset = self.filter_queryset(
-            ERC721Transfer.objects.to_or_from(address).token_txs()
+            ERC721Transfer.objects.to_or_from(address)
+            .token_txs()
+            .order_by("-timestamp")
         )[: settings.TX_SERVICE_ALL_TXS_ENDPOINT_LIMIT_TRANSFERS]
         ether_queryset = self.filter_queryset(
-            InternalTx.objects.ether_txs_for_address(address)
+            InternalTx.objects.ether_txs_for_address(address).order_by("-timestamp")
         )[: settings.TX_SERVICE_ALL_TXS_ENDPOINT_LIMIT_TRANSFERS]
         return InternalTx.objects.union_ether_and_token_txs(
             erc20_queryset, erc721_queryset, ether_queryset
@@ -1029,13 +1031,15 @@ def get(self, *args, **kwargs):
 
     def get_transfers(self, address: str):
         erc20_queryset = self.filter_queryset(
-            ERC20Transfer.objects.incoming(address).token_txs()
+            ERC20Transfer.objects.incoming(address).token_txs().order_by("-timestamp")
         )[: settings.TX_SERVICE_ALL_TXS_ENDPOINT_LIMIT_TRANSFERS]
         erc721_queryset = self.filter_queryset(
-            ERC721Transfer.objects.incoming(address).token_txs()
+            ERC721Transfer.objects.incoming(address).token_txs().order_by("-timestamp")
         )[: settings.TX_SERVICE_ALL_TXS_ENDPOINT_LIMIT_TRANSFERS]
         ether_queryset = self.filter_queryset(
-            InternalTx.objects.ether_incoming_txs_for_address(address)
+            InternalTx.objects.ether_incoming_txs_for_address(address).order_by(
+                "-timestamp"
+            )
         )[: settings.TX_SERVICE_ALL_TXS_ENDPOINT_LIMIT_TRANSFERS]
 
         return InternalTx.objects.union_ether_and_token_txs(