Skip to content

Commit 9f04a09

Browse files
shoom3301shoom3301
authored
Merge pull request #5940 from cowprotocol/release/2025-07-08
Release 2025-07-08
2 parents 907699d + bca7971 commit 9f04a09

File tree

283 files changed

+5719
-3602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

283 files changed

+5719
-3602
lines changed

‎apps/cow-fi/app/(learn)/learn/page.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import { FEATURED_ARTICLES_PAGE_SIZE } from '@/const/pagination'
33

44
import { getArticles, getCategories } from '../../../services/cms'
55

6-
export const revalidate = 3600 // Revalidate at most once per hour
7-
86
export default async function LearnPage() {
97
// Fetch featured articles
108
const featuredArticlesResponse = await getArticles({
@@ -28,7 +26,7 @@ export default async function LearnPage() {
2826
})
2927

3028
const categoriesResponse = await getCategories()
31-
// Format categories for the component
29+
// Pass raw categories data to client component for styling
3230
const categories =
3331
categoriesResponse?.map((category: any) => {
3432
const imageUrl = category?.attributes?.image?.data?.attributes?.url || ''
@@ -37,10 +35,9 @@ export default async function LearnPage() {
3735
name: category?.attributes?.name || '',
3836
slug: category?.attributes?.slug || '',
3937
description: category?.attributes?.description || '',
40-
bgColor: category?.attributes?.backgroundColor || '#FFFFFF',
41-
textColor: category?.attributes?.textColor || '#000000',
38+
bgColor: category?.attributes?.backgroundColor || '',
39+
textColor: category?.attributes?.textColor || '',
4240
link: `/learn/topic/${category?.attributes?.slug}`,
43-
iconColor: '#FFFFFF',
4441
imageUrl,
4542
}
4643
}) || []

‎apps/cow-fi/app/(learn)/learn/topics/page.tsx‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
'use client'
2+
3+
import { UI } from '@cowprotocol/ui'
4+
15
import { TopicsPageComponent } from '@/components/TopicsPageComponent'
26
import { ARTICLES_LARGE_PAGE_SIZE } from '@/const/pagination'
3-
import { Color } from '@cowprotocol/ui'
7+
48
import { getArticles, getCategories } from '../../../../services/cms'
59

610
export default async function TopicsPage() {
@@ -16,8 +20,8 @@ export default async function TopicsPage() {
1620
name: category?.attributes?.name || '',
1721
slug: category?.attributes?.slug || '',
1822
description: category?.attributes?.description || '',
19-
bgColor: category?.attributes?.backgroundColor || Color.neutral100,
20-
textColor: category?.attributes?.textColor || Color.neutral0,
23+
bgColor: category?.attributes?.backgroundColor || `var(${UI.COLOR_NEUTRAL_100})`,
24+
textColor: category?.attributes?.textColor || `var(${UI.COLOR_NEUTRAL_0})`,
2125
link: `/learn/topic/${category?.attributes?.slug}`,
2226
iconColor: 'transparent',
2327
imageUrl,

‎apps/cow-fi/app/(main)/careers/refer-to-earn/page.tsx‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
'use client'
22

3-
import { Color } from '@cowprotocol/ui'
43
import { useCowAnalytics } from '@cowprotocol/analytics'
5-
import { CowFiCategory } from 'src/common/analytics/types'
4+
import { UI } from '@cowprotocol/ui'
5+
66
import styled from 'styled-components/macro'
7+
78
import { ContainerCard, ArticleContent, Breadcrumbs, ArticleMainTitle, BodyContent } from '@/styles/styled'
9+
import { CowFiCategory } from 'src/common/analytics/types'
810

911
const Wrapper = styled.div`
1012
display: flex;
@@ -22,7 +24,14 @@ export default function Page() {
2224

2325
return (
2426
<Wrapper>
25-
<ContainerCard bgColor={Color.neutral100} minHeight="70vh" gap={62} gapMobile={42} centerContent touchFooter>
27+
<ContainerCard
28+
bgColor={`var(${UI.COLOR_NEUTRAL_100})`}
29+
minHeight="70vh"
30+
gap={62}
31+
gapMobile={42}
32+
centerContent
33+
touchFooter
34+
>
2635
<ArticleContent maxWidth="100%">
2736
<Breadcrumbs>
2837
<a
@@ -105,7 +114,7 @@ export default function Page() {
105114
<li>
106115
The referrer should reach out to a CoW core team member or directly contact the People department via
107116
email at <a href="mailto:[email protected]">[email protected]</a>, LinkedIn, or Telegram. When reaching out, the
108-
Referrer must include the candidate's name, surname, and email or LinkedIn profile. The Referrer is
117+
Referrer must include the candidate&apos;s name, surname, and email or LinkedIn profile. The Referrer is
109118
responsible for ensuring that the Candidate has given consent to share this information.
110119
</li>
111120
<li>
@@ -132,7 +141,7 @@ export default function Page() {
132141
<ul>
133142
<li>
134143
The Referrer becomes eligible to receive the full referral bonus up to six thousand USDC or USD (6,000)
135-
after six (6) months from the Candidate's start date, provided that the Candidate remains providing
144+
after six (6) months from the Candidate&apos;s start date, provided that the Candidate remains providing
136145
services to CoW during this period. The referral bonus amount can vary for each role. You can find the
137146
exact amount listed in the job description on our website at{' '}
138147
<a href="https://cow.fi/careers">https://cow.fi/careers</a>. The Referrer can decide if they want to be

‎apps/cow-fi/app/(main)/cow-amm/page.tsx‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
'use client'
22

3-
import { Color, ProductLogo, ProductVariant } from '@cowprotocol/ui'
4-
import IMG_ICON_CROWN_COW from '@cowprotocol/assets/images/icon-crown-cow.svg'
3+
import { useCowAnalytics } from '@cowprotocol/analytics'
54
import IMG_ICON_BULB_COW from '@cowprotocol/assets/images/icon-bulb-cow.svg'
5+
import IMG_ICON_CROWN_COW from '@cowprotocol/assets/images/icon-crown-cow.svg'
6+
import IMG_ICON_FAQ from '@cowprotocol/assets/images/icon-faq.svg'
67
import IMG_COWAMM_HERO from '@cowprotocol/assets/images/image-cowamm-hero.svg'
7-
import IMG_COWAMM_RAISING from '@cowprotocol/assets/images/image-cowamm-raising.svg'
88
import IMG_COWAMM_PASSIVE from '@cowprotocol/assets/images/image-cowamm-passive.svg'
9+
import IMG_COWAMM_RAISING from '@cowprotocol/assets/images/image-cowamm-raising.svg'
910
import IMG_COWAMM_REKT from '@cowprotocol/assets/images/image-cowamm-rekt.svg'
11+
import { Color, ProductLogo, ProductVariant, UI } from '@cowprotocol/ui'
12+
1013
import FAQ from '@/components/FAQ'
14+
import LazySVG from '@/components/LazySVG'
1115
import { Link, LinkType } from '@/components/Link'
12-
import { useCowAnalytics } from '@cowprotocol/analytics'
13-
import { CowFiCategory } from 'src/common/analytics/types'
14-
16+
import { COW_AMM_CONTENT, FAQ_DATA, LVR_CONTENT, QUOTES } from '@/data/cow-amm/const'
1517
import {
1618
ContainerCard,
1719
ContainerCardSection,
@@ -35,11 +37,7 @@ import {
3537
TopicList,
3638
TopicTitle,
3739
} from '@/styles/styled'
38-
39-
import LazySVG from '@/components/LazySVG'
40-
import IMG_ICON_FAQ from '@cowprotocol/assets/images/icon-faq.svg'
41-
42-
import { COW_AMM_CONTENT, FAQ_DATA, LVR_CONTENT, QUOTES } from '@/data/cow-amm/const'
40+
import { CowFiCategory } from 'src/common/analytics/types'
4341

4442
export default function Page() {
4543
const analytics = useCowAnalytics()
@@ -76,7 +74,7 @@ export default function Page() {
7674
</HeroImage>
7775
</HeroContainer>
7876

79-
<MetricsCard bgColor={Color.neutral100} color={Color.cowamm_dark_green} columns={3} touchFooter>
77+
<MetricsCard bgColor={`var(${UI.COLOR_NEUTRAL_100})`} color={Color.cowamm_dark_green} columns={3} touchFooter>
8078
<MetricsItem dividerColor={Color.cowamm_green_light}>
8179
<h2>4.75%</h2>
8280
<p>more TVL achieved than reference pool (beta phase)</p>
@@ -111,9 +109,9 @@ export default function Page() {
111109
</Link>
112110
</MetricsCard>
113111

114-
<ContainerCard bgColor={Color.neutral10}>
112+
<ContainerCard bgColor={`var(${UI.COLOR_NEUTRAL_10})`}>
115113
<ContainerCardSection>
116-
<SectionTitleWrapper color={Color.neutral100} maxWidth={1100} gap={56}>
114+
<SectionTitleWrapper color={`var(${UI.COLOR_NEUTRAL_100})`} maxWidth={1100} gap={56}>
117115
<SectionTitleIcon $size={98}>
118116
<LazySVG src={IMG_ICON_CROWN_COW} />
119117
</SectionTitleIcon>
@@ -133,10 +131,10 @@ export default function Page() {
133131
paddingMobile="0"
134132
>
135133
<TopicCardInner contentAlign="left">
136-
<TopicDescription fontSize={28} color={Color.neutral95}>
134+
<TopicDescription fontSize={28} color={`var(${UI.COLOR_NEUTRAL_95})`}>
137135
{content.description1}
138136
</TopicDescription>
139-
<TopicDescription fontSize={21} color={Color.neutral50}>
137+
<TopicDescription fontSize={21} color={`var(${UI.COLOR_NEUTRAL_50})`}>
140138
<sup>1</sup> {content.description2}
141139
</TopicDescription>
142140
</TopicCardInner>
@@ -159,7 +157,12 @@ export default function Page() {
159157

160158
<ContainerCard bgColor={'transparent'}>
161159
<ContainerCardSection>
162-
<SectionTitleWrapper padding="150px 0 0" marginMobile="0 auto" maxWidth={1170} color={Color.neutral10}>
160+
<SectionTitleWrapper
161+
padding="150px 0 0"
162+
marginMobile="0 auto"
163+
maxWidth={1170}
164+
color={`var(${UI.COLOR_NEUTRAL_10})`}
165+
>
163166
<SectionTitleIcon $size={128}>
164167
<LazySVG src={IMG_ICON_BULB_COW} />
165168
</SectionTitleIcon>
@@ -202,9 +205,9 @@ export default function Page() {
202205
</ContainerCardSection>
203206
</ContainerCard>
204207

205-
<ContainerCard bgColor={Color.neutral100}>
208+
<ContainerCard bgColor={`var(${UI.COLOR_NEUTRAL_100})`}>
206209
<ContainerCardSection>
207-
<SectionTitleWrapper color={Color.neutral10} maxWidth={1100} gap={56}>
210+
<SectionTitleWrapper color={`var(${UI.COLOR_NEUTRAL_10})`} maxWidth={1100} gap={56}>
208211
<SectionTitleIcon $size={98}>
209212
<LazySVG src={IMG_ICON_CROWN_COW} />
210213
</SectionTitleIcon>
@@ -225,7 +228,8 @@ export default function Page() {
225228
>
226229
<TopicCardInner contentAlign="left">
227230
<TopicDescription fontSize={28}>
228-
CoW AMM LPs don't have to worry about LVR, which costs CF-AMM LPs 5-7% of their liquidity, on average.
231+
CoW AMM LPs don&apos;t have to worry about LVR, which costs CF-AMM LPs 5-7% of their liquidity, on
232+
average.
229233
<br />
230234
<br />
231235
Backtesting research conducted over 6 months in 2023 shows that CoW AMM returns would have equalled or
@@ -250,7 +254,7 @@ export default function Page() {
250254

251255
<ContainerCard bgColor={'transparent'}>
252256
<ContainerCardSection>
253-
<SectionTitleWrapper color={Color.neutral10} maxWidth={1100} gap={56}>
257+
<SectionTitleWrapper color={`var(${UI.COLOR_NEUTRAL_10})`} maxWidth={1100} gap={56}>
254258
<SectionTitleIcon $size={128}>
255259
<LazySVG src={IMG_ICON_BULB_COW} />
256260
</SectionTitleIcon>
@@ -280,7 +284,7 @@ export default function Page() {
280284
</TopicImage>
281285
<TopicCardInner contentAlign="left">
282286
<TopicTitle fontSize={52}>Provide liquidity for your token without getting rekt</TopicTitle>
283-
<TopicDescription fontSize={24} color={Color.neutral50}>
287+
<TopicDescription fontSize={24} color={`var(${UI.COLOR_NEUTRAL_50})`}>
284288
Healthy liquidity for DAO tokens reduces price impact, encourages investment and discourages
285289
volatility. But DAOs can be reluctant to provide liquidity with treasury funds when their pools can be
286290
exploited by arbitrageurs. CoW AMM makes providing liquidity more attractive to DAOs of all sizes
@@ -299,7 +303,7 @@ export default function Page() {
299303
>
300304
<TopicCardInner contentAlign="left">
301305
<TopicTitle fontSize={52}>Unlock the power of passive income while reducing risk</TopicTitle>
302-
<TopicDescription fontSize={24} color={Color.neutral50}>
306+
<TopicDescription fontSize={24} color={`var(${UI.COLOR_NEUTRAL_50})`}>
303307
With LVR in the rear view mirror, providing liquidity becomes identical to running a passive
304308
investment strategy: solvers rebalance the pool at the correct market price to keep the value of its
305309
reserves equal, thereby keeping portfolios balanced and reducing risk. On top of that, liquidity
@@ -322,7 +326,7 @@ export default function Page() {
322326
</ContainerCardSection>
323327
</ContainerCard>
324328

325-
<ContainerCard bgColor={Color.neutral10} color={Color.neutral98}>
329+
<ContainerCard bgColor={`var(${UI.COLOR_NEUTRAL_10})`} color={`var(${UI.COLOR_NEUTRAL_98})`}>
326330
<ContainerCardSection>
327331
<SectionTitleWrapper padding="150px 0 56px">
328332
<SectionTitleIcon $size={82}>
@@ -353,7 +357,7 @@ export default function Page() {
353357
</ContainerCardSection>
354358
</ContainerCard>
355359

356-
<ContainerCard bgColor={Color.neutral90} color={Color.neutral10} touchFooter>
360+
<ContainerCard bgColor={`var(${UI.COLOR_NEUTRAL_90})`} color={`var(${UI.COLOR_NEUTRAL_10})`} touchFooter>
357361
<ContainerCardSection padding={'0 0 100px'}>
358362
<SectionTitleWrapper>
359363
<SectionTitleIcon $size={62}>

0 commit comments

Comments
 (0)