Merge branch 'dev' into myf-dev

src/ConfigProviders.tsx

@@ -1,14 +0,0 @@
-import React from 'react'
-import { ConfigProvider, ModalProvider } from '@pancakeswap/uikit'
-import { useTranslation } from 'contexts/Localization'
-
-const ConfigProviders: React.FC = ({ children }) => {
-  const { t } = useTranslation()
-  return (
-    <ConfigProvider t={t}>
-      <ModalProvider>{children}</ModalProvider>
-    </ConfigProvider>
-  )
-}
-
-export default ConfigProviders

src/Providers.tsx

@@ -3,12 +3,21 @@ import { Web3ReactProvider } from '@web3-react/core'
 import { HelmetProvider } from 'react-helmet-async'
 import { Provider } from 'react-redux'
 import { getLibrary } from 'utils/web3React'
+import { ConfigProvider, ModalProvider } from '@pancakeswap/uikit'
 import { ThemeContextProvider } from 'contexts/ThemeContext'
-import { LanguageProvider } from 'contexts/Localization'
+import { LanguageProvider, useTranslation } from 'contexts/Localization'
 import { RefreshContextProvider } from 'contexts/RefreshContext'
 import { ToastsProvider } from 'contexts/ToastsContext'
 import store from 'state'
-import ConfigProviders from './ConfigProviders'
+
+const ConfigProviders: React.FC = ({ children }) => {
+  const { t } = useTranslation()
+  return (
+    <ConfigProvider t={t}>
+      <ModalProvider>{children}</ModalProvider>
+    </ConfigProvider>
+  )
+}
 
 const Providers: React.FC = ({ children }) => {
   return (