Skip to content

Commit

Permalink
fix: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
salimtb committed Nov 4, 2024
1 parent 7d90b07 commit 8b261ba
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions ui/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import {
LegacyMetaMetricsProvider,
} from '../contexts/metametrics';
import { MetamaskNotificationsProvider } from '../contexts/metamask-notifications';
import { TokenRatesProvider } from '../contexts/tokenRates';
import { TokenDetectionProvider } from '../contexts/tokenDetection';
import { AssetPollingProvider } from '../contexts/assetPolling';
import { TokenDetectionProvider } from '../contexts/tokenDetection';
import ErrorPage from './error';
import Routes from './routes';

Expand Down Expand Up @@ -53,11 +52,9 @@ class Index extends PureComponent {
<LegacyI18nProvider>
<AssetPollingProvider>
<MetamaskNotificationsProvider>
<TokenRatesProvider>
<TokenDetectionProvider>
<Routes />
</TokenDetectionProvider>
</TokenRatesProvider>
<TokenDetectionProvider>
<Routes />
</TokenDetectionProvider>
</MetamaskNotificationsProvider>
</AssetPollingProvider>
</LegacyI18nProvider>
Expand Down

0 comments on commit 8b261ba

Please sign in to comment.