Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,21 @@ runs:
steps:
- uses: actions/checkout@v4

- name: Enable Corepack
run: corepack enable
shell: bash

- uses: actions/setup-node@v4
with:
node-version: 20
registry-url: https://registry.npmjs.org
cache: yarn

- run: yarn install --frozen-lockfile --ignore-scripts
- name: Disable Yarn scripts on CI
run: yarn config set enableScripts false
shell: bash

- run: yarn install --immutable
shell: bash
env:
YARN_ENABLE_HARDENED_MODE: 0
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,12 @@ stats.*
/blob-report/
/playwright/.cache/
.cache-synpress


.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
enableGlobalCache: false

nodeLinker: node-modules
26 changes: 11 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
"wagmi": "^2.14.9"
},
"scripts": {
"start": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite",
"dev": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite --port $PORT --host",
"start": "cross-env REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite",
"dev": "cross-env REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite --port $PORT --host",
"dev:api": "vercel dev --listen 127.0.0.1:3000",
"build": "tsc && vite build",
"prebuild": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && yarn remote-config && yarn remote-env",
"prebuild": "cross-env REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && yarn remote-config && yarn remote-env",
"remote-config": "tsx scripts/fetch-remote-config.ts",
"remote-env": "tsx ./scripts/fetch-remote-env.ts",
"analyze": "yarn build && rollup-plugin-visualizer --open ./bundle-size-analysis.json",
"test": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && jest --env jsdom src",
"test": "cross-env REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && jest --env jsdom src",
"serve": "vite preview --port 3000",
"test-api": "yarn remote-config && jest test/api",
"pretest:e2e": "npm pkg set 'type'='module'",
Expand Down Expand Up @@ -141,6 +141,7 @@
"axios-mock-adapter": "^1.21.2",
"chalk": "^5.3.0",
"chromatic": "^11.25.1",
"cross-env": "^7.0.3",
"dotenv": "^16.4.5",
"eslint": "^9.5.0",
"eslint-config-prettier": "^9.1.0",
Expand Down Expand Up @@ -177,15 +178,7 @@
}
},
"resolutions": {
"babel-loader": "8.1.0",
"**/eccrypto/secp256k1": "3.8.1",
"**/eth-crypto/secp256k1": "5.0.1",
"**/libp2p-crypto/secp256k1": "4.0.4",
"**/ethereum-cryptography/secp256k1": "4.0.4",
"**/@vercel/node/ts-node": "10.9.2",
"**/@vercel/node/typescript": "5.7.3",
"**/@vercel/node/path-to-regexp": "6.3.0",
"**/@vercel/routing-utils/path-to-regexp": "6.3.0"
"babel-loader": "8.1.0"
},
"overrides": {
"[email protected]": "3.8.1",
Expand All @@ -198,7 +191,9 @@
},
"@vercel/routing-utils": {
"path-to-regexp": "6.3.0"
}
},
"[email protected]": "3.0.11",
"[email protected]": "3.0.11"
},
"eslintConfig": {
"overrides": [
Expand All @@ -213,5 +208,6 @@
]
},
"readme": "ERROR: No README data found!",
"_id": "[email protected]"
"_id": "[email protected]",
"packageManager": "[email protected]"
}
21 changes: 12 additions & 9 deletions src/components/GlobalStyles/GlobalStyles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,32 @@ export const typography = css`
font-weight: 400;
font-display: fallback;
src: url("/fonts/Barlow-Regular.woff2") format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6,
U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
U+2212, U+2215, U+FEFF, U+FFFD;
unicode-range:
U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC,
U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
@font-face {
font-family: "Barlow";
font-style: normal;
font-weight: 500;
font-display: fallback;
src: url("/fonts/Barlow-Medium.woff2") format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6,
U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
U+2212, U+2215, U+FEFF, U+FFFD;
unicode-range:
U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC,
U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
@font-face {
font-family: "Barlow";
font-style: normal;
font-weight: 700;
font-display: fallback;
src: url("/fonts/Barlow-Bold.woff2") format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6,
U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
U+2212, U+2215, U+FEFF, U+FFFD;
unicode-range:
U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC,
U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
`;
const variables = css`
Expand Down
3 changes: 2 additions & 1 deletion src/views/DepositStatus/components/EarnActionCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ export function EarnActionCard({
const Wrapper = styled.div<{ color: string }>`
border-radius: 0.5rem;

background-image: linear-gradient(
background-image:
linear-gradient(
90deg,
${({ color }) => (color === "aqua" ? COLORS["aqua-5"] : COLORS["teal-5"])}
0%,
Expand Down
Loading
Loading