m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Ensure approval warning for setApprovalForAll is not shown when revoking (#15806)

Browse Source 
Co-authored-by: ryanml <ryanlanese@gmail.com>
This commit is contained in:
Dan J Miller 2022-09-14 13:02:04 -02:30 committed by GitHub
parent c87980bbfe
commit fc65ca63af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/components/app/confirm-page-container/confirm-page-container.component.js
View File

@ -97,6 +97,7 @@ export default class ConfirmPageContainer extends Component {
nativeCurrency: PropTypes.string, nativeCurrency: PropTypes.string,
showBuyModal: PropTypes.func, showBuyModal: PropTypes.func,
isBuyableChain: PropTypes.bool, isBuyableChain: PropTypes.bool,
setApproveForAllArg: PropTypes.bool,
}; };
render() { render() {
@ -153,6 +154,7 @@ export default class ConfirmPageContainer extends Component {
showBuyModal, showBuyModal,
isBuyableChain, isBuyableChain,
networkIdentifier, networkIdentifier,
setApproveForAllArg,
} = this.props; } = this.props;
const showAddToAddressDialog = const showAddToAddressDialog =
@ -306,7 +308,7 @@ export default class ConfirmPageContainer extends Component {
<ErrorMessage errorKey={errorKey} /> <ErrorMessage errorKey={errorKey} />
</div> </div>
)} )}
{isSetApproveForAll && ( {isSetApproveForAll && !setApproveForAllArg && (
<Dialog type="error" className="confirm-page-container__dialog"> <Dialog type="error" className="confirm-page-container__dialog">
{/* {/*
TODO: https://github.com/MetaMask/metamask-extension/issues/15745 TODO: https://github.com/MetaMask/metamask-extension/issues/15745

1
ui/pages/confirm-approve/confirm-approve.js
View File

@ -172,6 +172,7 @@ export default function ConfirmApprove({
customTokenAmount={String(customPermissionAmount)} customTokenAmount={String(customPermissionAmount)}
dappProposedTokenAmount={tokenAmount} dappProposedTokenAmount={tokenAmount}
currentTokenBalance={tokenBalance} currentTokenBalance={tokenBalance}
setApproveForAllArg={setApproveForAllArg}
contentComponent={ contentComponent={
<TransactionModalContextProvider> <TransactionModalContextProvider>
<ConfirmApproveContent <ConfirmApproveContent

3
ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
View File

@ -151,6 +151,7 @@ export default class ConfirmTransactionBase extends Component {
eip1559V2Enabled: PropTypes.bool, eip1559V2Enabled: PropTypes.bool,
showBuyModal: PropTypes.func, showBuyModal: PropTypes.func,
isBuyableChain: PropTypes.bool, isBuyableChain: PropTypes.bool,
setApproveForAllArg: PropTypes.bool,
}; };
state = { state = {
@ -1048,6 +1049,7 @@ export default class ConfirmTransactionBase extends Component {
nativeCurrency, nativeCurrency,
hardwareWalletRequiresConnection, hardwareWalletRequiresConnection,
image, image,
setApproveForAllArg,
} = this.props; } = this.props;
const { const {
submitting, submitting,
@ -1148,6 +1150,7 @@ export default class ConfirmTransactionBase extends Component {
currentTransaction={txData} currentTransaction={txData}
supportsEIP1559V2={this.supportsEIP1559V2} supportsEIP1559V2={this.supportsEIP1559V2}
nativeCurrency={nativeCurrency} nativeCurrency={nativeCurrency}
setApproveForAllArg={setApproveForAllArg}
/> />
</TransactionModalContextProvider> </TransactionModalContextProvider>
); );