Skip to content

Commit

Permalink
Merge branch 'main' into update-noti-watchlist
Browse files Browse the repository at this point in the history
  • Loading branch information
nguyenhoaidanh authored Oct 14, 2023
2 parents 81089f8 + 0e6362d commit 2c3d228
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
9 changes: 4 additions & 5 deletions src/components/Header/web3/WalletModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import {
useWalletModalToggle,
} from 'state/application/hooks'
import { useIsConnectingWallet } from 'state/authen/hooks'
import { ExternalLink } from 'theme'
import { isEVMWallet, isOverriddenWallet, isSolanaWallet } from 'utils'

import Option from './Option'
Expand Down Expand Up @@ -317,13 +316,13 @@ export default function WalletModal() {
<Text color={theme.subText}>
<Trans>
By connecting a wallet, you accept{' '}
<ExternalLink href={TERM_FILES_PATH.KYBERSWAP_TERMS} onClick={e => e.stopPropagation()}>
<a href={TERM_FILES_PATH.KYBERSWAP_TERMS} onClick={e => e.stopPropagation()}>
KyberSwap&lsquo;s Terms of Use
</ExternalLink>{' '}
</a>{' '}
and consent to its{' '}
<ExternalLink href={TERM_FILES_PATH.PRIVACY_POLICY} onClick={e => e.stopPropagation()}>
<a href={TERM_FILES_PATH.PRIVACY_POLICY} onClick={e => e.stopPropagation()}>
Privacy Policy
</ExternalLink>
</a>
. Last updated: {dayjs(TERM_FILES_PATH.VERSION).format('DD MMM YYYY')}
</Trans>
</Text>
Expand Down
8 changes: 4 additions & 4 deletions src/components/Menu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ export default function Menu() {
)}

<MenuItem>
<ExternalLink
<a
href={TERM_FILES_PATH.KYBERSWAP_TERMS}
onClick={() => {
toggle()
Expand All @@ -482,10 +482,10 @@ export default function Menu() {
>
<FileText />
<Trans>Terms</Trans>
</ExternalLink>
</a>
</MenuItem>
<MenuItem>
<ExternalLink
<a
href={TERM_FILES_PATH.PRIVACY_POLICY}
onClick={() => {
toggle()
Expand All @@ -494,7 +494,7 @@ export default function Menu() {
>
<FileText />
<Trans>Privacy Policy</Trans>
</ExternalLink>
</a>
</MenuItem>
<MenuItem>
<ExternalLink
Expand Down
13 changes: 6 additions & 7 deletions src/pages/KyberDAO/KNCUtility/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ export default function KNCUtility() {
<Text fontSize={14} fontWeight={400} lineHeight="20px">
<Trans>
These Terms and Conditions should be read in conjunction with the KyberSwap{' '}
<ExternalLink href={TERM_FILES_PATH.KYBERSWAP_TERMS}>Terms of Use</ExternalLink>, which lay out
the terms and conditions that apply to all KyberSwap activities.
<a href={TERM_FILES_PATH.KYBERSWAP_TERMS}>Terms of Use</a>, which lay out the terms and conditions
that apply to all KyberSwap activities.
</Trans>
</Text>
</li>
Expand All @@ -290,7 +290,7 @@ export default function KNCUtility() {
<Trans>
By visiting KyberSwap and participating in the program, the User is deemed to have read,
understood, and agreed to these Terms and Conditions and the KyberSwap{' '}
<ExternalLink href={TERM_FILES_PATH.KYBERSWAP_TERMS}>Terms of Use</ExternalLink>.
<a href={TERM_FILES_PATH.KYBERSWAP_TERMS}>Terms of Use</a>.
</Trans>
</Text>
</li>
Expand All @@ -308,10 +308,9 @@ export default function KNCUtility() {
<Text fontSize={14} fontWeight={400} lineHeight="20px">
<Trans>
KyberSwap maintains the right, at its sole discretion, to take action or remove rewards against
the User who violates the KyberSwap{' '}
<ExternalLink href={TERM_FILES_PATH.KYBERSWAP_TERMS}>Terms of Use</ExternalLink> and/or violates,
cheats, or exploits the program, including but not limited to, any suspicious activities, or any
attempts to circumvent these Terms and Conditions.
the User who violates the KyberSwap <a href={TERM_FILES_PATH.KYBERSWAP_TERMS}>Terms of Use</a>{' '}
and/or violates, cheats, or exploits the program, including but not limited to, any suspicious
activities, or any attempts to circumvent these Terms and Conditions.
</Trans>
</Text>
</li>
Expand Down

0 comments on commit 2c3d228

Please sign in to comment.