fix: merge issue (#7427)

* fix: merge issue

* update snapshots
This commit is contained in:
Connor McEwen 2023-10-05 16:30:57 -04:00 committed by GitHub
parent 0e3d188a9a
commit 2d8dac5c15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

@ -5756,7 +5756,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
<span
class=""
>
3.000%
3%
</span>
</div>
</div>
@ -7409,7 +7409,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
<span
class=""
>
3.000%
3%
</span>
</div>
</div>

@ -8,7 +8,7 @@ import { useFeatureFlagsIsLoaded } from 'featureFlags'
import { useAtom } from 'jotai'
import { useBag } from 'nft/hooks/useBag'
import { lazy, Suspense, useEffect, useLayoutEffect, useMemo, useState } from 'react'
import { Route, Routes, useLocation, useSearchParams } from 'react-router-dom'
import { Navigate, Route, Routes, useLocation, useSearchParams } from 'react-router-dom'
import { shouldDisableNFTRoutesAtom } from 'state/application/atoms'
import { useRouterPreference } from 'state/user/hooks'
import { StatsigProvider, StatsigUser } from 'statsig-react'