From 24be2af043fafc6fc04a6cca009b5e5f509ad2b9 Mon Sep 17 00:00:00 2001
From: memoyil <2213635+memoyil@users.noreply.github.com>
Date: Mon, 8 May 2023 13:45:11 +0200
Subject: [PATCH] fix: Quick input stays same after amount change

---
 apps/aptos/components/CurrencyInputPanel/index.tsx   |  4 ++--
 apps/web/src/components/CurrencyInputPanel/index.tsx | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/aptos/components/CurrencyInputPanel/index.tsx b/apps/aptos/components/CurrencyInputPanel/index.tsx
index b591089eb43e26..0d45f788984a2e 100644
--- a/apps/aptos/components/CurrencyInputPanel/index.tsx
+++ b/apps/aptos/components/CurrencyInputPanel/index.tsx
@@ -182,8 +182,8 @@ export const CurrencyInputPanel = ({
                   onPercentInput &&
                   [25, 50, 75].map((percent) => {
                     const isAtCurrentPercent =
-                      (maxAmount && value === percentAmount[percent]) || (lpPercent && lpPercent === percent.toString())
-
+                      (maxAmount && value !== '0' && value === percentAmount[percent]) ||
+                      (lpPercent && lpPercent === percent.toString())
                     return (
                       <Button
                         key={`btn_quickCurrency${percent}`}
diff --git a/apps/web/src/components/CurrencyInputPanel/index.tsx b/apps/web/src/components/CurrencyInputPanel/index.tsx
index 37f82e45f5b7e4..48802b0d1007e1 100644
--- a/apps/web/src/components/CurrencyInputPanel/index.tsx
+++ b/apps/web/src/components/CurrencyInputPanel/index.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState, memo, useCallback } from 'react'
+import { useMemo, memo, useCallback } from 'react'
 import { Currency, Pair, Token, Percent, CurrencyAmount } from '@pancakeswap/sdk'
 import {
   Button,
@@ -24,7 +24,7 @@ import { StablePair } from 'views/AddLiquidity/AddStableLiquidity/hooks/useStabl
 
 import { FiatLogo } from 'components/Logo/CurrencyLogo'
 import { useAccount } from 'wagmi'
-import { useCurrencyBalance } from '../../state/wallet/hooks'
+import { useCurrencyBalance } from 'state/wallet/hooks'
 import CurrencySearchModal from '../SearchModal/CurrencySearchModal'
 import { CurrencyLogo, DoubleCurrencyLogo } from '../Logo'
 
@@ -160,7 +160,6 @@ const CurrencyInputPanel = memo(function CurrencyInputPanel({
   const handleUserInput = useCallback(
     (val: string) => {
       onUserInput(val)
-      setCurrentClickedPercent('')
     },
     [onUserInput],
   )
@@ -171,8 +170,6 @@ const CurrencyInputPanel = memo(function CurrencyInputPanel({
     }
   }, [onPresentCurrencyModal, disableCurrencySelect])
 
-  const [currentClickedPercent, setCurrentClickedPercent] = useState('')
-
   const isAtPercentMax = (maxAmount && value === maxAmount.toExact()) || (lpPercent && lpPercent === '100')
 
   const balance = !hideBalance && !!currency && formatAmount(selectedCurrencyBalance, 6)
@@ -289,7 +286,6 @@ const CurrencyInputPanel = memo(function CurrencyInputPanel({
                   showQuickInputButton &&
                   onPercentInput &&
                   [25, 50, 75].map((percent) => {
-                    const isAtClickedPercent = currentClickedPercent === percent.toString()
                     const isAtCurrentPercent =
                       (maxAmount && value !== '0' && value === percentAmount[percent]) ||
                       (lpPercent && lpPercent === percent.toString())
@@ -299,11 +295,10 @@ const CurrencyInputPanel = memo(function CurrencyInputPanel({
                         key={`btn_quickCurrency${percent}`}
                         onClick={() => {
                           onPercentInput(percent)
-                          setCurrentClickedPercent(percent.toString())
                         }}
                         scale="xs"
                         mr="5px"
-                        variant={isAtClickedPercent || isAtCurrentPercent ? 'primary' : 'secondary'}
+                        variant={isAtCurrentPercent ? 'primary' : 'secondary'}
                         style={{ textTransform: 'uppercase' }}
                       >
                         {percent}%
@@ -316,7 +311,6 @@ const CurrencyInputPanel = memo(function CurrencyInputPanel({
                       e.stopPropagation()
                       e.preventDefault()
                       onMax?.()
-                      setCurrentClickedPercent('MAX')
                     }}
                     scale="xs"
                     variant={isAtPercentMax ? 'primary' : 'secondary'}