From 2b6f2a772df7d0d2c55099ed2bb6e46616b2232d Mon Sep 17 00:00:00 2001
From: LuizAsFight <felipebolsonigomes@gmail.com>
Date: Mon, 18 Nov 2024 17:01:01 +0700
Subject: [PATCH] chore

---
 .../app/playwright/e2e/SendTransaction.test.ts  |  1 -
 .../app/src/systems/Asset/cache/AssetsCache.ts  | 17 +++++++----------
 packages/app/src/systems/Send/hooks/useSend.tsx |  5 ++++-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/app/playwright/e2e/SendTransaction.test.ts b/packages/app/playwright/e2e/SendTransaction.test.ts
index 80e0b66a1..5e34c4760 100644
--- a/packages/app/playwright/e2e/SendTransaction.test.ts
+++ b/packages/app/playwright/e2e/SendTransaction.test.ts
@@ -120,7 +120,6 @@ test.describe('SendTransaction', () => {
 
     // Select asset
     await getButtonByText(page, 'Select one asset').click();
-    await page.pause();
     await page.getByText(ALT_ASSET.name).click();
 
     // Fill address
diff --git a/packages/app/src/systems/Asset/cache/AssetsCache.ts b/packages/app/src/systems/Asset/cache/AssetsCache.ts
index 7fa01c43f..414bfc0d8 100644
--- a/packages/app/src/systems/Asset/cache/AssetsCache.ts
+++ b/packages/app/src/systems/Asset/cache/AssetsCache.ts
@@ -139,16 +139,6 @@ export class AssetsCache {
       return assetFromDb;
     }
 
-    const assetFromIndexer = await this.fetchAssetFromIndexer(
-      endpoint.url,
-      assetId
-    ).catch((e) => {
-      console.error('Error fetching asset from indexer', e);
-      return undefined;
-    });
-
-    if (!assetFromIndexer) return;
-
     const dbAsset = await getFuelAssetByAssetId({
       assets: dbAssets.length ? dbAssets : this.dbAssetsCache[chainId],
       assetId: assetId,
@@ -157,6 +147,13 @@ export class AssetsCache {
       console.error('Error fetching asset from db', e);
       return undefined;
     });
+    const assetFromIndexer = await this.fetchAssetFromIndexer(
+      endpoint.url,
+      assetId
+    ).catch((e) => {
+      console.error('Error fetching asset from indexer', e);
+      return undefined;
+    });
 
     const {
       isNFT,
diff --git a/packages/app/src/systems/Send/hooks/useSend.tsx b/packages/app/src/systems/Send/hooks/useSend.tsx
index ee75fa473..3b75466fd 100644
--- a/packages/app/src/systems/Send/hooks/useSend.tsx
+++ b/packages/app/src/systems/Send/hooks/useSend.tsx
@@ -167,7 +167,10 @@ const schemaFactory = (provider?: Provider) =>
               save: false,
             });
 
-            if (assetCached) {
+            if (
+              assetCached &&
+              AssetsCache.getInstance().assetIsValid(assetCached)
+            ) {
               return ctx.createError({
                 message: `You can't send to Asset address`,
               });