fix: simplify swap disabled state (Uniswap#377)

recehantoken · Jan 11, 2023 · 23928cc · 23928cc
1 parent cc31c7e
commit 23928cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/components/Swap/SwapActionButton/SwapButton.tsx b/src/components/Swap/SwapActionButton/SwapButton.tsx
@@ -100,11 +100,7 @@ export default function SwapButton({ disabled }: { disabled: boolean }) {
 
   return (
     <>
-      <ActionButton
-        color={color}
-        onClick={onClick}
-        disabled={disabled || (permit2Enabled && allowance.state === AllowanceState.LOADING)}
-      >
+      <ActionButton color={color} onClick={onClick} disabled={disabled}>
         <Trans>Review swap</Trans>
       </ActionButton>
       {open && trade && (

diff --git a/src/components/Swap/SwapActionButton/index.tsx b/src/components/Swap/SwapActionButton/index.tsx
@@ -27,7 +27,7 @@ export default function SwapActionButton() {
   const permit2Enabled = usePermit2Enabled()
   const isDisabled = useMemo(
     () =>
-      (permit2Enabled && allowance.state === AllowanceState.REQUIRED) ||
+      (permit2Enabled && allowance.state !== AllowanceState.ALLOWED) ||
       (!permit2Enabled && approval.state !== SwapApprovalState.APPROVED) ||
       error !== undefined ||
       (!isWrap && !trade) ||