Skip to content

fix: reset usdt allowance #3062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AGMASO merged 2 commits into from
Jul 3, 2026
+13 −8
Merged

fix: reset usdt allowance #3062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc4bd23
fix: reset usdt allowance
AGMASO Jul 3, 2026
fad4314
fix: sub one unit usdt supply/stake
AGMASO Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/hooks/useApprovalTx.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { ApproveType, MAX_UINT_AMOUNT, ProtocolAction } from '@aave/contract-helpers';
import { valueToBigNumber } from '@aave/math-utils';
import { SignatureLike } from '@ethersproject/bytes';
import { constants, ethers } from 'ethers';
import { parseUnits } from 'ethers/lib/utils';
Expand Down Expand Up @@ -82,13 +81,10 @@ export const useApprovalTx = ({
return;
}

const amountToApprove = parseUnits(signatureAmount, decimals).toString();
const currentApproved = approvedAmount?.amount
? valueToBigNumber(approvedAmount.amount).toFixed(0)
: '0';
const currentApproved = approvedAmount?.amount ?? '0';

if (
needsUSDTApprovalReset(symbol, chainId, currentApproved, amountToApprove, underlyingChainId)
needsUSDTApprovalReset(symbol, chainId, currentApproved, signatureAmount, underlyingChainId)
Comment thread
AGMASO marked this conversation as resolved.
) {
setShowUSDTResetWarning(true);
setRequiresApprovalReset(true);
Expand All @@ -103,7 +99,6 @@ export const useApprovalTx = ({
approvedAmount?.amount,
signatureAmount,
setShowUSDTResetWarning,
decimals,
]);

const approval = async () => {
Expand Down
7 changes: 6 additions & 1 deletion src/modules/umbrella/UmbrellaActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export interface StakeActionProps extends BoxProps {
event: string;
isMaxSelected: boolean;
reserve: ComputedReserveData;
setShowUSDTResetWarning?: (showUSDTResetWarning: boolean) => void;
}

export const UmbrellaActions = ({
Expand All @@ -53,6 +54,7 @@ export const UmbrellaActions = ({
stakeData,
isMaxSelected,
reserve,
setShowUSDTResetWarning,
...props
}: StakeActionProps) => {
const queryClient = useQueryClient();
Expand Down Expand Up @@ -139,7 +141,7 @@ export const UmbrellaActions = ({
amount: approvedAmount?.toString() || '0',
};

const { approval } = useApprovalTx({
const { approval, requiresApprovalReset } = useApprovalTx({
usePermit,
approvedAmount: tokenApproval,
requiresApproval,
Expand All @@ -150,6 +152,8 @@ export const UmbrellaActions = ({
onApprovalTxConfirmed: fetchApprovedAmount,
signatureAmount: amount,
onSignTxCompleted: (signedParams) => setSignatureParams(signedParams),
chainId: currentChainId,
setShowUSDTResetWarning,
});

const { currentAccount, sendTx } = useWeb3Context();
Expand Down Expand Up @@ -287,6 +291,7 @@ export const UmbrellaActions = ({
blocked={blocked}
// event={STAKE.STAKE_BUTTON_MODAL}
{...props}
requiresApprovalReset={requiresApprovalReset}
/>
);
};
5 changes: 5 additions & 0 deletions src/modules/umbrella/UmbrellaModalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
DetailsNumberLine,
TxModalDetails,
} from 'src/components/transactions/FlowCommons/TxModalDetails';
import { USDTResetWarning } from 'src/components/transactions/Warnings/USDTResetWarning';
import { CooldownWarning } from 'src/components/Warnings/CooldownWarning';
import { ExtendedFormattedUser } from 'src/hooks/pool/useExtendedUserSummaryAndIncentives';
import { FormattedReservesAndIncentives } from 'src/hooks/pool/usePoolFormattedReserves';
Expand Down Expand Up @@ -88,6 +89,7 @@ export const UmbrellaModalContent = ({ stakeData, user, userReserve, poolReserve

const [riskCheckboxAccepted, setRiskCheckboxAccepted] = useState(false);
const [_amount, setAmount] = useState('');
const [showUSDTResetWarning, setShowUSDTResetWarning] = useState(false);

const [currentChainId] = useRootStore(
useShallow((store) => [store.currentChainId, store.currentNetworkConfig])
Expand Down Expand Up @@ -271,6 +273,8 @@ export const UmbrellaModalContent = ({ stakeData, user, userReserve, poolReserve
</>
)}

{showUSDTResetWarning && <USDTResetWarning />}

<UmbrellaActions
sx={{ mt: '48px' }}
amountToStake={amount || '0'}
Expand All @@ -284,6 +288,7 @@ export const UmbrellaModalContent = ({ stakeData, user, userReserve, poolReserve
stakeData={stakeData}
event={STAKE.STAKE_TOKEN}
isMaxSelected={isMaxSelected}
setShowUSDTResetWarning={setShowUSDTResetWarning}
/>
</>
);
Expand Down
Loading