fix: fix conflicts

MetaMask · Jun 3, 2024 · c58add7 · c58add7
1 parent eee87ce
commit c58add7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/packages/assets-controllers/src/NftController.ts b/packages/assets-controllers/src/NftController.ts
@@ -197,6 +197,7 @@ const nftControllerMetadata = {
   allNftContracts: { persist: true, anonymous: false },
   allNfts: { persist: true, anonymous: false },
   ignoredNfts: { persist: true, anonymous: false },
+  isNftFetchingInProgress: { persist: true, anonymous: false },
 };
 
 const ALL_NFTS_STATE_KEY = 'allNfts';

diff --git a/packages/assets-controllers/src/NftDetectionController.ts b/packages/assets-controllers/src/NftDetectionController.ts
@@ -31,7 +31,6 @@ import {
   type NftMetadata,
 } from './NftController';
 
-
 const DEFAULT_INTERVAL = 180000;
 
 const controllerName = 'NftDetectionController';