From 158f8d22a28b84a4ec38f17e0df3dc9238fc1c3a Mon Sep 17 00:00:00 2001 From: w3stside Date: Tue, 12 Apr 2022 14:17:18 +0100 Subject: [PATCH] further develop merge fixes --- src/components/RoutingDiagram/RoutingDiagram.test.tsx | 3 ++- src/custom/state/cowToken/hooks.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/RoutingDiagram/RoutingDiagram.test.tsx b/src/components/RoutingDiagram/RoutingDiagram.test.tsx index 9873666414..c3666b21f0 100644 --- 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 index a57cbca391..931b32f942 100644 --- 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'