@metamask-previews/assets-controllers 28.0.0-preview-61ace68c → 28.0.0-preview-aedc5103

package/dist/AssetsContractController.js

@@ -3,16 +3,16 @@
 
 
 
-var _chunkQHU4H6HPjs = require('./chunk-QHU4H6HP.js');
-require('./chunk-OBOWNEJU.js');
-require('./chunk-3ZHN4GFT.js');
-require('./chunk-BO2WZDUM.js');
-require('./chunk-LS6R3HQL.js');
+var _chunkC4JDCQG2js = require('./chunk-C4JDCQG2.js');
+require('./chunk-TGKUZNML.js');
+require('./chunk-GCWWC4X3.js');
+require('./chunk-BM7EPTR6.js');
+require('./chunk-D6BDJYSK.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
 
-exports.AssetsContractController = _chunkQHU4H6HPjs.AssetsContractController; exports.MISSING_PROVIDER_ERROR = _chunkQHU4H6HPjs.MISSING_PROVIDER_ERROR; exports.SINGLE_CALL_BALANCES_ADDRESS_BY_CHAINID = _chunkQHU4H6HPjs.SINGLE_CALL_BALANCES_ADDRESS_BY_CHAINID; exports.default = _chunkQHU4H6HPjs.AssetsContractController_default;
+exports.AssetsContractController = _chunkC4JDCQG2js.AssetsContractController; exports.MISSING_PROVIDER_ERROR = _chunkC4JDCQG2js.MISSING_PROVIDER_ERROR; exports.SINGLE_CALL_BALANCES_ADDRESS_BY_CHAINID = _chunkC4JDCQG2js.SINGLE_CALL_BALANCES_ADDRESS_BY_CHAINID; exports.default = _chunkC4JDCQG2js.AssetsContractController_default;
 //# sourceMappingURL=AssetsContractController.js.map

package/dist/AssetsContractController.mjs

@@ -3,11 +3,11 @@ import {
   AssetsContractController_default,
   MISSING_PROVIDER_ERROR,
   SINGLE_CALL_BALANCES_ADDRESS_BY_CHAINID
-} from "./chunk-5MRF7YPD.mjs";
-import "./chunk-V46CHMOU.mjs";
-import "./chunk-S7UA2DU7.mjs";
-import "./chunk-LLYYJY7H.mjs";
-import "./chunk-X5PLVMOQ.mjs";
+} from "./chunk-RDWXY4OF.mjs";
+import "./chunk-AC5HGIHS.mjs";
+import "./chunk-N5H5KDJZ.mjs";
+import "./chunk-KS4MOA2T.mjs";
+import "./chunk-ZPAX2HLQ.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   AssetsContractController,

package/dist/NftController.js

@@ -2,13 +2,13 @@
 
 
 
-var _chunkRZPEI5OLjs = require('./chunk-RZPEI5OL.js');
+var _chunkUNKIHWZHjs = require('./chunk-UNKIHWZH.js');
 require('./chunk-RGHTNZQ6.js');
-require('./chunk-LS6R3HQL.js');
+require('./chunk-D6BDJYSK.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.NftController = _chunkRZPEI5OLjs.NftController; exports.default = _chunkRZPEI5OLjs.NftController_default; exports.getDefaultNftState = _chunkRZPEI5OLjs.getDefaultNftState;
+exports.NftController = _chunkUNKIHWZHjs.NftController; exports.default = _chunkUNKIHWZHjs.NftController_default; exports.getDefaultNftState = _chunkUNKIHWZHjs.getDefaultNftState;
 //# sourceMappingURL=NftController.js.map

package/dist/NftController.mjs

@@ -2,9 +2,9 @@ import {
   NftController,
   NftController_default,
   getDefaultNftState
-} from "./chunk-D33ADI5V.mjs";
+} from "./chunk-4PAJC7WC.mjs";
 import "./chunk-CP3HC7AQ.mjs";
-import "./chunk-X5PLVMOQ.mjs";
+import "./chunk-ZPAX2HLQ.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   NftController,

package/dist/NftDetectionController.js

@@ -2,12 +2,12 @@
 
 
 
-var _chunkEBX646YGjs = require('./chunk-EBX646YG.js');
+var _chunkJEGLHDNAjs = require('./chunk-JEGLHDNA.js');
 require('./chunk-RGHTNZQ6.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.BlockaidResultType = _chunkEBX646YGjs.BlockaidResultType; exports.NftDetectionController = _chunkEBX646YGjs.NftDetectionController; exports.default = _chunkEBX646YGjs.NftDetectionController_default;
+exports.BlockaidResultType = _chunkJEGLHDNAjs.BlockaidResultType; exports.NftDetectionController = _chunkJEGLHDNAjs.NftDetectionController; exports.default = _chunkJEGLHDNAjs.NftDetectionController_default;
 //# sourceMappingURL=NftDetectionController.js.map

package/dist/NftDetectionController.mjs

@@ -2,7 +2,7 @@ import {
   BlockaidResultType,
   NftDetectionController,
   NftDetectionController_default
-} from "./chunk-TFAPRTSR.mjs";
+} from "./chunk-KDMDWUVX.mjs";
 import "./chunk-CP3HC7AQ.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {

package/dist/Standards/ERC20Standard.js

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkBO2WZDUMjs = require('../chunk-BO2WZDUM.js');
-require('../chunk-LS6R3HQL.js');
+var _chunkBM7EPTR6js = require('../chunk-BM7EPTR6.js');
+require('../chunk-D6BDJYSK.js');
 require('../chunk-Z4BLTVTB.js');
 
 
-exports.ERC20Standard = _chunkBO2WZDUMjs.ERC20Standard;
+exports.ERC20Standard = _chunkBM7EPTR6js.ERC20Standard;
 //# sourceMappingURL=ERC20Standard.js.map

package/dist/Standards/ERC20Standard.mjs

@@ -1,7 +1,7 @@
 import {
   ERC20Standard
-} from "../chunk-LLYYJY7H.mjs";
-import "../chunk-X5PLVMOQ.mjs";
+} from "../chunk-KS4MOA2T.mjs";
+import "../chunk-ZPAX2HLQ.mjs";
 import "../chunk-XUI43LEZ.mjs";
 export {
   ERC20Standard

package/dist/Standards/NftStandards/ERC1155/ERC1155Standard.js

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunk3ZHN4GFTjs = require('../../../chunk-3ZHN4GFT.js');
-require('../../../chunk-LS6R3HQL.js');
+var _chunkGCWWC4X3js = require('../../../chunk-GCWWC4X3.js');
+require('../../../chunk-D6BDJYSK.js');
 require('../../../chunk-Z4BLTVTB.js');
 
 
-exports.ERC1155Standard = _chunk3ZHN4GFTjs.ERC1155Standard;
+exports.ERC1155Standard = _chunkGCWWC4X3js.ERC1155Standard;
 //# sourceMappingURL=ERC1155Standard.js.map

package/dist/Standards/NftStandards/ERC1155/ERC1155Standard.mjs

@@ -1,7 +1,7 @@
 import {
   ERC1155Standard
-} from "../../../chunk-S7UA2DU7.mjs";
-import "../../../chunk-X5PLVMOQ.mjs";
+} from "../../../chunk-N5H5KDJZ.mjs";
+import "../../../chunk-ZPAX2HLQ.mjs";
 import "../../../chunk-XUI43LEZ.mjs";
 export {
   ERC1155Standard

package/dist/Standards/NftStandards/ERC721/ERC721Standard.js

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkOBOWNEJUjs = require('../../../chunk-OBOWNEJU.js');
-require('../../../chunk-LS6R3HQL.js');
+var _chunkTGKUZNMLjs = require('../../../chunk-TGKUZNML.js');
+require('../../../chunk-D6BDJYSK.js');
 require('../../../chunk-Z4BLTVTB.js');
 
 
-exports.ERC721Standard = _chunkOBOWNEJUjs.ERC721Standard;
+exports.ERC721Standard = _chunkTGKUZNMLjs.ERC721Standard;
 //# sourceMappingURL=ERC721Standard.js.map

package/dist/Standards/NftStandards/ERC721/ERC721Standard.mjs

@@ -1,7 +1,7 @@
 import {
   ERC721Standard
-} from "../../../chunk-V46CHMOU.mjs";
-import "../../../chunk-X5PLVMOQ.mjs";
+} from "../../../chunk-AC5HGIHS.mjs";
+import "../../../chunk-ZPAX2HLQ.mjs";
 import "../../../chunk-XUI43LEZ.mjs";
 export {
   ERC721Standard

package/dist/TokenDetectionController.js

@@ -4,8 +4,8 @@
 
 
 
-var _chunkI53XGBU3js = require('./chunk-I53XGBU3.js');
-require('./chunk-LS6R3HQL.js');
+var _chunkQVSSEGA5js = require('./chunk-QVSSEGA5.js');
+require('./chunk-D6BDJYSK.js');
 require('./chunk-Z4BLTVTB.js');
 
 
@@ -13,5 +13,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.STATIC_MAINNET_TOKEN_LIST = _chunkI53XGBU3js.STATIC_MAINNET_TOKEN_LIST; exports.TokenDetectionController = _chunkI53XGBU3js.TokenDetectionController; exports.controllerName = _chunkI53XGBU3js.controllerName; exports.default = _chunkI53XGBU3js.TokenDetectionController_default; exports.isEqualCaseInsensitive = _chunkI53XGBU3js.isEqualCaseInsensitive;
+exports.STATIC_MAINNET_TOKEN_LIST = _chunkQVSSEGA5js.STATIC_MAINNET_TOKEN_LIST; exports.TokenDetectionController = _chunkQVSSEGA5js.TokenDetectionController; exports.controllerName = _chunkQVSSEGA5js.controllerName; exports.default = _chunkQVSSEGA5js.TokenDetectionController_default; exports.isEqualCaseInsensitive = _chunkQVSSEGA5js.isEqualCaseInsensitive;
 //# sourceMappingURL=TokenDetectionController.js.map

package/dist/TokenDetectionController.mjs

@@ -4,8 +4,8 @@ import {
   TokenDetectionController_default,
   controllerName,
   isEqualCaseInsensitive
-} from "./chunk-D3PCUDTX.mjs";
-import "./chunk-X5PLVMOQ.mjs";
+} from "./chunk-CNICDMRI.mjs";
+import "./chunk-ZPAX2HLQ.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   STATIC_MAINNET_TOKEN_LIST,

package/dist/TokenListController.js

@@ -2,13 +2,13 @@
 
 
 
-var _chunkDEQZ35QEjs = require('./chunk-DEQZ35QE.js');
-require('./chunk-OHSQRYVL.js');
-require('./chunk-LS6R3HQL.js');
+var _chunkQ6TLNHYCjs = require('./chunk-Q6TLNHYC.js');
+require('./chunk-D3N35ABH.js');
+require('./chunk-D6BDJYSK.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.TokenListController = _chunkDEQZ35QEjs.TokenListController; exports.default = _chunkDEQZ35QEjs.TokenListController_default; exports.getDefaultTokenListState = _chunkDEQZ35QEjs.getDefaultTokenListState;
+exports.TokenListController = _chunkQ6TLNHYCjs.TokenListController; exports.default = _chunkQ6TLNHYCjs.TokenListController_default; exports.getDefaultTokenListState = _chunkQ6TLNHYCjs.getDefaultTokenListState;
 //# sourceMappingURL=TokenListController.js.map

package/dist/TokenListController.mjs

@@ -2,9 +2,9 @@ import {
   TokenListController,
   TokenListController_default,
   getDefaultTokenListState
-} from "./chunk-RUE635TV.mjs";
-import "./chunk-NXGX7LZJ.mjs";
-import "./chunk-X5PLVMOQ.mjs";
+} from "./chunk-QQAG6ECS.mjs";
+import "./chunk-IURNPMBB.mjs";
+import "./chunk-ZPAX2HLQ.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   TokenListController,

package/dist/TokenRatesController.js

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkIOQX3VTDjs = require('./chunk-IOQX3VTD.js');
+var _chunkRUPB4ELKjs = require('./chunk-RUPB4ELK.js');
 require('./chunk-DYH5P3VY.js');
-require('./chunk-LS6R3HQL.js');
+require('./chunk-D6BDJYSK.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.TokenRatesController = _chunkIOQX3VTDjs.TokenRatesController; exports.default = _chunkIOQX3VTDjs.TokenRatesController_default;
+exports.TokenRatesController = _chunkRUPB4ELKjs.TokenRatesController; exports.default = _chunkRUPB4ELKjs.TokenRatesController_default;
 //# sourceMappingURL=TokenRatesController.js.map

package/dist/TokenRatesController.mjs

@@ -1,9 +1,9 @@
 import {
   TokenRatesController,
   TokenRatesController_default
-} from "./chunk-OWTCG2N3.mjs";
+} from "./chunk-NHX4QGOD.mjs";
 import "./chunk-PWZE6KJV.mjs";
-import "./chunk-X5PLVMOQ.mjs";
+import "./chunk-ZPAX2HLQ.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   TokenRatesController,

package/dist/TokensController.js

@@ -2,15 +2,15 @@
 
 
 
-var _chunkSOK5YX7Ijs = require('./chunk-SOK5YX7I.js');
-require('./chunk-3ZHN4GFT.js');
-require('./chunk-BO2WZDUM.js');
-require('./chunk-OHSQRYVL.js');
-require('./chunk-LS6R3HQL.js');
+var _chunkE2SLNUD4js = require('./chunk-E2SLNUD4.js');
+require('./chunk-GCWWC4X3.js');
+require('./chunk-BM7EPTR6.js');
+require('./chunk-D3N35ABH.js');
+require('./chunk-D6BDJYSK.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.TokensController = _chunkSOK5YX7Ijs.TokensController; exports.default = _chunkSOK5YX7Ijs.TokensController_default; exports.getDefaultTokensState = _chunkSOK5YX7Ijs.getDefaultTokensState;
+exports.TokensController = _chunkE2SLNUD4js.TokensController; exports.default = _chunkE2SLNUD4js.TokensController_default; exports.getDefaultTokensState = _chunkE2SLNUD4js.getDefaultTokensState;
 //# sourceMappingURL=TokensController.js.map

package/dist/TokensController.mjs

@@ -2,11 +2,11 @@ import {
   TokensController,
   TokensController_default,
   getDefaultTokensState
-} from "./chunk-6XOM7KOQ.mjs";
-import "./chunk-S7UA2DU7.mjs";
-import "./chunk-LLYYJY7H.mjs";
-import "./chunk-NXGX7LZJ.mjs";
-import "./chunk-X5PLVMOQ.mjs";
+} from "./chunk-ZM42FNAQ.mjs";
+import "./chunk-N5H5KDJZ.mjs";
+import "./chunk-KS4MOA2T.mjs";
+import "./chunk-IURNPMBB.mjs";
+import "./chunk-ZPAX2HLQ.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   TokensController,

package/dist/assetsUtil.js

@@ -14,7 +14,7 @@
 
 
 
-var _chunkLS6R3HQLjs = require('./chunk-LS6R3HQL.js');
+var _chunkD6BDJYSKjs = require('./chunk-D6BDJYSK.js');
 require('./chunk-Z4BLTVTB.js');
 
 
@@ -32,5 +32,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.SupportedTokenDetectionNetworks = _chunkLS6R3HQLjs.SupportedTokenDetectionNetworks; exports.TOKEN_PRICES_BATCH_SIZE = _chunkLS6R3HQLjs.TOKEN_PRICES_BATCH_SIZE; exports.addUrlProtocolPrefix = _chunkLS6R3HQLjs.addUrlProtocolPrefix; exports.compareNftMetadata = _chunkLS6R3HQLjs.compareNftMetadata; exports.divideIntoBatches = _chunkLS6R3HQLjs.divideIntoBatches; exports.ethersBigNumberToBN = _chunkLS6R3HQLjs.ethersBigNumberToBN; exports.fetchTokenContractExchangeRates = _chunkLS6R3HQLjs.fetchTokenContractExchangeRates; exports.formatAggregatorNames = _chunkLS6R3HQLjs.formatAggregatorNames; exports.formatIconUrlWithProxy = _chunkLS6R3HQLjs.formatIconUrlWithProxy; exports.getFormattedIpfsUrl = _chunkLS6R3HQLjs.getFormattedIpfsUrl; exports.getIpfsCIDv1AndPath = _chunkLS6R3HQLjs.getIpfsCIDv1AndPath; exports.isTokenDetectionSupportedForNetwork = _chunkLS6R3HQLjs.isTokenDetectionSupportedForNetwork; exports.isTokenListSupportedForNetwork = _chunkLS6R3HQLjs.isTokenListSupportedForNetwork; exports.reduceInBatchesSerially = _chunkLS6R3HQLjs.reduceInBatchesSerially; exports.removeIpfsProtocolPrefix = _chunkLS6R3HQLjs.removeIpfsProtocolPrefix;
+exports.SupportedTokenDetectionNetworks = _chunkD6BDJYSKjs.SupportedTokenDetectionNetworks; exports.TOKEN_PRICES_BATCH_SIZE = _chunkD6BDJYSKjs.TOKEN_PRICES_BATCH_SIZE; exports.addUrlProtocolPrefix = _chunkD6BDJYSKjs.addUrlProtocolPrefix; exports.compareNftMetadata = _chunkD6BDJYSKjs.compareNftMetadata; exports.divideIntoBatches = _chunkD6BDJYSKjs.divideIntoBatches; exports.ethersBigNumberToBN = _chunkD6BDJYSKjs.ethersBigNumberToBN; exports.fetchTokenContractExchangeRates = _chunkD6BDJYSKjs.fetchTokenContractExchangeRates; exports.formatAggregatorNames = _chunkD6BDJYSKjs.formatAggregatorNames; exports.formatIconUrlWithProxy = _chunkD6BDJYSKjs.formatIconUrlWithProxy; exports.getFormattedIpfsUrl = _chunkD6BDJYSKjs.getFormattedIpfsUrl; exports.getIpfsCIDv1AndPath = _chunkD6BDJYSKjs.getIpfsCIDv1AndPath; exports.isTokenDetectionSupportedForNetwork = _chunkD6BDJYSKjs.isTokenDetectionSupportedForNetwork; exports.isTokenListSupportedForNetwork = _chunkD6BDJYSKjs.isTokenListSupportedForNetwork; exports.reduceInBatchesSerially = _chunkD6BDJYSKjs.reduceInBatchesSerially; exports.removeIpfsProtocolPrefix = _chunkD6BDJYSKjs.removeIpfsProtocolPrefix;
 //# sourceMappingURL=assetsUtil.js.map

package/dist/assetsUtil.mjs

@@ -14,7 +14,7 @@ import {
   isTokenListSupportedForNetwork,
   reduceInBatchesSerially,
   removeIpfsProtocolPrefix
-} from "./chunk-X5PLVMOQ.mjs";
+} from "./chunk-ZPAX2HLQ.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   SupportedTokenDetectionNetworks,

package/dist/{chunk-D33ADI5V.mjs → chunk-4PAJC7WC.mjs}

@@ -1,13 +1,10 @@
 import {
   compareNftMetadata,
   getFormattedIpfsUrl
-} from "./chunk-X5PLVMOQ.mjs";
+} from "./chunk-ZPAX2HLQ.mjs";
 
 // src/NftController.ts
 import { isAddress } from "@ethersproject/address";
-import {
-  isEVMAccount
-} from "@metamask/accounts-controller";
 import { BaseControllerV1 } from "@metamask/base-controller";
 import {
   safelyExecute,
@@ -82,7 +79,7 @@ var NftController = class extends BaseControllerV1 {
      */
     this.name = "NftController";
     this.defaultConfig = {
-      selectedAccountId: "",
+      selectedAddress: "",
       chainId: initialChainId,
       ipfsGateway: IPFS_DEFAULT_GATEWAY_URL,
       openSeaEnabled: false,
@@ -100,41 +97,31 @@ var NftController = class extends BaseControllerV1 {
     this.getNetworkClientById = getNetworkClientById;
     this.onNftAdded = onNftAdded;
     this.messagingSystem = messenger;
-    this.messagingSystem.subscribe(
-      "AccountsController:selectedAccountChange",
-      (newSelectedAccount) => {
-        if (!isEVMAccount(newSelectedAccount)) {
-          return;
-        }
-        this.configure({ selectedAccountId: newSelectedAccount.id });
-      }
-    );
     onPreferencesStateChange(
-      async ({ ipfsGateway, openSeaEnabled, isIpfsGatewayEnabled }) => {
+      async ({
+        selectedAddress,
+        ipfsGateway,
+        openSeaEnabled,
+        isIpfsGatewayEnabled
+      }) => {
         this.configure({
+          selectedAddress,
           ipfsGateway,
           openSeaEnabled,
           isIpfsGatewayEnabled
         });
-        const { selectedAccountId } = this.config;
-        const selectedAccount = this.messagingSystem.call(
-          "AccountsController:getAccount",
-          selectedAccountId
-        );
-        if (selectedAccount && isEVMAccount(selectedAccount)) {
-          const needsUpdateNftMetadata = isIpfsGatewayEnabled && ipfsGateway !== "" || openSeaEnabled;
-          if (needsUpdateNftMetadata) {
-            const { chainId } = this.config;
-            const nfts = this.state.allNfts[selectedAccount.address]?.[chainId] ?? [];
-            const nftsToUpdate = nfts.filter(
-              (singleNft) => !singleNft.name && !singleNft.description && !singleNft.image
-            );
-            if (nftsToUpdate.length !== 0) {
-              await this.updateNftMetadata({
-                nfts: nftsToUpdate,
-                userAddress: selectedAccount.address
-              });
-            }
+        const needsUpdateNftMetadata = isIpfsGatewayEnabled && ipfsGateway !== "" || openSeaEnabled;
+        if (needsUpdateNftMetadata) {
+          const { chainId } = this.config;
+          const nfts = this.state.allNfts[selectedAddress]?.[chainId] ?? [];
+          const nftsToUpdate = nfts.filter(
+            (singleNft) => !singleNft.name && !singleNft.description && !singleNft.image
+          );
+          if (nftsToUpdate.length !== 0) {
+            await this.updateNftMetadata({
+              nfts: nftsToUpdate,
+              userAddress: selectedAddress
+            });
           }
         }
       }
@@ -152,7 +139,7 @@ var NftController = class extends BaseControllerV1 {
    *
    * @param newCollection - the modified piece of state to update in the controller's store
    * @param baseStateKey - The root key in the store to update.
-   * @param passedConfig - An object containing the selectedAccountId and chainId that are passed through the auto-detection flow.
+   * @param passedConfig - An object containing the selectedAddress and chainId that are passed through the auto-detection flow.
    * @param passedConfig.userAddress - the address passed through the NFT detection flow to ensure assets are stored to the correct account
    * @param passedConfig.chainId - the chainId passed through the NFT detection flow to ensure assets are stored to the correct account
    */
@@ -706,17 +693,10 @@ var NftController = class extends BaseControllerV1 {
    */
   async watchNft(asset, type, origin, {
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
-      return;
-    }
-    userAddress = userAddress || selectedAccount.address;
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     await this.validateWatchNft(asset, type, userAddress);
     const nftMetadata = await this.getNftInformation(
       asset.address,
@@ -807,19 +787,12 @@ var NftController = class extends BaseControllerV1 {
    * @param options.source - Whether the NFT was detected, added manually or suggested by a dapp.
    */
   async addNftVerifyOwnership(address, tokenId, {
-    userAddress,
+    userAddress = this.config.selectedAddress,
     networkClientId,
     source
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
-      return;
-    }
-    userAddress = userAddress ?? selectedAccount.address;
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     if (!await this.isNftOwner(userAddress, address, tokenId, {
       networkClientId
     })) {
@@ -845,19 +818,10 @@ var NftController = class extends BaseControllerV1 {
    */
   async addNft(tokenAddress, tokenId, {
     nftMetadata,
-    userAddress,
+    userAddress = this.config.selectedAddress,
     source = "custom" /* Custom */,
     networkClientId
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
-      return;
-    }
-    userAddress = userAddress ?? selectedAccount.address;
+  } = { userAddress: this.config.selectedAddress }) {
     tokenAddress = toChecksumHexAddress(tokenAddress);
     const chainId = this.getCorrectChainId({ networkClientId });
     nftMetadata = nftMetadata || await this.getNftInformation(tokenAddress, tokenId, networkClientId);
@@ -893,17 +857,9 @@ var NftController = class extends BaseControllerV1 {
    */
   async updateNftMetadata({
     nfts,
-    userAddress,
+    userAddress = this.config.selectedAddress,
     networkClientId
   }) {
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      this.config.selectedAccountId
-    );
-    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
-      return;
-    }
-    const addressToSearch = userAddress || selectedAccount.address;
     const chainId = this.getCorrectChainId({ networkClientId });
     const nftsWithChecksumAdr = nfts.map((nft) => {
       return {
@@ -930,7 +886,7 @@ var NftController = class extends BaseControllerV1 {
       (elm) => this.updateNft(
         elm.value.nft,
         elm.value.newMetadata,
-        addressToSearch,
+        userAddress,
         chainId
       )
     );
@@ -946,17 +902,10 @@ var NftController = class extends BaseControllerV1 {
    */
   removeNft(address, tokenId, {
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
-      return;
-    }
-    userAddress = userAddress || selectedAccount.address;
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     address = toChecksumHexAddress(address);
     this.removeIndividualNft(address, tokenId, { chainId, userAddress });
@@ -980,17 +929,10 @@ var NftController = class extends BaseControllerV1 {
    */
   removeAndIgnoreNft(address, tokenId, {
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
-      return;
-    }
-    userAddress = userAddress || selectedAccount.address;
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     address = toChecksumHexAddress(address);
     this.removeAndIgnoreIndividualNft(address, tokenId, {
@@ -1024,18 +966,11 @@ var NftController = class extends BaseControllerV1 {
    * @returns the NFT with the updated isCurrentlyOwned value
    */
   async checkAndUpdateSingleNftOwnershipStatus(nft, batch, {
-    userAddress,
+    userAddress = this.config.selectedAddress,
     networkClientId
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
-      throw new Error("Non EVM Account selected");
-    }
-    userAddress = userAddress || selectedAccount.address;
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     const { address, tokenId } = nft;
     let isOwned = nft.isCurrentlyOwned;
@@ -1072,17 +1007,10 @@ var NftController = class extends BaseControllerV1 {
    */
   async checkAndUpdateAllNftsOwnershipStatus({
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
-      return;
-    }
-    userAddress = userAddress || selectedAccount.address;
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     const { allNfts } = this.state;
     const nfts = allNfts[userAddress]?.[chainId] || [];
@@ -1111,17 +1039,10 @@ var NftController = class extends BaseControllerV1 {
    */
   updateNftFavoriteStatus(address, tokenId, favorite, {
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
-      return;
-    }
-    userAddress = userAddress || selectedAccount.address;
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     const { allNfts } = this.state;
     const nfts = allNfts[userAddress]?.[chainId] || [];
@@ -1258,4 +1179,4 @@ export {
   NftController,
   NftController_default
 };
-//# sourceMappingURL=chunk-D33ADI5V.mjs.map
+//# sourceMappingURL=chunk-4PAJC7WC.mjs.map