Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge into main from develop #123

Merged
merged 5 commits into from
Oct 22, 2024
Merged

Merge into main from develop #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed7c68d
feat: get rid of google fonts api
BATMAH69 Sep 26, 2024
4bb4cb6
fix: remove type
BATMAH69 Sep 26, 2024
54fd64b
fix: curl version
BATMAH69 Sep 26, 2024
c2fa624
fix: curl version
BATMAH69 Oct 14, 2024
6b14656
Merge pull request #122 from lidofinance/feat/local-fonts
AnnaSila Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENV NEXT_TELEMETRY_DISABLED=1 \
CHAIN_ID=$CHAIN_ID

WORKDIR /app
RUN apk add --no-cache curl=~8.9.0-r0
RUN apk add --no-cache curl=~8.9.1-r1
COPY --from=build /app /app

USER node
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"prom-client": "^14.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-helmet-async": "^2.0.5",
"react-hook-form": "^7.43.9",
"react-is": "^18.2.0",
"reef-knot": "1.11.1",
Expand Down
7 changes: 3 additions & 4 deletions pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import {
CookiesTooltip,
migrationAllowCookieToCrossDomainCookieClientSide,
migrationThemeCookiesToCrossDomainCookiesClientSide,
CookieThemeProvider,
} from '@lidofinance/lido-ui';
import { GlobalStyle } from 'shared/ui';
import { GlobalStyle, UiProvider } from 'shared/ui';
import { ModalProvider } from 'features/walletModal';
import { ProviderWeb3 } from 'reef-knot/web3-react';
import dynamics from 'config/dynamics';
Expand Down Expand Up @@ -38,7 +37,7 @@ const AppWrapper = (props: AppProps): JSX.Element => (
<title>TRP UI | Lido</title>
</Head>

<CookieThemeProvider>
<UiProvider>
<AppWagmiConfig>
{/* @ts-expect-error need to patch web3-react */}
<ProviderWeb3
Expand All @@ -56,7 +55,7 @@ const AppWrapper = (props: AppProps): JSX.Element => (
<GlobalStyle />
<CookiesTooltip />
<ToastContainer />
</CookieThemeProvider>
</UiProvider>
</>
);

Expand Down
3 changes: 1 addition & 2 deletions pages/_document.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Document, {
DocumentContext,
DocumentInitialProps,
} from 'next/document';
import { Fonts, LidoUIHead } from '@lidofinance/lido-ui';
import { LidoUIHead } from '@lidofinance/lido-ui';
import { ServerStyleSheet } from 'styled-components';
import { dynamics } from '../config';

Expand Down Expand Up @@ -62,7 +62,6 @@ const CustomDocument = () => {
<meta name="twitter:site" content="@lidofinance" />
<meta name="twitter:creator" content="@lidofinance" />

<Fonts />
<LidoUIHead />
<script src="/runtime/window-env.js" />
</Head>
Expand Down
1 change: 1 addition & 0 deletions shared/ui/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ export * from './pageTitle';
export * from './typography';
export * from './useCopyToClipboard';
export * from './useWalletError';
export * from './uiProvider';
31 changes: 31 additions & 0 deletions shared/ui/uiProvider/index.tsx
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 15 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5899,7 +5899,7 @@ internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5:
has "^1.0.3"
side-channel "^1.0.4"

invariant@2, invariant@^2.2.2:
invariant@2, invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
Expand Down Expand Up @@ -7311,6 +7311,20 @@ react-dom@^18.2.0:
loose-envify "^1.1.0"
scheduler "^0.23.0"

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.43.9:
version "7.43.9"
resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.43.9.tgz#84b56ac2f38f8e946c6032ccb760e13a1037c66d"
Expand Down
Loading