From 9fdfb75d7174a49e7fff068e6bfabd8115d955f0 Mon Sep 17 00:00:00 2001
From: Nelito Junior <ngvjqp@gmail.com>
Date: Fri, 13 Dec 2024 17:32:43 -0300
Subject: [PATCH 1/2] fix(cache): Exclude custom assets from cache retrieval
 logic

---
 packages/app/src/systems/Asset/cache/AssetsCache.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/systems/Asset/cache/AssetsCache.ts b/packages/app/src/systems/Asset/cache/AssetsCache.ts
index 06a76fc6b4..2ca1660cb5 100644
--- a/packages/app/src/systems/Asset/cache/AssetsCache.ts
+++ b/packages/app/src/systems/Asset/cache/AssetsCache.ts
@@ -133,7 +133,9 @@ export class AssetsCache {
     if (
       cachedEntry?.name !== undefined &&
       cachedEntry.fetchedAt &&
-      now - cachedEntry.fetchedAt < FIVE_MINUTES
+      now - cachedEntry.fetchedAt < FIVE_MINUTES &&
+      !cachedEntry.isCustom &&
+      cachedEntry?.name !== ''
     ) {
       return cachedEntry;
     }
@@ -145,7 +147,8 @@ export class AssetsCache {
     if (
       assetFromDb?.name &&
       assetFromDb.fetchedAt &&
-      now - assetFromDb.fetchedAt < FIVE_MINUTES
+      now - assetFromDb.fetchedAt < FIVE_MINUTES &&
+      !assetFromDb.isCustom
     ) {
       this.cache[chainId][assetId] = assetFromDb;
       return assetFromDb as FuelCachedAsset;

From 4fa1305a606c5c3b083c304a15860a4d45a8f193 Mon Sep 17 00:00:00 2001
From: Nelito Junior <ngvjqp@gmail.com>
Date: Fri, 13 Dec 2024 18:21:43 -0300
Subject: [PATCH 2/2] chore(changeset): Improve handling of custom assets

---
 .changeset/plenty-grapes-itch.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/plenty-grapes-itch.md

diff --git a/.changeset/plenty-grapes-itch.md b/.changeset/plenty-grapes-itch.md
new file mode 100644
index 0000000000..ecf3e883fb
--- /dev/null
+++ b/.changeset/plenty-grapes-itch.md
@@ -0,0 +1,5 @@
+---
+"fuels-wallet": minor
+---
+
+Improve handling of custom assets.