From 42d7275b511d78ce943fa284d0a321d1657581a8 Mon Sep 17 00:00:00 2001
From: Tritonn204 <tritonn204@gmail.com>
Date: Thu, 20 Mar 2025 21:32:44 -0500
Subject: [PATCH 1/2] removed print

---
 lib/wallets/wallet/impl/xelis_wallet.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/wallets/wallet/impl/xelis_wallet.dart b/lib/wallets/wallet/impl/xelis_wallet.dart
index 56b774194..d9511c379 100644
--- a/lib/wallets/wallet/impl/xelis_wallet.dart
+++ b/lib/wallets/wallet/impl/xelis_wallet.dart
@@ -106,7 +106,6 @@ class XelisWallet extends LibXelisWallet {
   }
 
   Future<void> _existingWallet() async {
-    print("EXISTING");
     Logging.instance.i("Xelis: opening existing wallet");
     final tablePath = await getPrecomputedTablesPath();
     final tableState = await getTableState();

From 321ae2e7ad158ce44740ad2d0f8a4d6a8b19eb7a Mon Sep 17 00:00:00 2001
From: Tritonn204 <tritonn204@gmail.com>
Date: Thu, 27 Mar 2025 23:44:09 -0500
Subject: [PATCH 2/2] New TX typing bug fix for

---
 lib/wallets/wallet/impl/xelis_wallet.dart | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/wallets/wallet/impl/xelis_wallet.dart b/lib/wallets/wallet/impl/xelis_wallet.dart
index d9511c379..f250bb7f7 100644
--- a/lib/wallets/wallet/impl/xelis_wallet.dart
+++ b/lib/wallets/wallet/impl/xelis_wallet.dart
@@ -317,7 +317,7 @@ class XelisWallet extends LibXelisWallet {
   @override
   Future<List<String>> updateTransactions({
     bool isRescan = false,
-    List<String>? rawTransactions,
+    List<xelis_sdk.TransactionEntry>? objTransactions,
     int? topoheight,
   }) async {
     checkInitialized();
@@ -354,16 +354,17 @@ class XelisWallet extends LibXelisWallet {
       await libXelisWallet!.rescan(topoheight: BigInt.from(pruningHeight));
     }
 
-    final txListJson = rawTransactions ?? await libXelisWallet!.allHistory();
+    final txList = objTransactions ??
+      (await libXelisWallet!.allHistory())
+        .map((jsonStr) => xelis_sdk.TransactionEntry.fromJson(
+            json.decode(jsonStr),
+          ) as xelis_sdk.TransactionEntry)
+        .toList();
 
     final List<TransactionV2> txns = [];
 
-    for (final jsonString in txListJson) {
+    for (final transactionEntry in txList) {
       try {
-        final transactionEntry = xelis_sdk.TransactionEntry.fromJson(
-          (json.decode(jsonString) as Map).cast(),
-        );
-
         // Check for duplicates
         final storedTx =
             await mainDB.isar.transactionV2s
@@ -555,7 +556,7 @@ class XelisWallet extends LibXelisWallet {
         txns.add(txn);
       } catch (e, s) {
         Logging.instance.w(
-          "Error in $runtimeType handling transaction: $jsonString",
+          "Error in $runtimeType handling transaction: $transactionEntry",
           error: e,
           stackTrace: s,
         );
@@ -858,10 +859,10 @@ class XelisWallet extends LibXelisWallet {
   @override
   Future<void> handleNewTransaction(xelis_sdk.TransactionEntry tx) async {
     try {
-      final txListJson = [jsonEncode(tx.toString())];
+      final txList = [tx];
       final newTxIds = await updateTransactions(
         isRescan: false,
-        rawTransactions: txListJson,
+        objTransactions: txList,
       );
 
       await updateBalance();