chore: Cleanup

balancer · Dec 20, 2023 · 7aee56a · 7aee56a
1 parent f9fefcd
commit 7aee56a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/lib/modules/pool/actions/add-liquidity/AddLiquidityForm.tsx b/lib/modules/pool/actions/add-liquidity/AddLiquidityForm.tsx
@@ -48,12 +48,6 @@ export function AddLiquidityForm() {
     return amountIn ? amountIn.humanAmount : ''
   }
 
-  function submit() {
-    if (!isDisabled) {
-      previewDisclosure.onOpen()
-    }
-  }
-
   return (
     <TokenBalancesProvider tokens={validTokens}>
       <Center h="full" w="full" maxW="lg" mx="auto">
@@ -122,7 +116,7 @@ export function AddLiquidityForm() {
                 w="full"
                 size="lg"
                 isDisabled={isDisabled}
-                onClick={submit}
+                onClick={() => !isDisabled && previewDisclosure.onOpen()}
               >
                 Next
               </Button>

diff --git a/lib/modules/swap/SwapForm.tsx b/lib/modules/swap/SwapForm.tsx
@@ -27,7 +27,6 @@ import { fNum } from '@/lib/shared/utils/numbers'
 import { PROJECT_CONFIG } from '@/lib/config/getProjectConfig'
 import { isSameAddress } from '@/lib/shared/utils/addresses'
 import { CgArrowsExchangeV } from 'react-icons/cg'
-import { SwapFlowButton } from './SwapFlowButton'
 import { Address } from 'viem'
 import { SwapPreviewModal } from './SwapPreviewModal'
 
@@ -37,6 +36,8 @@ export function SwapForm() {
     tokenOut,
     selectedChain,
     tokenSelectKey,
+    isDisabled,
+    disabledReason,
     setSelectedChain,
     setTokenInAmount,
     setTokenOutAmount,
@@ -139,14 +140,14 @@ export function SwapForm() {
               </HStack>
             </VStack>
 
-            <Tooltip label={isAddLiquidityDisabled ? addLiquidityDisabledReason : ''}>
+            <Tooltip label={isDisabled ? disabledReason : ''}>
               <Button
                 ref={nextBtn}
                 variant="secondary"
                 w="full"
                 size="lg"
-                isDisabled={isAddLiquidityDisabled}
-                onClick={submit}
+                isDisabled={isDisabled}
+                onClick={() => !isDisabled && previewDisclosure.onOpen()}
               >
                 Next
               </Button>

diff --git a/lib/modules/swap/SwapPreviewModal.tsx b/lib/modules/swap/SwapPreviewModal.tsx
@@ -27,7 +27,6 @@ import {
 } from '@chakra-ui/react'
 import { RefObject, useRef } from 'react'
 import { Address } from 'wagmi'
-import { usePool } from '../pool/usePool'
 import { useSwap } from './useSwap'
 import { SwapFlowButton } from './SwapFlowButton'
 
@@ -39,11 +38,11 @@ type Props = {
 }
 
 function TokenAmountRow({ address, amount }: { address: Address; amount: string }) {
-  const { pool } = usePool()
+  const { selectedChain } = useSwap()
   const { getToken, usdValueForToken } = useTokens()
   const { toCurrency } = useCurrency()
 
-  const token = getToken(address, pool.chain)
+  const token = getToken(address, selectedChain)
   const usdValue = token ? usdValueForToken(token, amount) : undefined
 
   return (
@@ -70,10 +69,9 @@ export function SwapPreviewModal({
   ...rest
 }: Props & Omit<ModalProps, 'children'>) {
   const initialFocusRef = useRef(null)
-  const { pool } = usePool()
   const spenderAddress = useContractAddress('balancer.vaultV2')
   const { userAddress } = useUserAccount()
-  const { tokenIn, tokenOut, swapType } = useSwap()
+  const { tokenIn, tokenOut } = useSwap()
 
   return (
     <Modal

diff --git a/lib/modules/swap/useSwap.tsx b/lib/modules/swap/useSwap.tsx
@@ -234,7 +234,7 @@ export function _useSwap() {
   const isLoading = loading
 
   const { isDisabled, disabledReason } = useIsDisabledWithReason(
-    [isConnected, LABELS.walletNotConnected],
+    [!isConnected, LABELS.walletNotConnected],
     [isLoading, 'Swap is loading'],
     [!swapOutput, 'Swap output is undefined'],
     [swapOutput?.swaps.length === 0, 'Swap output is empty']