further develop merge fixes

cowprotocol · Apr 12, 2022 · 158f8d2 · 158f8d2
1 parent f0855ea
commit 158f8d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/RoutingDiagram/RoutingDiagram.test.tsx b/src/components/RoutingDiagram/RoutingDiagram.test.tsx
@@ -7,7 +7,8 @@ import { FeeAmount } from '@uniswap/v3-sdk'
 import { DAI, USDC_MAINNET, WBTC } from 'constants/tokens'
 import { render } from 'test-utils'
 
-import RoutingDiagram, { RoutingDiagramEntry } from './RoutingDiagram'
+import RoutingDiagram from './RoutingDiagram'
+import { RoutingDiagramEntry } from 'lib/components/Swap/RoutingDiagram/utils'
 
 const percent = (strings: TemplateStringsArray) => new Percent(parseInt(strings[0]), 100)
 

diff --git a/src/custom/state/cowToken/hooks.ts b/src/custom/state/cowToken/hooks.ts
@@ -5,7 +5,7 @@ import { TransactionResponse } from '@ethersproject/providers'
 
 import { useVCowContract } from 'hooks/useContract'
 import { useActiveWeb3React } from 'hooks/web3'
-import { useSingleCallResult, Result } from 'state/multicall/hooks'
+import { useSingleCallResult, CallStateResult as Result } from 'lib/hooks/multicall'
 import { useTransactionAdder } from 'state/enhancedTransactions/hooks'
 import { V_COW, COW } from 'constants/tokens'
 import { AppState } from 'state'