this.selectToken(AssetType.NFT, collectible)}
+ onClick={() => this.selectToken(AssetType.NFT, nft)}
>
- {collectibleCollection.name || name}
+ {nftCollection.name || name}
diff --git a/ui/pages/send/send-content/send-asset-row/send-asset-row.container.js b/ui/pages/send/send-content/send-asset-row/send-asset-row.container.js
index 8bc7563e3..63c579c57 100644
--- a/ui/pages/send/send-content/send-asset-row/send-asset-row.container.js
+++ b/ui/pages/send/send-content/send-asset-row/send-asset-row.container.js
@@ -1,7 +1,7 @@
import { connect } from 'react-redux';
import {
- getCollectibleContracts,
- getCollectibles,
+ getNftContracts,
+ getNfts,
getNativeCurrency,
} from '../../../../ducks/metamask/metamask';
import {
@@ -15,8 +15,8 @@ function mapStateToProps(state) {
return {
tokens: state.metamask.tokens,
selectedAddress: state.metamask.selectedAddress,
- collectibles: getCollectibles(state),
- collections: getCollectibleContracts(state),
+ nfts: getNfts(state),
+ collections: getNftContracts(state),
sendAsset: getSendAsset(state),
accounts: getMetaMaskAccounts(state),
nativeCurrency: getNativeCurrency(state),
diff --git a/ui/pages/send/send.constants.js b/ui/pages/send/send.constants.js
index a93828ddd..ed1fc34b5 100644
--- a/ui/pages/send/send.constants.js
+++ b/ui/pages/send/send.constants.js
@@ -22,7 +22,7 @@ const MIN_GAS_TOTAL = new Numeric(MIN_GAS_LIMIT_HEX, 16)
.toPrefixedHexString();
const TOKEN_TRANSFER_FUNCTION_SIGNATURE = '0xa9059cbb';
-const COLLECTIBLE_TRANSFER_FROM_FUNCTION_SIGNATURE = '0x23b872dd';
+const NFT_TRANSFER_FROM_FUNCTION_SIGNATURE = '0x23b872dd';
const INSUFFICIENT_FUNDS_ERROR = 'insufficientFunds';
const INSUFFICIENT_FUNDS_FOR_GAS_ERROR = 'insufficientFundsForGas';
@@ -72,6 +72,6 @@ export {
REQUIRED_ERROR,
CONFUSING_ENS_ERROR,
TOKEN_TRANSFER_FUNCTION_SIGNATURE,
- COLLECTIBLE_TRANSFER_FROM_FUNCTION_SIGNATURE,
+ NFT_TRANSFER_FROM_FUNCTION_SIGNATURE,
RECIPIENT_TYPES,
};
diff --git a/ui/pages/send/send.utils.js b/ui/pages/send/send.utils.js
index 4463fd9b3..a6cf3057d 100644
--- a/ui/pages/send/send.utils.js
+++ b/ui/pages/send/send.utils.js
@@ -5,7 +5,7 @@ import { TokenStandard } from '../../../shared/constants/transaction';
import { Numeric } from '../../../shared/modules/Numeric';
import {
TOKEN_TRANSFER_FUNCTION_SIGNATURE,
- COLLECTIBLE_TRANSFER_FROM_FUNCTION_SIGNATURE,
+ NFT_TRANSFER_FROM_FUNCTION_SIGNATURE,
} from './send.constants';
export {
@@ -100,7 +100,7 @@ function generateERC721TransferData({
return undefined;
}
return (
- COLLECTIBLE_TRANSFER_FROM_FUNCTION_SIGNATURE +
+ NFT_TRANSFER_FROM_FUNCTION_SIGNATURE +
Array.prototype.map
.call(
abi.rawEncode(
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index b7b08ffe9..706195f22 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1152,11 +1152,11 @@ export function doesAddressRequireLedgerHidConnection(state, address) {
);
}
-export function getNewCollectibleAddedMessage(state) {
+export function getNewNftAddedMessage(state) {
return state.appState.newNftAddedMessage;
}
-export function getRemoveCollectibleMessage(state) {
+export function getRemoveNftMessage(state) {
return state.appState.removeNftMessage;
}
diff --git a/ui/store/actionConstants.ts b/ui/store/actionConstants.ts
index d88825ba2..38425341b 100644
--- a/ui/store/actionConstants.ts
+++ b/ui/store/actionConstants.ts
@@ -78,9 +78,8 @@ export const SET_FIRST_TIME_FLOW_TYPE = 'SET_FIRST_TIME_FLOW_TYPE';
export const SET_SELECTED_SETTINGS_RPC_URL = 'SET_SELECTED_SETTINGS_RPC_URL';
export const SET_NEW_NETWORK_ADDED = 'SET_NEW_NETWORK_ADDED';
-export const SET_NEW_COLLECTIBLE_ADDED_MESSAGE =
- 'SET_NEW_COLLECTIBLE_ADDED_MESSAGE';
-export const SET_REMOVE_COLLECTIBLE_MESSAGE = 'SET_REMOVE_COLLECTIBLE_MESSAGE';
+export const SET_NEW_NFT_ADDED_MESSAGE = 'SET_NEW_NFT_ADDED_MESSAGE';
+export const SET_REMOVE_NFT_MESSAGE = 'SET_REMOVE_NFT_MESSAGE';
export const SET_NEW_CUSTOM_NETWORK_ADDED = 'SET_NEW_CUSTOM_NETWORK_ADDED';
export const LOADING_METHOD_DATA_STARTED = 'LOADING_METHOD_DATA_STARTED';
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index ea54485c2..7e1056171 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -2103,10 +2103,10 @@ export function addNft(
): ThunkAction {
return async (dispatch) => {
if (!address) {
- throw new Error('MetaMask - Cannot add collectible without address');
+ throw new Error('MetaMask - Cannot add NFT without address');
}
if (!tokenID) {
- throw new Error('MetaMask - Cannot add collectible without tokenID');
+ throw new Error('MetaMask - Cannot add NFT without tokenID');
}
if (!dontShowLoadingIndicator) {
dispatch(showLoadingIndication());
@@ -2130,10 +2130,10 @@ export function addNftVerifyOwnership(
): ThunkAction {
return async (dispatch) => {
if (!address) {
- throw new Error('MetaMask - Cannot add collectible without address');
+ throw new Error('MetaMask - Cannot add NFT without address');
}
if (!tokenID) {
- throw new Error('MetaMask - Cannot add collectible without tokenID');
+ throw new Error('MetaMask - Cannot add NFT without tokenID');
}
if (!dontShowLoadingIndicator) {
dispatch(showLoadingIndication());
@@ -2168,10 +2168,10 @@ export function removeAndIgnoreNft(
): ThunkAction {
return async (dispatch) => {
if (!address) {
- throw new Error('MetaMask - Cannot ignore collectible without address');
+ throw new Error('MetaMask - Cannot ignore NFT without address');
}
if (!tokenID) {
- throw new Error('MetaMask - Cannot ignore collectible without tokenID');
+ throw new Error('MetaMask - Cannot ignore NFT without tokenID');
}
if (!dontShowLoadingIndicator) {
dispatch(showLoadingIndication());
@@ -2195,10 +2195,10 @@ export function removeNft(
): ThunkAction {
return async (dispatch) => {
if (!address) {
- throw new Error('MetaMask - Cannot remove collectible without address');
+ throw new Error('MetaMask - Cannot remove NFT without address');
}
if (!tokenID) {
- throw new Error('MetaMask - Cannot remove collectible without tokenID');
+ throw new Error('MetaMask - Cannot remove NFT without tokenID');
}
if (!dontShowLoadingIndicator) {
dispatch(showLoadingIndication());
@@ -2221,13 +2221,13 @@ export async function checkAndUpdateAllNftsOwnershipStatus() {
export async function isNftOwner(
ownerAddress: string,
- collectibleAddress: string,
- collectibleId: string,
+ nftAddress: string,
+ nftId: string,
): Promise {
return await submitRequestToBackground('isNftOwner', [
ownerAddress,
- collectibleAddress,
- collectibleId,
+ nftAddress,
+ nftId,
]);
}
@@ -2672,19 +2672,19 @@ export function hideAlert(): Action {
/**
* TODO: this should be moved somewhere else when it makese sense to do so
*/
-interface CollectibleDropDownState {
+interface NftDropDownState {
[address: string]: {
[chainId: string]: {
- [collectibleAddress: string]: boolean;
+ [nftAddress: string]: boolean;
};
};
}
-export function updateCollectibleDropDownState(
- value: CollectibleDropDownState,
+export function updateNftDropDownState(
+ value: NftDropDownState,
): ThunkAction {
return async (dispatch) => {
- await submitRequestToBackground('updateCollectibleDropDownState', [value]);
+ await submitRequestToBackground('updateNftDropDownState', [value]);
await forceUpdateMetamaskState(dispatch);
};
}
@@ -3775,20 +3775,20 @@ export function setNewNetworkAdded(
};
}
-export function setNewCollectibleAddedMessage(
+export function setNewNftAddedMessage(
newNftAddedMessage: string,
): PayloadAction {
return {
- type: actionConstants.SET_NEW_COLLECTIBLE_ADDED_MESSAGE,
+ type: actionConstants.SET_NEW_NFT_ADDED_MESSAGE,
payload: newNftAddedMessage,
};
}
-export function setRemoveCollectibleMessage(
+export function setRemoveNftMessage(
removeNftMessage: string,
): PayloadAction {
return {
- type: actionConstants.SET_REMOVE_COLLECTIBLE_MESSAGE,
+ type: actionConstants.SET_REMOVE_NFT_MESSAGE,
payload: removeNftMessage,
};
}