fix: merge conflicts

yearn · Oct 18, 2023 · 208582d · 208582d
1 parent 16697ef
commit 208582d
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 580 deletions.
diff --git a/apps/common/components/Table.tsx b/apps/common/components/Table.tsx
@@ -2,7 +2,6 @@
 import {useCallback, useMemo, useState} from 'react';
 import {sort} from '@veYFI/utils';
 import {cl} from '@yearn-finance/web-lib/utils/cl';
-import {isZero} from '@yearn-finance/web-lib/utils/isZero';
 import {Pagination} from '@common/components/Pagination';
 import {usePagination} from '@common/hooks/usePagination';
 import {IconChevronPlain} from '@common/icons/IconChevronPlain';

diff --git a/apps/vaults/hooks/useSolverVanilla.ts b/apps/vaults/hooks/useSolverVanilla.ts
@@ -61,14 +61,7 @@ export function useSolverVanilla(): TSolverContext {
 
 			const allowance = await allowanceOf({
 				connector: provider,
-<<<<<<< HEAD
-<<<<<<< HEAD
-				chainID: safeChainID,
-=======
->>>>>>> ba8e0bb9 (feat: add prettier)
-=======
 				chainID: request.current.inputToken.chainID,
->>>>>>> d3744700 (fix: more chain fixes)
 				tokenAddress: toAddress(request.current.inputToken.value),
 				spenderAddress: toAddress(request.current.outputToken.value)
 			});
@@ -96,14 +89,7 @@ export function useSolverVanilla(): TSolverContext {
 
 			const result = await approveERC20({
 				connector: provider,
-<<<<<<< HEAD
-<<<<<<< HEAD
-				chainID: safeChainID,
-=======
->>>>>>> ba8e0bb9 (feat: add prettier)
-=======
 				chainID: request.current.chainID,
->>>>>>> d3744700 (fix: more chain fixes)
 				contractAddress: request.current.inputToken.value,
 				spenderAddress: request.current.outputToken.value,
 				amount: amount,
@@ -131,14 +117,7 @@ export function useSolverVanilla(): TSolverContext {
 
 			const result = await deposit({
 				connector: provider,
-<<<<<<< HEAD
-<<<<<<< HEAD
-				chainID: safeChainID,
-=======
->>>>>>> ba8e0bb9 (feat: add prettier)
-=======
 				chainID: request.current.chainID,
->>>>>>> d3744700 (fix: more chain fixes)
 				contractAddress: request.current.outputToken.value,
 				amount: request.current.inputAmount,
 				statusHandler: txStatusSetter
@@ -165,14 +144,7 @@ export function useSolverVanilla(): TSolverContext {
 
 			const result = await withdrawShares({
 				connector: provider,
-<<<<<<< HEAD
-<<<<<<< HEAD
-				chainID: safeChainID,
-=======
->>>>>>> ba8e0bb9 (feat: add prettier)
-=======
 				chainID: request.current.chainID,
->>>>>>> d3744700 (fix: more chain fixes)
 				contractAddress: request.current.inputToken.value,
 				amount: request.current.inputAmount,
 				statusHandler: txStatusSetter

diff --git a/apps/veyfi/components/GaugesTab.tsx b/apps/veyfi/components/GaugesTab.tsx