From a3c65e19ca5224a5dc2da1fd10dd5366d720bc79 Mon Sep 17 00:00:00 2001
From: Juanma Hidalgo <juanma06@gmail.com>
Date: Tue, 29 Nov 2022 16:08:43 +0100
Subject: [PATCH] fix: add a flag to save the first loading status of the FFs
 (#1051)

---
 .../components/AssetProvider/AssetProvider.tsx   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/webapp/src/components/AssetProvider/AssetProvider.tsx b/webapp/src/components/AssetProvider/AssetProvider.tsx
index 6f5ef934ed..c36900532f 100644
--- a/webapp/src/components/AssetProvider/AssetProvider.tsx
+++ b/webapp/src/components/AssetProvider/AssetProvider.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
 import { AssetType } from '../../modules/asset/types'
 import { Props } from './AssetProvider.types'
 
@@ -18,11 +18,18 @@ const AssetProvider = (props: Props) => {
     isLoadingFeatureFlags
   } = props
 
+  const [hasLoadedInitialFlags, setHasLoadedInitialFlags] = useState(false)
+  useEffect(() => {
+    if (!isLoadingFeatureFlags) {
+      setHasLoadedInitialFlags(true)
+    }
+  }, [isLoadingFeatureFlags])
+
   useEffect(() => {
     if (contractAddress && tokenId) {
       switch (type) {
         case AssetType.NFT:
-          if (!isLoadingFeatureFlags) {
+          if (!hasLoadedInitialFlags) {
             onFetchNFT(contractAddress, tokenId, { rentalStatus })
           }
           break
@@ -40,7 +47,8 @@ const AssetProvider = (props: Props) => {
     onFetchNFT,
     onFetchItem,
     rentalStatus,
-    isLoadingFeatureFlags
+    isLoadingFeatureFlags,
+    hasLoadedInitialFlags
   ])
 
   return (
@@ -49,7 +57,7 @@ const AssetProvider = (props: Props) => {
         asset,
         order,
         rental,
-        isLoading || (isLoadingFeatureFlags && type === AssetType.NFT)
+        isLoading || (!hasLoadedInitialFlags && type === AssetType.NFT)
       )}
     </>
   )