Merge branch 'master' into nj/feat/allow-multiple-networks-with-the-s…

…ame-name
FuelLabs · Jan 6, 2025 · 4da0b0a · 4da0b0a
2 parents 776ab55 + 4c53007
commit 4da0b0a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.changeset/plenty-grapes-itch.md b/.changeset/plenty-grapes-itch.md
@@ -0,0 +1,5 @@
+---
+"fuels-wallet": minor
+---
+
+Improve handling of custom assets.
diff --git 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;