Skip to content

Commit f1ee160

Browse files
tienkanetienkane
authored
update: remove beta on farming (#2889)
* fix: user position responsive * fix: cross-chain rate logo rounded * remove: beta on farming
1 parent 93e9015 commit f1ee160

File tree

6 files changed

+27
-29
lines changed

6 files changed

+27
-29
lines changed

‎apps/kyberswap-interface/src/components/Header/groups/EarnNavGroup.tsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { ReactComponent as FarmingIcon } from 'assets/svg/earn/ic_farming.svg'
1010
import { ReactComponent as KemIcon } from 'assets/svg/kyber/kem.svg'
1111
import NavGroup from 'components/Header/groups/NavGroup'
1212
import { DropdownTextAnchor, StyledNavLink } from 'components/Header/styleds'
13-
import { BetaLabel } from 'components/Menu'
1413
import { APP_PATHS } from 'constants/index'
1514
import { FilterTag } from 'pages/Earns/PoolExplorer/Filter'
1615
import { MEDIA_WIDTHS } from 'theme'
@@ -85,10 +84,7 @@ const EarnNavGroup = () => {
8584
>
8685
<Flex sx={{ gap: '12px' }} alignItems="center">
8786
<FarmingIcon width={16} height={16} />
88-
<Flex sx={{ gap: '2px' }}>
89-
{t`Farming Pools`}
90-
<BetaLabel>{t`BETA`}</BetaLabel>
91-
</Flex>
87+
<Flex sx={{ gap: '2px' }}>{t`Farming Pools`}</Flex>
9288
</Flex>
9389
</StyledNavLink>
9490

‎apps/kyberswap-interface/src/pages/CrossChainSwap/components/TokenLogoWithChain.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export const TokenLogoWithChain = ({
4646
position: 'absolute',
4747
top: 0,
4848
right: '-4px',
49+
borderRadius: '50%',
4950
...chainLogoStyle,
5051
}}
5152
/>

‎apps/kyberswap-interface/src/pages/Earns/UserPositions/TableContent.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default function TableContent({
7373
const { account } = useActiveWeb3React()
7474
const toggleWalletModal = useWalletModalToggle()
7575
const theme = useTheme()
76-
const upToLarge = useMedia(`(max-width: ${MEDIA_WIDTHS.upToLarge}px)`)
76+
const upToCustomLarge = useMedia(`(max-width: ${1300}px)`)
7777
const upToSmall = useMedia(`(max-width: ${MEDIA_WIDTHS.upToSmall}px)`)
7878

7979
const [positionThatClaimingFees, setPositionThatClaimingFees] = useState<ParsedPosition | null>(null)
@@ -416,7 +416,7 @@ export default function TableContent({
416416
</PositionOverview>
417417

418418
{/* Actions for Tablet */}
419-
{upToLarge && !isUnfinalized && <PositionActionWrapper>{actions}</PositionActionWrapper>}
419+
{upToCustomLarge && !isUnfinalized && <PositionActionWrapper>{actions}</PositionActionWrapper>}
420420

421421
{/* Value info */}
422422
<PositionValueWrapper>
@@ -511,7 +511,7 @@ export default function TableContent({
511511
</PositionValueWrapper>
512512

513513
{/* Unclaimed fees info */}
514-
<PositionValueWrapper align={upToLarge ? 'flex-end' : ''}>
514+
<PositionValueWrapper align={upToCustomLarge ? 'flex-end' : ''}>
515515
<PositionValueLabel>{t`Unclaimed Fee`}</PositionValueLabel>
516516

517517
{isUnfinalized ? (
@@ -541,7 +541,7 @@ export default function TableContent({
541541
</PositionValueWrapper>
542542

543543
{/* Unclaimed rewards info */}
544-
<PositionValueWrapper align={!upToLarge ? 'center' : ''}>
544+
<PositionValueWrapper align={!upToCustomLarge ? 'center' : ''}>
545545
<PositionValueLabel>{t`Unclaimed rewards`}</PositionValueLabel>
546546
{isUnfinalized ? (
547547
<PositionSkeleton width={80} height={19} text={t`Finalizing...`} />
@@ -583,7 +583,7 @@ export default function TableContent({
583583
)}
584584
</PositionValueWrapper>
585585

586-
{!upToLarge && <div />}
586+
{!upToCustomLarge && <div />}
587587

588588
{/* Balance info */}
589589
<PositionValueWrapper align={upToSmall ? 'flex-end' : ''}>
@@ -611,8 +611,8 @@ export default function TableContent({
611611
</PositionValueWrapper>
612612

613613
{/* Price range info */}
614-
<PositionValueWrapper align={upToLarge ? 'flex-end' : ''}>
615-
{upToLarge ? (
614+
<PositionValueWrapper align={upToCustomLarge ? 'flex-end' : ''}>
615+
{upToCustomLarge ? (
616616
isUnfinalized ? null : (
617617
<PriceRange
618618
minPrice={priceRange.min}
@@ -640,7 +640,7 @@ export default function TableContent({
640640
</PositionValueWrapper>
641641

642642
{/* Actions info */}
643-
{!upToLarge && (
643+
{!upToCustomLarge && (
644644
<PositionValueWrapper align="flex-end">
645645
{isUnfinalized ? <PositionSkeleton width={80} height={19} text={t`Finalizing...`} /> : actions}
646646
</PositionValueWrapper>

‎apps/kyberswap-interface/src/pages/Earns/UserPositions/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const POSITIONS_TABLE_LIMIT = 10
4848
const UserPositions = () => {
4949
const theme = useTheme()
5050
const navigate = useNavigate()
51-
const upToLarge = useMedia(`(max-width: ${MEDIA_WIDTHS.upToLarge}px)`)
51+
const upToCustomLarge = useMedia(`(max-width: ${1300}px)`)
5252
const upToSmall = useMedia(`(max-width: ${MEDIA_WIDTHS.upToSmall}px)`)
5353
const { account } = useActiveWeb3React()
5454
const { filters, updateFilters } = useFilter()
@@ -382,7 +382,7 @@ const UserPositions = () => {
382382

383383
<PositionTableWrapper>
384384
<ContentWrapper>
385-
{!upToLarge && paginatedPositions && paginatedPositions.length > 0 && (
385+
{!upToCustomLarge && paginatedPositions && paginatedPositions.length > 0 && (
386386
<PositionTableHeader>
387387
<PositionTableHeaderItem>{t`Position`}</PositionTableHeaderItem>
388388

@@ -437,7 +437,7 @@ const UserPositions = () => {
437437
</Trans>
438438
</PositionTableHeaderFlexItem>
439439

440-
{!upToLarge && <div />}
440+
{!upToCustomLarge && <div />}
441441

442442
<PositionTableHeaderItem>{t`Balance`}</PositionTableHeaderItem>
443443

‎apps/kyberswap-interface/src/pages/Earns/UserPositions/styles.tsx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { PoolPageWrapper, TableHeader, TableWrapper } from 'pages/Earns/PoolExpl
88
export const PositionPageWrapper = styled(PoolPageWrapper)`
99
padding: 24px 6rem 62px;
1010
11-
${({ theme }) => theme.mediaWidth.upToLarge`
11+
@media (max-width: 1300px) {
1212
padding: 24px 6rem 60px;
13-
`}
13+
}
1414
1515
${({ theme }) => theme.mediaWidth.upToSmall`
1616
padding: 24px 16px 100px;
@@ -35,14 +35,14 @@ export const PositionRow = styled(Link)`
3535
text-decoration: none;
3636
color: inherit !important;
3737
38-
${({ theme }) => theme.mediaWidth.upToLarge`
38+
@media (max-width: 1300px) {
3939
justify-content: flex-start;
4040
grid-template-columns: repeat(3, 1fr);
4141
grid-template-rows: 1fr 1fr;
4242
border-radius: 20px;
43-
background: ${rgba(theme.background, 0.8)};
43+
background: ${({ theme }) => rgba(theme.background, 0.8)};
4444
margin-bottom: 16px;
45-
`}
45+
}
4646
4747
${({ theme }) => theme.mediaWidth.upToSmall`
4848
display: flex;
@@ -68,9 +68,9 @@ export const PositionOverview = styled.div`
6868
flex-direction: column;
6969
gap: 8px;
7070
71-
${({ theme }) => theme.mediaWidth.upToLarge`
71+
@media (max-width: 1300px) {
7272
grid-column: span 2;
73-
`}
73+
}
7474
`
7575

7676
export const ImageContainer = styled.div`
@@ -160,9 +160,9 @@ export const PositionValueLabel = styled.p`
160160
top: 1px;
161161
display: none;
162162
163-
${({ theme }) => theme.mediaWidth.upToLarge`
163+
@media (max-width: 1300px) {
164164
display: block;
165-
`}
165+
}
166166
167167
${({ theme }) => theme.mediaWidth.upToSmall`
168168
font-size: 16px;
@@ -354,10 +354,10 @@ export const PositionTableHeaderFlexItem = styled.div`
354354
export const PositionTableWrapper = styled(TableWrapper)`
355355
overflow: hidden;
356356
357-
${({ theme }) => theme.mediaWidth.upToLarge`
357+
@media (max-width: 1300px) {
358358
background: transparent;
359359
margin: 0;
360-
`}
360+
}
361361
`
362362

363363
export const PriceRangeWrapper = styled.div<{ outOfRange: boolean }>`

‎apps/kyberswap-interface/src/theme/index.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import styled, {
88
css,
99
} from 'styled-components'
1010

11-
import { Colors, colors } from './color'
11+
import { Colors, colors } from 'theme/color'
1212

13-
export * from './components'
13+
export * from 'theme/components'
1414

1515
export const MEDIA_WIDTHS = {
1616
upToXXSmall: 420,
@@ -223,6 +223,7 @@ export const ThemedGlobalStyle = createGlobalStyle`
223223
224224
input[type=number] {
225225
-moz-appearance: textfield; /* Firefox */
226+
appearance: textfield;
226227
}
227228
228229
.tv-lightweight-charts{

0 commit comments

Comments
 (0)