-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* some improvements * improve for charts dont have data * add timeframe switcher in price chart * add new static farm contract (#2166) * improve token list (#2157) * improve token list * revert tooltip text * fix: reward is wrapped token (#2167) * update new contract (#2168) * fix(farm-v2): user info does not show (#2169) * refactor screen size show menu (#2171) * refactor ks setting use rtk query (#2170) * fix: keep position which still have reward (#2173) * refactor: split kyberAI tracking(#2174) * refactor: handle rejected tx & messages (#2172) * feat: add zkevm (#2152) * feat: add zkevm * point to prod * update subgraph link * fix minor bug * update logo chain * fix: zksync path * fix: build * update farm contract * revert env.adpr * Pool farm improvement (#2178) * feat: show static farm total reward * fix: addliquidity multiple pos for farm * env proid * revert env * remove: token info (#2180) * [QA-36] E2E - Add other EVM chains (#2131) * setup set up set up * css layout + select network * add sort arrow * set up sort * update layout * UI for new custom watchlist * css mobile * fix warning * rm import * update custom watchlist for list page * split tab btn * chore * update styled * update assetId and hooks to use new params * wip * wip * done ui, wait for api * add variant select in explore page * revert watchlist updates * fix failed errors * fix conflict * rename * fix issues * update select variant * fix hide button not works * fix bugs * remove console.log * fix header gap not consistent * connect api categories * use bff api * chore: move folder noti * refactor * navigate to explore page using provided chain and address * improve network select * fix kyberai banner fetch api event user closed it * connect real type * wip * update template * resolve conflict * build * fix: css * fix error * fix format fix score c chore * kyber calc at * revert s s r * fix: when asset too small * add template type * refactor type * check for elastic pool * resolve conflict * fix warning --------- Co-authored-by: XiaoYhun <xiaoyhun@gmail.com> Co-authored-by: Nguyen Van Viet <vietnv1304@gmail.com> Co-authored-by: Nam Nguyen <nam.nguyen@kyber.network> Co-authored-by: ltthienn <132639843+ltthienn@users.noreply.github.com>
- Loading branch information
5 people
authored
Sep 29, 2023
1 parent
c0b0024
commit 045a496
Showing
56 changed files
with
1,165 additions
and
858 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
src/components/Announcement/PrivateAnnoucement/InboxItemKyberAIWatchList.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| import { useNavigate } from 'react-router-dom' | ||
| import { Text } from 'rebass' | ||
| import styled from 'styled-components' | ||
|
|
||
| import { PrivateAnnouncementProp } from 'components/Announcement/PrivateAnnoucement' | ||
| import InboxIcon from 'components/Announcement/PrivateAnnoucement/Icon' | ||
| import { Dot, InboxItemRow, InboxItemWrapper, RowItem, Title } from 'components/Announcement/PrivateAnnoucement/styled' | ||
| import { AnnouncementTemplateKyberAIWatchlist, TokenInfoWatchlist } from 'components/Announcement/type' | ||
| import Column from 'components/Column' | ||
| import { TokenLogoWithShadow } from 'components/Logo' | ||
| import { APP_PATHS } from 'constants/index' | ||
| import useTheme from 'hooks/useTheme' | ||
| import { calculateValueToColor, getTypeByKyberScore } from 'pages/TrueSightV2/utils' | ||
| import { formatDisplayNumber } from 'utils/numbers' | ||
|
|
||
| const ItemWrapper = styled.div` | ||
| display: flex; | ||
| align-items: center; | ||
| gap: 8px; | ||
| ` | ||
| export const TokenInfo = ({ | ||
| showPrice = true, | ||
| logoSize = '12px', | ||
| token, | ||
| }: { | ||
| showPrice?: boolean | ||
| logoSize?: string | ||
| token: TokenInfoWatchlist | ||
| }) => { | ||
| const theme = useTheme() | ||
| const { logoURL, symbol, price, priceChange, kyberScore } = token || {} | ||
| return ( | ||
| <ItemWrapper> | ||
| <TokenLogoWithShadow srcs={[logoURL]} size={logoSize} /> | ||
| <Column gap="4px" fontSize={logoSize}> | ||
| <Text color={theme.text}> | ||
| {symbol}{' '} | ||
| <Text as="span" color={calculateValueToColor(+kyberScore, theme)}> | ||
| {kyberScore} ({getTypeByKyberScore(+kyberScore)}) | ||
| </Text> | ||
| </Text> | ||
| {showPrice && ( | ||
| <Text> | ||
| <Text as="span" color={theme.text}> | ||
| {formatDisplayNumber(price, { style: 'currency', significantDigits: 4 })} | ||
| </Text>{' '} | ||
| <Text as="span" color={+priceChange > 0 ? theme.apr : theme.red}> | ||
| ({+priceChange > 0 && '+'} | ||
| {formatDisplayNumber(+priceChange / 100, { style: 'percent', fractionDigits: 2, allowNegative: true })}) | ||
| </Text> | ||
| </Text> | ||
| )} | ||
| </Column> | ||
| </ItemWrapper> | ||
| ) | ||
| } | ||
|
|
||
| function InboxItemBridge({ | ||
| announcement, | ||
| onRead, | ||
| style, | ||
| time, | ||
| title, | ||
| }: PrivateAnnouncementProp<AnnouncementTemplateKyberAIWatchlist>) { | ||
| const { templateBody, isRead, templateType } = announcement | ||
| const { assets = [] } = templateBody || {} | ||
| const [token1, token2, token3] = assets | ||
|
|
||
| const navigate = useNavigate() | ||
| const onClick = () => { | ||
| navigate(APP_PATHS.KYBERAI_RANKINGS) | ||
| onRead(announcement, 'kyberAI_watchlist') | ||
| } | ||
|
|
||
| return ( | ||
| <InboxItemWrapper isRead={isRead} onClick={onClick} style={{ ...style, paddingTop: '8px', gap: '6px' }}> | ||
| <InboxItemRow> | ||
| <RowItem> | ||
| <InboxIcon type={templateType} /> | ||
| <Title isRead={isRead}>{title}</Title> | ||
| {!isRead && <Dot />} | ||
| </RowItem> | ||
| </InboxItemRow> | ||
|
|
||
| <InboxItemRow> | ||
| {token1 && <TokenInfo token={token1} />} | ||
| {token2 && <TokenInfo token={token2} />} | ||
| </InboxItemRow> | ||
|
|
||
| <InboxItemRow style={{ alignItems: 'center' }}> | ||
| {token3 ? <TokenInfo token={token3} /> : <div />} | ||
| {time} | ||
| </InboxItemRow> | ||
| </InboxItemWrapper> | ||
| ) | ||
| } | ||
| export default InboxItemBridge |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
src/components/Announcement/PrivateAnnoucement/NotificationCenter/KyberAIWatchlist.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| import { Trans } from '@lingui/macro' | ||
| import { Fragment, useState } from 'react' | ||
| import { useNavigate } from 'react-router-dom' | ||
| import { Flex } from 'rebass' | ||
| import styled from 'styled-components' | ||
|
|
||
| import { ReactComponent as DropdownSVG } from 'assets/svg/down.svg' | ||
| import InboxIcon from 'components/Announcement/PrivateAnnoucement/Icon' | ||
| import { TokenInfo } from 'components/Announcement/PrivateAnnoucement/InboxItemKyberAIWatchList' | ||
| import { PrivateAnnouncementPropCenter } from 'components/Announcement/PrivateAnnoucement/NotificationCenter' | ||
| import { AnnouncementTemplateKyberAIWatchlist } from 'components/Announcement/type' | ||
| import { APP_PATHS } from 'constants/index' | ||
| import useTheme from 'hooks/useTheme' | ||
| import { formatTime } from 'utils/time' | ||
|
|
||
| import { ArrowWrapper, Desc, Time, Title, Wrapper } from './styled' | ||
|
|
||
| const Detail = styled.div` | ||
| display: grid; | ||
| width: 100%; | ||
| grid-template-columns: 1fr 1fr; | ||
| gap: 12px; | ||
| ` | ||
|
|
||
| export default function AnnouncementItem({ | ||
| announcement, | ||
| title, | ||
| }: PrivateAnnouncementPropCenter<AnnouncementTemplateKyberAIWatchlist>) { | ||
| const { sentAt, templateType, templateBody } = announcement | ||
| const { assets = [] } = templateBody || {} | ||
| const theme = useTheme() | ||
| const navigate = useNavigate() | ||
| const [expand, setExpand] = useState(false) | ||
| const slice = 3 | ||
| const minimalAssets = assets.slice(0, slice) | ||
|
|
||
| return ( | ||
| <Wrapper onClick={() => setExpand(!expand)}> | ||
| <Flex justifyContent="space-between" width="100%"> | ||
| <Title onClick={() => navigate(APP_PATHS.KYBERAI_RANKINGS)}> | ||
| <InboxIcon type={templateType} /> | ||
| {title} | ||
| </Title> | ||
| <Flex alignItems={'center'}> | ||
| <Time>{formatTime(sentAt)} </Time> | ||
| <ArrowWrapper data-expanded={expand}> | ||
| <DropdownSVG /> | ||
| </ArrowWrapper> | ||
| </Flex> | ||
| </Flex> | ||
| <Desc style={{ gap: 6, flexWrap: 'wrap', color: theme.subText }}> | ||
| <Trans>Here is an update on the tokens in your watchlist:</Trans> | ||
| {!expand && | ||
| minimalAssets.map((token, i) => ( | ||
| <Fragment key={i}> | ||
| <TokenInfo token={token} showPrice={false} key={i} logoSize={'14px'} /> | ||
| {i === minimalAssets.length - 1 ? (minimalAssets.length < slice ? '' : ', ...') : ', '} | ||
| </Fragment> | ||
| ))} | ||
| </Desc> | ||
| {expand && ( | ||
| <Detail> | ||
| {assets.map((token, i) => ( | ||
| <TokenInfo token={token} key={i} showPrice logoSize={'14px'} /> | ||
| ))} | ||
| </Detail> | ||
| )} | ||
| </Wrapper> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.