Merge pull request #192 from lidofinance/feat/local-font-revert

Revert "feat: get rid of google fonts api"
lidofinance · Oct 3, 2024 · 7f45b76 · 7f45b76
2 parents 9a1ea16 + 747191b
commit 7f45b76
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 51 deletions.
diff --git a/modules/shared/ui/UiProvider/index.tsx b/modules/shared/ui/UiProvider/index.tsx
diff --git a/package.json b/package.json
@@ -63,7 +63,6 @@
  "prom-client": "14.0.1",
  "react": "17.0.2",
  "react-dom": "17.0.2",
- "react-helmet-async": "^2.0.5",
  "react-hook-form": "7.28.1",
  "react-markdown": "^8.0.7",
  "react-use": "17.3.2",

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -7,7 +7,12 @@ import { useErrorMessage } from 'modules/blockChain/hooks/useErrorMessage'
 import { useSupportedChains } from 'reef-knot/web3-react'
 import { PageLayout } from 'modules/shared/ui/Layout/PageLayout'
 import { GlobalStyle } from 'modules/globalStyles'
-import { toast, ToastContainer, ToastError } from '@lidofinance/lido-ui'
+import {
+ toast,
+ CookieThemeProvider,
+ ToastContainer,
+ ToastError,
+} from '@lidofinance/lido-ui'
 import { ConfigProvider } from 'modules/config/providers/configProvider'
 import { ModalProvider } from 'modules/modal/ModalProvider'
 import { NetworkSwitcher } from 'modules/blockChain/ui/NetworkSwitcher'
@@ -19,7 +24,6 @@ import { withCsp } from 'modules/shared/utils/csp'
 import { CustomAppProps } from 'modules/shared/utils/utilTypes'
 import { AppProviderWeb3 } from 'modules/web3Provider'
 import { AppWagmiConfig } from 'modules/wagmiConfig'
-import { UiProvider } from 'modules/shared/ui/UiProvider'
 
 // Visualize route changes
 nprogress()
@@ -106,7 +110,7 @@ const AppRootMemo = memo(AppRoot)
 
 function App({ envConfig, ...appProps }: CustomAppProps) {
  return (
- <UiProvider>
+ <CookieThemeProvider>
  <GlobalStyle />
  <ConfigProvider envConfig={envConfig}>
  <AppWagmiConfig>
@@ -119,7 +123,7 @@ function App({ envConfig, ...appProps }: CustomAppProps) {
  </AppProviderWeb3>
  </AppWagmiConfig>
  </ConfigProvider>
- </UiProvider>
+ </CookieThemeProvider>
  )
 }
 

diff --git a/pages/_document.tsx b/pages/_document.tsx
@@ -33,6 +33,10 @@ export default class MyDocument extends Document {
  return (
  <Html>
  <Head>
+ <link
+ href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;700;800&display=swap"
+ rel="stylesheet"
+ />
  <LidoUIHead />
  </Head>
  <body>

diff --git a/yarn.lock b/yarn.lock
@@ -6317,7 +6317,7 @@ internal-slot@^1.0.3, internal-slot@^1.0.4:
  has "^1.0.3"
  side-channel "^1.0.4"
 
-invariant@2, invariant@^2.2.2, invariant@^2.2.4:
+invariant@2, invariant@^2.2.2:
  version "2.2.4"
  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -8438,20 +8438,6 @@ react-dom@17.0.2, react-dom@^17.0.2:
  object-assign "^4.1.1"
  scheduler "^0.20.2"
 
-react-fast-compare@^3.2.2:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"
- integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==
-
-react-helmet-async@^2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-2.0.5.tgz#cfc70cd7bb32df7883a8ed55502a1513747223ec"
- integrity sha512-rYUYHeus+i27MvFE+Jaa4WsyBKGkL6qVgbJvSBoX8mbsWoABJXdEO0bZyi0F6i+4f0NuIb8AvqPMj3iXFHkMwg==
- dependencies:
- invariant "^2.2.4"
- react-fast-compare "^3.2.2"
- shallowequal "^1.1.0"
-
 react-hook-form@7.28.1:
  version "7.28.1"
  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.28.1.tgz#95fc37be6c6b9d57212eb7eca055fb36d079b3b7"