diff --git a/src/components/Aggregator/hooks/useTokenApprove.ts b/src/components/Aggregator/hooks/useTokenApprove.ts index e65ebbe0..8ba3a2cb 100644 --- a/src/components/Aggregator/hooks/useTokenApprove.ts +++ b/src/components/Aggregator/hooks/useTokenApprove.ts @@ -243,6 +243,7 @@ export const useTokenApprove = ({ isConfirmingResetApproval: isResetLoading, allowance, shouldRemoveApproval, - refetch + refetch, + isAllowanceNearAmount: allowance && normalizedAmount && BigInt(normalizedAmount) > 0n && allowance > 0n && (BigInt(normalizedAmount) - (BigInt(normalizedAmount) / 10n)) <= allowance, }; -}; +}; \ No newline at end of file diff --git a/src/components/Aggregator/index.tsx b/src/components/Aggregator/index.tsx index 3098cd66..0da42fe6 100644 --- a/src/components/Aggregator/index.tsx +++ b/src/components/Aggregator/index.tsx @@ -735,7 +735,8 @@ export function AggregatorContainer({ tokenList }) { shouldRemoveApproval, allowance, errorFetchingAllowance, - refetch: refetchTokenAllowance + refetch: refetchTokenAllowance, + isAllowanceNearAmount } = useTokenApprove({ token: finalSelectedFromToken?.address as `0x${string}`, spender: @@ -1219,6 +1220,26 @@ export function AggregatorContainer({ tokenList }) { )} + {finalSelectedFromToken && isAllowanceNearAmount ? ( + <> + + {`You have approved ${(Number(allowance) / 10 ** finalSelectedFromToken.decimals).toLocaleString(undefined, { maximumFractionDigits: 2 })} ${finalSelectedFromToken.symbol} tokens previously`} + + + + ) : null} + {(hasPriceImapct || isUnknownPrice) && !isLoading && selectedRoute && isApproved ? ( )} + {finalSelectedFromToken && isAllowanceNearAmount ? ( + <> + + {`You have approved ${(Number(allowance) / 10 ** finalSelectedFromToken.decimals).toLocaleString(undefined, { maximumFractionDigits: 2 })} ${finalSelectedFromToken.symbol} tokens previously`} + + + + ) : null} + {(hasPriceImapct || isUnknownPrice) && !isLoading && selectedRoute && isApproved ? (