@metamask/assets-controllers 31.0.0 → 33.0.0

package/dist/{chunk-62T7RKU3.mjs → chunk-W57QXOHJ.mjs}

@@ -1,7 +1,7 @@
 import {
   compareNftMetadata,
   getFormattedIpfsUrl
-} from "./chunk-Q5JRBGWO.mjs";
+} from "./chunk-VELPHITE.mjs";
 import {
   __privateAdd,
   __privateGet,
@@ -44,14 +44,13 @@ var getDefaultNftControllerState = () => ({
   allNfts: {},
   ignoredNfts: []
 });
-var _mutex, _selectedAddress, _chainId, _ipfsGateway, _openSeaEnabled, _useIpfsSubdomains, _isIpfsGatewayEnabled, _getERC721AssetName, _getERC721AssetSymbol, _getERC721TokenURI, _getERC721OwnerOf, _getERC1155BalanceOf, _getERC1155TokenURI, _onNftAdded, _onNetworkControllerNetworkDidChange, onNetworkControllerNetworkDidChange_fn, _onPreferencesControllerStateChange, onPreferencesControllerStateChange_fn, _updateNestedNftState, updateNestedNftState_fn, _getNftInformationFromApi, getNftInformationFromApi_fn, _getNftInformationFromTokenURI, getNftInformationFromTokenURI_fn, _getNftURIAndStandard, getNftURIAndStandard_fn, _getNftInformation, getNftInformation_fn, _getNftContractInformationFromContract, getNftContractInformationFromContract_fn, _getNftContractInformation, getNftContractInformation_fn, _addIndividualNft, addIndividualNft_fn, _addNftContract, addNftContract_fn, _removeAndIgnoreIndividualNft, removeAndIgnoreIndividualNft_fn, _removeIndividualNft, removeIndividualNft_fn, _removeNftContract, removeNftContract_fn, _validateWatchNft, validateWatchNft_fn, _getCorrectChainId, getCorrectChainId_fn;
+var _mutex, _selectedAccountId, _chainId, _ipfsGateway, _openSeaEnabled, _useIpfsSubdomains, _isIpfsGatewayEnabled, _getERC721AssetName, _getERC721AssetSymbol, _getERC721TokenURI, _getERC721OwnerOf, _getERC1155BalanceOf, _getERC1155TokenURI, _onNftAdded, _onNetworkControllerNetworkDidChange, onNetworkControllerNetworkDidChange_fn, _onPreferencesControllerStateChange, onPreferencesControllerStateChange_fn, _onSelectedAccountChange, onSelectedAccountChange_fn, _updateNestedNftState, updateNestedNftState_fn, _getNftInformationFromApi, getNftInformationFromApi_fn, _getNftInformationFromTokenURI, getNftInformationFromTokenURI_fn, _getNftURIAndStandard, getNftURIAndStandard_fn, _getNftInformation, getNftInformation_fn, _getNftContractInformationFromContract, getNftContractInformationFromContract_fn, _getNftContractInformation, getNftContractInformation_fn, _addIndividualNft, addIndividualNft_fn, _addNftContract, addNftContract_fn, _removeAndIgnoreIndividualNft, removeAndIgnoreIndividualNft_fn, _removeIndividualNft, removeIndividualNft_fn, _removeNftContract, removeNftContract_fn, _validateWatchNft, validateWatchNft_fn, _getCorrectChainId, getCorrectChainId_fn, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn, _updateNftUpdateForAccount, updateNftUpdateForAccount_fn;
 var NftController = class extends BaseController {
   /**
    * Creates an NftController instance.
    *
    * @param options - The controller options.
    * @param options.chainId - The chain ID of the current network.
-   * @param options.selectedAddress - The currently selected address.
    * @param options.ipfsGateway - The configured IPFS gateway.
    * @param options.openSeaEnabled - Controls whether the OpenSea API is used.
    * @param options.useIpfsSubdomains - Controls whether IPFS subdomains are used.
@@ -69,7 +68,6 @@ var NftController = class extends BaseController {
    */
   constructor({
     chainId: initialChainId,
-    selectedAddress = "",
     ipfsGateway = IPFS_DEFAULT_GATEWAY_URL,
     openSeaEnabled = false,
     useIpfsSubdomains = true,
@@ -102,12 +100,16 @@ var NftController = class extends BaseController {
     /**
      * Handles the state change of the preference controller.
      * @param preferencesState - The new state of the preference controller.
-     * @param preferencesState.selectedAddress - The current selected address.
      * @param preferencesState.ipfsGateway - The configured IPFS gateway.
      * @param preferencesState.openSeaEnabled - Controls whether the OpenSea API is used.
      * @param preferencesState.isIpfsGatewayEnabled - Controls whether IPFS is enabled or not.
      */
     __privateAdd(this, _onPreferencesControllerStateChange);
+    /**
+     * Handles the selected account change on the accounts controller.
+     * @param internalAccount - The new selected account.
+     */
+    __privateAdd(this, _onSelectedAccountChange);
     /**
      * Helper method to update nested state for allNfts and allNftContracts.
      *
@@ -229,8 +231,10 @@ var NftController = class extends BaseController {
     // temporary method to get the correct chainId until we remove chainId from the config & the chainId arg from the detection logic
     // Just a helper method to prefer the networkClient chainId first then the chainId argument and then finally the config chainId
     __privateAdd(this, _getCorrectChainId);
+    __privateAdd(this, _getAddressOrSelectedAddress);
+    __privateAdd(this, _updateNftUpdateForAccount);
     __privateAdd(this, _mutex, new Mutex());
-    __privateAdd(this, _selectedAddress, void 0);
+    __privateAdd(this, _selectedAccountId, void 0);
     __privateAdd(this, _chainId, void 0);
     __privateAdd(this, _ipfsGateway, void 0);
     __privateAdd(this, _openSeaEnabled, void 0);
@@ -243,7 +247,9 @@ var NftController = class extends BaseController {
     __privateAdd(this, _getERC1155BalanceOf, void 0);
     __privateAdd(this, _getERC1155TokenURI, void 0);
     __privateAdd(this, _onNftAdded, void 0);
-    __privateSet(this, _selectedAddress, selectedAddress);
+    __privateSet(this, _selectedAccountId, this.messagingSystem.call(
+      "AccountsController:getSelectedAccount"
+    ).id);
     __privateSet(this, _chainId, initialChainId);
     __privateSet(this, _ipfsGateway, ipfsGateway);
     __privateSet(this, _openSeaEnabled, openSeaEnabled);
@@ -258,12 +264,20 @@ var NftController = class extends BaseController {
     __privateSet(this, _onNftAdded, onNftAdded);
     this.messagingSystem.subscribe(
       "PreferencesController:stateChange",
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       __privateMethod(this, _onPreferencesControllerStateChange, onPreferencesControllerStateChange_fn).bind(this)
     );
     this.messagingSystem.subscribe(
       "NetworkController:networkDidChange",
       __privateMethod(this, _onNetworkControllerNetworkDidChange, onNetworkControllerNetworkDidChange_fn).bind(this)
     );
+    this.messagingSystem.subscribe(
+      "AccountsController:selectedEvmAccountChange",
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      __privateMethod(this, _onSelectedAccountChange, onSelectedAccountChange_fn).bind(this)
+    );
   }
   getNftApi() {
     return `${NFT_API_BASE_URL}/tokens`;
@@ -284,11 +298,13 @@ var NftController = class extends BaseController {
    */
   async watchNft(asset, type, origin, {
     networkClientId,
-    userAddress = __privateGet(this, _selectedAddress)
-  } = {
-    userAddress: __privateGet(this, _selectedAddress)
-  }) {
-    await __privateMethod(this, _validateWatchNft, validateWatchNft_fn).call(this, asset, type, userAddress);
+    userAddress
+  } = {}) {
+    const addressToSearch = __privateMethod(this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, userAddress);
+    if (!addressToSearch) {
+      return;
+    }
+    await __privateMethod(this, _validateWatchNft, validateWatchNft_fn).call(this, asset, type, addressToSearch);
     const nftMetadata = await __privateMethod(this, _getNftInformation, getNftInformation_fn).call(this, asset.address, asset.tokenId, networkClientId);
     if (nftMetadata.standard && nftMetadata.standard !== type) {
       throw rpcErrors.invalidInput(
@@ -300,7 +316,7 @@ var NftController = class extends BaseController {
       type,
       id: random(),
       time: Date.now(),
-      interactingAddress: userAddress,
+      interactingAddress: addressToSearch,
       origin
     };
     await this._requestApproval(suggestedNftMeta);
@@ -365,20 +381,19 @@ var NftController = class extends BaseController {
    * @param options.source - Whether the NFT was detected, added manually or suggested by a dapp.
    */
   async addNftVerifyOwnership(address, tokenId, {
-    userAddress = __privateGet(this, _selectedAddress),
+    userAddress,
     networkClientId,
     source
-  } = {
-    userAddress: __privateGet(this, _selectedAddress)
-  }) {
-    if (!await this.isNftOwner(userAddress, address, tokenId, {
+  } = {}) {
+    const addressToSearch = __privateMethod(this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, userAddress);
+    if (!await this.isNftOwner(addressToSearch, address, tokenId, {
       networkClientId
     })) {
       throw new Error("This NFT is not owned by the user");
     }
     await this.addNft(address, tokenId, {
       networkClientId,
-      userAddress,
+      userAddress: addressToSearch,
       source
     });
   }
@@ -396,16 +411,20 @@ var NftController = class extends BaseController {
    */
   async addNft(tokenAddress, tokenId, {
     nftMetadata,
-    userAddress = __privateGet(this, _selectedAddress),
+    userAddress,
     source = "custom" /* Custom */,
     networkClientId
-  } = { userAddress: __privateGet(this, _selectedAddress) }) {
+  } = {}) {
+    const addressToSearch = __privateMethod(this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, userAddress);
+    if (!addressToSearch) {
+      return;
+    }
     const checksumHexAddress = toChecksumHexAddress(tokenAddress);
     const chainId = __privateMethod(this, _getCorrectChainId, getCorrectChainId_fn).call(this, { networkClientId });
     nftMetadata = nftMetadata || await __privateMethod(this, _getNftInformation, getNftInformation_fn).call(this, checksumHexAddress, tokenId, networkClientId);
     const newNftContracts = await __privateMethod(this, _addNftContract, addNftContract_fn).call(this, {
       tokenAddress: checksumHexAddress,
-      userAddress,
+      userAddress: addressToSearch,
       networkClientId,
       source,
       nftMetadata
@@ -414,7 +433,7 @@ var NftController = class extends BaseController {
       (contract) => contract.address.toLowerCase() === checksumHexAddress.toLowerCase()
     );
     if (nftContract) {
-      await __privateMethod(this, _addIndividualNft, addIndividualNft_fn).call(this, checksumHexAddress, tokenId, nftMetadata, nftContract, chainId, userAddress, source);
+      await __privateMethod(this, _addIndividualNft, addIndividualNft_fn).call(this, checksumHexAddress, tokenId, nftMetadata, nftContract, chainId, addressToSearch, source);
     }
   }
   /**
@@ -427,46 +446,52 @@ var NftController = class extends BaseController {
    */
   async updateNftMetadata({
     nfts,
-    userAddress = __privateGet(this, _selectedAddress),
+    userAddress,
     networkClientId
   }) {
-    const chainId = __privateMethod(this, _getCorrectChainId, getCorrectChainId_fn).call(this, { networkClientId });
-    const nftsWithChecksumAdr = nfts.map((nft) => {
-      return {
-        ...nft,
-        address: toChecksumHexAddress(nft.address)
-      };
-    });
-    const nftMetadataResults = await Promise.all(
-      nftsWithChecksumAdr.map(async (nft) => {
-        const resMetadata = await __privateMethod(this, _getNftInformation, getNftInformation_fn).call(this, nft.address, nft.tokenId, networkClientId);
+    const addressToSearch = __privateMethod(this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, userAddress);
+    const releaseLock = await __privateGet(this, _mutex).acquire();
+    try {
+      const chainId = __privateMethod(this, _getCorrectChainId, getCorrectChainId_fn).call(this, { networkClientId });
+      const nftsWithChecksumAdr = nfts.map((nft) => {
         return {
-          nft,
-          newMetadata: resMetadata
+          ...nft,
+          address: toChecksumHexAddress(nft.address)
         };
-      })
-    );
-    const nftsWithDifferentMetadata = [];
-    const { allNfts } = this.state;
-    const stateNfts = allNfts[userAddress]?.[chainId] || [];
-    nftMetadataResults.forEach((singleNft) => {
-      const existingEntry = stateNfts.find(
-        (nft) => nft.address.toLowerCase() === singleNft.nft.address.toLowerCase() && nft.tokenId === singleNft.nft.tokenId
+      });
+      const nftMetadataResults = await Promise.all(
+        nftsWithChecksumAdr.map(async (nft) => {
+          const resMetadata = await __privateMethod(this, _getNftInformation, getNftInformation_fn).call(this, nft.address, nft.tokenId, networkClientId);
+          return {
+            nft,
+            newMetadata: resMetadata
+          };
+        })
       );
-      if (existingEntry) {
-        const differentMetadata = compareNftMetadata(
-          singleNft.newMetadata,
-          existingEntry
+      const nftsWithDifferentMetadata = [];
+      const { allNfts } = this.state;
+      const stateNfts = allNfts[addressToSearch]?.[chainId] || [];
+      nftMetadataResults.forEach((singleNft) => {
+        const existingEntry = stateNfts.find(
+          (nft) => nft.address.toLowerCase() === singleNft.nft.address.toLowerCase() && nft.tokenId === singleNft.nft.tokenId
         );
-        if (differentMetadata) {
-          nftsWithDifferentMetadata.push(singleNft);
+        if (existingEntry) {
+          const differentMetadata = compareNftMetadata(
+            singleNft.newMetadata,
+            existingEntry
+          );
+          if (differentMetadata) {
+            nftsWithDifferentMetadata.push(singleNft);
+          }
         }
+      });
+      if (nftsWithDifferentMetadata.length !== 0) {
+        nftsWithDifferentMetadata.forEach(
+          (elm) => this.updateNft(elm.nft, elm.newMetadata, addressToSearch, chainId)
+        );
       }
-    });
-    if (nftsWithDifferentMetadata.length !== 0) {
-      nftsWithDifferentMetadata.forEach(
-        (elm) => this.updateNft(elm.nft, elm.newMetadata, userAddress, chainId)
-      );
+    } finally {
+      releaseLock();
     }
   }
   /**
@@ -480,23 +505,25 @@ var NftController = class extends BaseController {
    */
   removeNft(address, tokenId, {
     networkClientId,
-    userAddress = __privateGet(this, _selectedAddress)
-  } = {
-    userAddress: __privateGet(this, _selectedAddress)
-  }) {
+    userAddress
+  } = {}) {
+    const addressToSearch = __privateMethod(this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, userAddress);
     const chainId = __privateMethod(this, _getCorrectChainId, getCorrectChainId_fn).call(this, { networkClientId });
     const checksumHexAddress = toChecksumHexAddress(address);
     __privateMethod(this, _removeIndividualNft, removeIndividualNft_fn).call(this, checksumHexAddress, tokenId, {
       chainId,
-      userAddress
+      userAddress: addressToSearch
     });
     const { allNfts } = this.state;
-    const nfts = allNfts[userAddress]?.[chainId] || [];
+    const nfts = allNfts[addressToSearch]?.[chainId] || [];
     const remainingNft = nfts.find(
       (nft) => nft.address.toLowerCase() === checksumHexAddress.toLowerCase()
     );
     if (!remainingNft) {
-      __privateMethod(this, _removeNftContract, removeNftContract_fn).call(this, checksumHexAddress, { chainId, userAddress });
+      __privateMethod(this, _removeNftContract, removeNftContract_fn).call(this, checksumHexAddress, {
+        chainId,
+        userAddress: addressToSearch
+      });
     }
   }
   /**
@@ -510,23 +537,25 @@ var NftController = class extends BaseController {
    */
   removeAndIgnoreNft(address, tokenId, {
     networkClientId,
-    userAddress = __privateGet(this, _selectedAddress)
-  } = {
-    userAddress: __privateGet(this, _selectedAddress)
-  }) {
+    userAddress
+  } = {}) {
+    const addressToSearch = __privateMethod(this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, userAddress);
     const chainId = __privateMethod(this, _getCorrectChainId, getCorrectChainId_fn).call(this, { networkClientId });
     const checksumHexAddress = toChecksumHexAddress(address);
     __privateMethod(this, _removeAndIgnoreIndividualNft, removeAndIgnoreIndividualNft_fn).call(this, checksumHexAddress, tokenId, {
       chainId,
-      userAddress
+      userAddress: addressToSearch
     });
     const { allNfts } = this.state;
-    const nfts = allNfts[userAddress]?.[chainId] || [];
+    const nfts = allNfts[addressToSearch]?.[chainId] || [];
     const remainingNft = nfts.find(
       (nft) => nft.address.toLowerCase() === checksumHexAddress.toLowerCase()
     );
     if (!remainingNft) {
-      __privateMethod(this, _removeNftContract, removeNftContract_fn).call(this, checksumHexAddress, { chainId, userAddress });
+      __privateMethod(this, _removeNftContract, removeNftContract_fn).call(this, checksumHexAddress, {
+        chainId,
+        userAddress: addressToSearch
+      });
     }
   }
   /**
@@ -549,16 +578,15 @@ var NftController = class extends BaseController {
    * @returns the NFT with the updated isCurrentlyOwned value
    */
   async checkAndUpdateSingleNftOwnershipStatus(nft, batch, {
-    userAddress = __privateGet(this, _selectedAddress),
+    userAddress,
     networkClientId
-  } = {
-    userAddress: __privateGet(this, _selectedAddress)
-  }) {
+  } = {}) {
+    const addressToSearch = __privateMethod(this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, userAddress);
     const chainId = __privateMethod(this, _getCorrectChainId, getCorrectChainId_fn).call(this, { networkClientId });
     const { address, tokenId } = nft;
     let isOwned = nft.isCurrentlyOwned;
     try {
-      isOwned = await this.isNftOwner(userAddress, address, tokenId, {
+      isOwned = await this.isNftOwner(addressToSearch, address, tokenId, {
         networkClientId
       });
     } catch {
@@ -571,23 +599,23 @@ var NftController = class extends BaseController {
       return updatedNft;
     }
     const { allNfts } = this.state;
-    const nfts = [...allNfts[userAddress]?.[chainId] || []];
+    const nfts = [...allNfts[addressToSearch]?.[chainId] || []];
     const indexToUpdate = nfts.findIndex(
       (item) => item.tokenId === tokenId && item.address.toLowerCase() === address.toLowerCase()
     );
     if (indexToUpdate !== -1) {
       nfts[indexToUpdate] = updatedNft;
       this.update((state) => {
-        state.allNfts[userAddress] = Object.assign(
+        state.allNfts[addressToSearch] = Object.assign(
           {},
-          state.allNfts[userAddress],
+          state.allNfts[addressToSearch],
           {
             [chainId]: nfts
           }
         );
       });
       __privateMethod(this, _updateNestedNftState, updateNestedNftState_fn).call(this, nfts, ALL_NFTS_STATE_KEY, {
-        userAddress,
+        userAddress: addressToSearch,
         chainId
       });
     }
@@ -602,13 +630,12 @@ var NftController = class extends BaseController {
    */
   async checkAndUpdateAllNftsOwnershipStatus({
     networkClientId,
-    userAddress = __privateGet(this, _selectedAddress)
-  } = {
-    userAddress: __privateGet(this, _selectedAddress)
-  }) {
+    userAddress
+  } = {}) {
+    const addressToSearch = __privateMethod(this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, userAddress);
     const chainId = __privateMethod(this, _getCorrectChainId, getCorrectChainId_fn).call(this, { networkClientId });
     const { allNfts } = this.state;
-    const nfts = allNfts[userAddress]?.[chainId] || [];
+    const nfts = allNfts[addressToSearch]?.[chainId] || [];
     const updatedNfts = await Promise.all(
       nfts.map(async (nft) => {
         return await this.checkAndUpdateSingleNftOwnershipStatus(nft, true, {
@@ -618,7 +645,7 @@ var NftController = class extends BaseController {
       })
     );
     __privateMethod(this, _updateNestedNftState, updateNestedNftState_fn).call(this, updatedNfts, ALL_NFTS_STATE_KEY, {
-      userAddress,
+      userAddress: addressToSearch,
       chainId
     });
   }
@@ -634,13 +661,12 @@ var NftController = class extends BaseController {
    */
   updateNftFavoriteStatus(address, tokenId, favorite, {
     networkClientId,
-    userAddress = __privateGet(this, _selectedAddress)
-  } = {
-    userAddress: __privateGet(this, _selectedAddress)
-  }) {
+    userAddress
+  } = {}) {
+    const addressToSearch = __privateMethod(this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, userAddress);
     const chainId = __privateMethod(this, _getCorrectChainId, getCorrectChainId_fn).call(this, { networkClientId });
     const { allNfts } = this.state;
-    const nfts = [...allNfts[userAddress]?.[chainId] || []];
+    const nfts = [...allNfts[addressToSearch]?.[chainId] || []];
     const index = nfts.findIndex(
       (nft) => nft.address === address && nft.tokenId === tokenId
     );
@@ -654,7 +680,7 @@ var NftController = class extends BaseController {
     nfts[index] = updatedNft;
     __privateMethod(this, _updateNestedNftState, updateNestedNftState_fn).call(this, nfts, ALL_NFTS_STATE_KEY, {
       chainId,
-      userAddress
+      userAddress: addressToSearch
     });
   }
   /**
@@ -768,7 +794,7 @@ var NftController = class extends BaseController {
   }
 };
 _mutex = new WeakMap();
-_selectedAddress = new WeakMap();
+_selectedAccountId = new WeakMap();
 _chainId = new WeakMap();
 _ipfsGateway = new WeakMap();
 _openSeaEnabled = new WeakMap();
@@ -795,31 +821,36 @@ onNetworkControllerNetworkDidChange_fn = function({
 };
 _onPreferencesControllerStateChange = new WeakSet();
 onPreferencesControllerStateChange_fn = async function({
-  selectedAddress,
   ipfsGateway,
   openSeaEnabled,
   isIpfsGatewayEnabled
 }) {
-  __privateSet(this, _selectedAddress, selectedAddress);
+  const selectedAccount = this.messagingSystem.call(
+    "AccountsController:getSelectedAccount"
+  );
+  __privateSet(this, _selectedAccountId, selectedAccount.id);
   __privateSet(this, _ipfsGateway, ipfsGateway);
   __privateSet(this, _openSeaEnabled, openSeaEnabled);
   __privateSet(this, _isIpfsGatewayEnabled, isIpfsGatewayEnabled);
   const needsUpdateNftMetadata = isIpfsGatewayEnabled && ipfsGateway !== "" || openSeaEnabled;
+  if (needsUpdateNftMetadata && selectedAccount) {
+    await __privateMethod(this, _updateNftUpdateForAccount, updateNftUpdateForAccount_fn).call(this, selectedAccount);
+  }
+};
+_onSelectedAccountChange = new WeakSet();
+onSelectedAccountChange_fn = async function(internalAccount) {
+  const oldSelectedAccountId = __privateGet(this, _selectedAccountId);
+  __privateSet(this, _selectedAccountId, internalAccount.id);
+  const needsUpdateNftMetadata = (__privateGet(this, _isIpfsGatewayEnabled) && __privateGet(this, _ipfsGateway) !== "" || __privateGet(this, _openSeaEnabled)) && oldSelectedAccountId !== internalAccount.id;
   if (needsUpdateNftMetadata) {
-    const nfts = this.state.allNfts[selectedAddress]?.[__privateGet(this, _chainId)] ?? [];
-    const nftsToUpdate = nfts.filter(
-      (singleNft) => !singleNft.name && !singleNft.description && !singleNft.image
-    );
-    if (nftsToUpdate.length !== 0) {
-      await this.updateNftMetadata({
-        nfts: nftsToUpdate,
-        userAddress: selectedAddress
-      });
-    }
+    await __privateMethod(this, _updateNftUpdateForAccount, updateNftUpdateForAccount_fn).call(this, internalAccount);
   }
 };
 _updateNestedNftState = new WeakSet();
 updateNestedNftState_fn = function(newCollection, baseStateKey, { userAddress, chainId }) {
+  if (!userAddress) {
+    return;
+  }
   this.update((state) => {
     const oldState = state[baseStateKey];
     const addressState = oldState[userAddress] || {};
@@ -985,7 +1016,7 @@ getNftInformation_fn = async function(contractAddress, tokenId, networkClientId)
     ...nftApiMetadata,
     name: blockchainMetadata?.name ?? nftApiMetadata?.name ?? null,
     description: blockchainMetadata?.description ?? nftApiMetadata?.description ?? null,
-    image: blockchainMetadata?.image ?? nftApiMetadata?.image ?? null,
+    image: nftApiMetadata?.image ?? blockchainMetadata?.image ?? null,
     standard: blockchainMetadata?.standard ?? nftApiMetadata?.standard ?? null,
     tokenURI: blockchainMetadata?.tokenURI ?? null
   };
@@ -1011,9 +1042,13 @@ getNftContractInformation_fn = async function(contractAddress, nftMetadataFromAp
     return {
       address: contractAddress,
       ...blockchainContractData,
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       schema_name: nftMetadataFromApi?.standard ?? null,
       collection: {
         name: null,
+        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+        // eslint-disable-next-line @typescript-eslint/naming-convention
         image_url: nftMetadataFromApi?.collection?.image ?? nftMetadataFromApi?.collection?.imageUrl ?? null,
         tokenCount: nftMetadataFromApi?.collection?.tokenCount ?? null,
         ...nftMetadataFromApi?.collection,
@@ -1023,13 +1058,25 @@ getNftContractInformation_fn = async function(contractAddress, nftMetadataFromAp
   }
   return {
     address: contractAddress,
+    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     asset_contract_type: null,
+    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     created_date: null,
+    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     schema_name: null,
     symbol: null,
+    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     total_supply: null,
     description: null,
+    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     external_link: null,
+    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     collection: { name: null, image_url: null }
   };
 };
@@ -1111,12 +1158,22 @@ addNftContract_fn = async function({
     }
     const contractInformation = await __privateMethod(this, _getNftContractInformation, getNftContractInformation_fn).call(this, checksumHexAddress, nftMetadata, networkClientId);
     const {
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       asset_contract_type,
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       created_date,
       symbol,
       description,
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       external_link,
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       schema_name,
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       collection: { name, image_url, tokenCount }
     } = contractInformation;
     if (source === "detected" /* Detected */ && "address" in contractInformation && typeof contractInformation.address === "string" && "collection" in contractInformation && contractInformation.collection.name === null && "image_url" in contractInformation.collection && contractInformation.collection.image_url === null && Object.entries(contractInformation).every(([key, value]) => {
@@ -1209,6 +1266,8 @@ validateWatchNft_fn = async function(asset, type, userAddress, { networkClientId
   }
   if (type !== ERC721 && type !== ERC1155) {
     throw rpcErrors.invalidParams(
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
       `Non NFT asset type ${type} not supported by watchNft`
     );
   }
@@ -1255,6 +1314,30 @@ getCorrectChainId_fn = function({
   }
   return __privateGet(this, _chainId);
 };
+_getAddressOrSelectedAddress = new WeakSet();
+getAddressOrSelectedAddress_fn = function(address) {
+  if (address) {
+    return address;
+  }
+  const selectedAccount = this.messagingSystem.call(
+    "AccountsController:getAccount",
+    __privateGet(this, _selectedAccountId)
+  );
+  return selectedAccount?.address || "";
+};
+_updateNftUpdateForAccount = new WeakSet();
+updateNftUpdateForAccount_fn = async function(account) {
+  const nfts = this.state.allNfts[account.address]?.[__privateGet(this, _chainId)] ?? [];
+  const nftsToUpdate = nfts.filter(
+    (singleNft) => !singleNft.name && !singleNft.description && !singleNft.image
+  );
+  if (nftsToUpdate.length !== 0) {
+    await this.updateNftMetadata({
+      nfts: nftsToUpdate,
+      userAddress: account.address
+    });
+  }
+};
 var NftController_default = NftController;
 
 export {
@@ -1262,4 +1345,4 @@ export {
   NftController,
   NftController_default
 };
-//# sourceMappingURL=chunk-62T7RKU3.mjs.map
+//# sourceMappingURL=chunk-W57QXOHJ.mjs.map