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

Skip the first token allowance screen if dapp proposing spending cap is 0 (#16502)

Browse Source
This commit is contained in:
Adnan Sahovic 2022-11-17 15:12:44 +01:00 committed by seaona
parent 26b0fc35fb
commit 899ecfbf1d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/pages/token-allowance/token-allowance.js
View File

@ -76,7 +76,9 @@ export default function TokenAllowance({
const [showContractDetails, setShowContractDetails] = useState(false);
const [showFullTxDetails, setShowFullTxDetails] = useState(false);
const [isFirstPage, setIsFirstPage] = useState(true);
const [isFirstPage, setIsFirstPage] = useState(
dappProposedTokenAmount !== '0',
);
const [errorText, setErrorText] = useState('');
const currentAccount = useSelector(getCurrentAccountWithSendEtherInfo);
@ -181,6 +183,8 @@ export default function TokenAllowance({
setIsFirstPage(true);
};
const isEmpty = customTokenAmount === '';
return (
<Box className="token-allowance-container page-container">
<Box
@ -267,7 +271,7 @@ export default function TokenAllowance({
>
{isFirstPage && t('setSpendingCap')}
{!isFirstPage &&
(customTokenAmount === 0
(customTokenAmount === '0' || isEmpty
? t('revokeSpendingCap')
: t('reviewSpendingCap'))}
</Typography>
@ -309,7 +313,11 @@ export default function TokenAllowance({
<ReviewSpendingCap
tokenName={tokenSymbol}
currentTokenBalance={parseFloat(currentTokenBalance)}
tokenValue={parseFloat(customTokenAmount)}
tokenValue={
isNaN(parseFloat(customTokenAmount))
? parseFloat(dappProposedTokenAmount)
: parseFloat(customTokenAmount)
}
onEdit={() => handleBackClick()}
/>
)}