From 2d8dac5c1571ef5155a37214f69e62b863ca4397 Mon Sep 17 00:00:00 2001
From: Connor McEwen <connor.mcewen@gmail.com>
Date: Thu, 5 Oct 2023 16:30:57 -0400
Subject: [PATCH] fix: merge issue (#7427)

* fix: merge issue

* update snapshots
---
 src/components/swap/__snapshots__/SwapLineItem.test.tsx.snap | 4 ++--
 src/pages/App.tsx                                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/swap/__snapshots__/SwapLineItem.test.tsx.snap b/src/components/swap/__snapshots__/SwapLineItem.test.tsx.snap
index 77a6e7bb58..26748908c8 100644
--- a/src/components/swap/__snapshots__/SwapLineItem.test.tsx.snap
+++ b/src/components/swap/__snapshots__/SwapLineItem.test.tsx.snap
@@ -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>
diff --git a/src/pages/App.tsx b/src/pages/App.tsx
index 87f9cd6115..c0e6d41cb8 100644
--- a/src/pages/App.tsx
+++ b/src/pages/App.tsx
@@ -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'