Added token standard condition

MetaMask · Sep 8, 2022 · b6c4124 · b6c4124
1 parent 4b3fa0b
commit b6c4124
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 22 deletions.
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-container.test.js b/ui/components/app/confirm-page-container/confirm-page-container-container.test.js
@@ -54,12 +54,6 @@ describe('Confirm Page Container Container Test', () => {
     toAddress: '0x7a1A4Ad9cc746a70ee58568466f7996dD0aCE4E8',
     origin: 'testOrigin', // required
     onNextTx: sinon.spy(),
-    txTokenAddress: '0x114352b0e1bf40f0b6aae8de4c974250de938c82',
-    getTokenStandardAndDetails: () => {
-      return {
-        standard: 'ERC721',
-      };
-    },
     // Footer
     onCancelAll: sinon.spy(),
     onCancel: sinon.spy(),

diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js
@@ -36,7 +36,6 @@ import {
 export default class ConfirmPageContainer extends Component {
   state = {
     showNicknamePopovers: false,
-    tokenStandard: '',
   };
 
   static contextTypes = {
@@ -56,8 +55,7 @@ export default class ConfirmPageContainer extends Component {
     hideSenderToRecipient: PropTypes.bool,
     showAccountInHeader: PropTypes.bool,
     accountBalance: PropTypes.string,
-    txTokenAddress: PropTypes.string,
-    getTokenStandardAndDetails: PropTypes.func,
+    assetStandard: PropTypes.string,
     // Sender to Recipient
     fromAddress: PropTypes.string,
     fromName: PropTypes.string,
@@ -107,13 +105,6 @@ export default class ConfirmPageContainer extends Component {
     isBuyableChain: PropTypes.bool,
   };
 
-  async componentDidMount() {
-    const { standard } = await this.props.getTokenStandardAndDetails(
-      this.props.txTokenAddress,
-    );
-    this.setState({ tokenStandard: standard });
-  }
-
   render() {
     const {
       showEdit,
@@ -169,6 +160,7 @@ export default class ConfirmPageContainer extends Component {
       isBuyableChain,
       networkIdentifier,
       accountBalance,
+      assetStandard,
     } = this.props;
 
     const showAddToAddressDialog =
@@ -209,7 +201,7 @@ export default class ConfirmPageContainer extends Component {
             ofText={ofText}
             requestsWaitingText={requestsWaitingText}
           />
-          {this.state.tokenStandard === ERC721 &&
+          {assetStandard === ERC721 &&
           (isSetApproveForAll || isSetNftApprove) ? (
             <NetworkAccountBalanceHeader
               accountName={fromName}

diff --git a/ui/components/app/confirm-page-container/confirm-page-container.container.js b/ui/components/app/confirm-page-container/confirm-page-container.container.js
@@ -6,7 +6,7 @@ import {
   getNetworkIdentifier,
   getSwapsDefaultToken,
 } from '../../../selectors';
-import { getTokenStandardAndDetails, showModal } from '../../../store/actions';
+import { showModal } from '../../../store/actions';
 import ConfirmPageContainer from './confirm-page-container.component';
 
 function mapStateToProps(state, ownProps) {
@@ -16,7 +16,6 @@ function mapStateToProps(state, ownProps) {
   const networkIdentifier = getNetworkIdentifier(state);
   const defaultToken = getSwapsDefaultToken(state);
   const accountBalance = defaultToken.string;
-  const txTokenAddress = ownProps.currentTransaction.txParams.to;
 
   return {
     isBuyableChain,
@@ -28,15 +27,12 @@ function mapStateToProps(state, ownProps) {
     to,
     networkIdentifier,
     accountBalance,
-    txTokenAddress,
   };
 }
 
 const mapDispatchToProps = (dispatch) => {
   return {
     showBuyModal: () => dispatch(showModal({ name: 'DEPOSIT_ETHER' })),
-    getTokenStandardAndDetails: async (tokenAddress) =>
-      await getTokenStandardAndDetails(tokenAddress),
   };
 };
 

diff --git a/ui/pages/confirm-approve/confirm-approve.js b/ui/pages/confirm-approve/confirm-approve.js
@@ -278,6 +278,7 @@ export default function ConfirmApprove({
           }
           hideSenderToRecipient
           customTxParamsData={customData}
+          assetStandard={assetStandard}
         />
       </GasFeeContextProvider>
     )

diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -151,6 +151,7 @@ export default class ConfirmTransactionBase extends Component {
     eip1559V2Enabled: PropTypes.bool,
     showBuyModal: PropTypes.func,
     isBuyableChain: PropTypes.bool,
+    assetStandard: PropTypes.string,
   };
 
   state = {
@@ -1048,6 +1049,7 @@ export default class ConfirmTransactionBase extends Component {
       nativeCurrency,
       hardwareWalletRequiresConnection,
       image,
+      assetStandard,
     } = this.props;
     const {
       submitting,
@@ -1148,6 +1150,7 @@ export default class ConfirmTransactionBase extends Component {
           currentTransaction={txData}
           supportsEIP1559V2={this.supportsEIP1559V2}
           nativeCurrency={nativeCurrency}
+          assetStandard={assetStandard}
         />
       </TransactionModalContextProvider>
     );