From c0d29f5e11d8ad2b0f2b51e58c3970218976b1d9 Mon Sep 17 00:00:00 2001
From: Omar <omarh.ismail1@gmail.com>
Date: Sat, 2 May 2026 04:57:16 +0200
Subject: [PATCH] minor fix [skip ci]

---
 cw_core/lib/wallet_info.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cw_core/lib/wallet_info.dart b/cw_core/lib/wallet_info.dart
index 3f2d9c055..1ce397267 100644
--- a/cw_core/lib/wallet_info.dart
+++ b/cw_core/lib/wallet_info.dart
@@ -429,8 +429,10 @@ class WalletInfo {
   Future<void> setAddresses(Map<String, String> addresses) async {
     await WalletInfoAddressMap.deleteByWalletInfoId(internalId);
     final keys = addresses.keys.toList();
-    for (final address in keys) {
-      await WalletInfoAddressMap.insert(internalId, address, addresses[address]!);
+    final values = addresses.values.toList();
+    // ToDo: check why the addresses list gets changed half way through
+    for (int i = 0; i < keys.length; i++) {
+      await WalletInfoAddressMap.insert(internalId, keys[i], values[i]);
     }
   }