Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove cmopany and uniswap copyright #17

Merged
merged 5 commits into from
Jan 2, 2024
Merged
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: true
contact_links:
- name: Support
url: https://discord.gg/FCfyBSbCU5
url: https://discord.com/invite/aCSKcvf5VW
about: Please ask and answer questions here
- name: List a token
url: https://github.com/Uniswap/default-token-list#adding-a-token
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@

An open source interface for Uniswap -- a protocol for decentralized exchange of Ethereum tokens.

- Website: [uniswap.org](https://uniswap.org/)
- Interface: [app.uniswap.org](https://app.uniswap.org)
- Website: [dark.florist](https://www.dark.florist/)
- Docs: [uniswap.org/docs/](https://docs.uniswap.org/)
- Twitter: [@Uniswap](https://twitter.com/Uniswap)
- Reddit: [/r/Uniswap](https://www.reddit.com/r/Uniswap/)
- Twitter: [@DarkFlorist](https://twitter.com/DarkFlorist)
- Email: [[email protected]](mailto:[email protected])
- Discord: [Uniswap](https://discord.gg/FCfyBSbCU5)
- Discord: [Dark Florists](https://discord.com/invite/aCSKcvf5VW)
- Whitepapers:
- [V1](https://hackmd.io/C-DvwDSfSxuh-Gd4WKE_ig)
- [V2](https://uniswap.org/whitepaper.pdf)
Expand Down
27 changes: 5 additions & 22 deletions src/components/About/AboutFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,30 +102,22 @@ const TextLink = styled(StyledRouterLink)`
color: ${({ theme }) => theme.neutral2};
`

const Copyright = styled.span`
font-size: 16px;
line-height: 20px;
margin: 1rem 0 0 0;
color: ${({ theme }) => theme.neutral3};
`

const LogoSectionContent = () => {
const isDarkMode = useIsDarkMode()
return (
<>
<StyledLogo src={isDarkMode ? darkUnicornImgSrc : lightUnicornImgSrc} alt="Uniswap Logo" />
<SocialLinks>
<SocialLink href="https://discord.gg/FCfyBSbCU5" target="_blank" rel="noopener noreferrer">
<SocialLink href="https://discord.com/invite/aCSKcvf5VW" target="_blank" rel="noopener noreferrer">
<DiscordIcon size={32} />
</SocialLink>
<SocialLink href="https://twitter.com/uniswap" target="_blank" rel="noopener noreferrer">
<SocialLink href="https://twitter.com/DarkFlorist" target="_blank" rel="noopener noreferrer">
<TwitterIcon size={32} />
</SocialLink>
<SocialLink href="https://github.com/Uniswap" target="_blank" rel="noopener noreferrer">
<SocialLink href="https://github.com/DarkFlorist/Horswap" target="_blank" rel="noopener noreferrer">
<GithubIcon size={32} />
</SocialLink>
</SocialLinks>
<Copyright>© {new Date().getFullYear()} Uniswap Labs</Copyright>
</>
)
}
Expand All @@ -152,19 +144,10 @@ export const AboutFooter = () => {
<ExternalTextLink href="https://uniswap.org/governance">Governance</ExternalTextLink>
<ExternalTextLink href="https://uniswap.org/developers">Developers</ExternalTextLink>
</LinkGroup>
<LinkGroup>
<LinkGroupTitle>Company</LinkGroupTitle>
<ExternalTextLink href="https://boards.greenhouse.io/uniswaplabs">Careers</ExternalTextLink>
<ExternalTextLink href="https://uniswap.org/blog">Blog</ExternalTextLink>
</LinkGroup>
<LinkGroup>
<LinkGroupTitle>Get Help</LinkGroupTitle>
<ExternalTextLink
href="https://support.uniswap.org/hc/en-us/requests/new"
target="_blank"
rel="noopener noreferrer"
>
Contact Us
<ExternalTextLink href="https://discord.com/invite/aCSKcvf5VW" target="_blank" rel="noopener noreferrer">
Contact Us On Discord
</ExternalTextLink>
<ExternalTextLink href="https://support.uniswap.org/hc/en-us">Help Center</ExternalTextLink>
</LinkGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ErrorBoundary/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ const Fallback = ({ error, eventId }: { error: Error; eventId: string | null })
<SmallButtonPrimary onClick={() => window.location.reload()}>
<Trans>Reload the app</Trans>
</SmallButtonPrimary>
<ExternalLink id="get-support-on-discord" href="https://discord.gg/FCfyBSbCU5" target="_blank">
<ExternalLink id="get-support-on-discord" href="https://discord.com/invite/aCSKcvf5VW" target="_blank">
<SmallButtonLight>
<Trans>Get support</Trans>
</SmallButtonLight>
Expand Down
18 changes: 3 additions & 15 deletions src/components/NavBar/MenuDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useOnClickOutside } from 'hooks/useOnClickOutside'
import { Box } from 'nft/components/Box'
import { Column, Row } from 'nft/components/Flex'
import {
BarChartIcon,
DiscordIconMenu,
EllipsisIcon,
GithubIconMenu,
Expand Down Expand Up @@ -153,14 +152,6 @@ export const MenuDropdown = () => {
<Trans>Vote in governance</Trans>
</PrimaryMenuRow.Text>
</PrimaryMenuRow>
<PrimaryMenuRow href="https://info.uniswap.org/#/">
<Icon>
<BarChartIcon width={24} height={24} color={theme.neutral1} />
</Icon>
<PrimaryMenuRow.Text>
<Trans>View more analytics</Trans>
</PrimaryMenuRow.Text>
</PrimaryMenuRow>
</Column>
<Separator />
<Box
Expand All @@ -176,9 +167,6 @@ export const MenuDropdown = () => {
<SecondaryLinkedText href="https://docs.uniswap.org/">
<Trans>Documentation</Trans> ↗
</SecondaryLinkedText>
<SecondaryLinkedText href="https://uniswap.canny.io/feature-requests">
<Trans>Feedback</Trans> ↗
</SecondaryLinkedText>
{(isDevelopmentEnv() || isStagingEnv()) && (
<SecondaryLinkedText
onClick={() => {
Expand All @@ -191,13 +179,13 @@ export const MenuDropdown = () => {
)}
</Box>
<IconRow>
<Icon href="https://discord.com/invite/FCfyBSbCU5">
<Icon href="https://discord.com/invite/aCSKcvf5VW">
<DiscordIconMenu className={styles.hover} width={24} height={24} color={themeVars.colors.neutral2} />
</Icon>
<Icon href="https://twitter.com/Uniswap">
<Icon href="https://twitter.com/DarkFlorist">
<TwitterIconMenu className={styles.hover} width={24} height={24} color={themeVars.colors.neutral2} />
</Icon>
<Icon href="https://github.com/Uniswap">
<Icon href="https://github.com/DarkFlorist/Horswap">
<GithubIconMenu className={styles.hover} width={24} height={24} color={themeVars.colors.neutral2} />
</Icon>
</IconRow>
Expand Down
2 changes: 1 addition & 1 deletion src/nft/components/collection/TransactionCompleteModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ const TxCompleteModal = () => {
nftsPurchased.length === 1 ? ' is' : 's are'
} no longer available. Uniswap instantly refunded you for this incomplete transaction. `}
{formatUsdPrice(txFeeFiat)} was used for gas in attempt to complete this transaction. For support,
please visit our <a href="https://discord.gg/FCfyBSbCU5">Discord</a>
please visit our <a href="https://discord.com/invite/aCSKcvf5VW">Discord</a>
</p>
<Box className={styles.allUnavailableAssets}>
{nftsNotPurchased.length >= 3 && (
Expand Down
24 changes: 12 additions & 12 deletions src/pages/Landing/__snapshots__/index.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2377,7 +2377,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
>
<a
class="c89"
href="https://discord.gg/FCfyBSbCU5"
href="https://discord.com/invite/aCSKcvf5VW"
rel="noopener noreferrer"
target="_blank"
>
Expand All @@ -2390,7 +2390,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
</a>
<a
class="c89"
href="https://twitter.com/uniswap"
href="https://twitter.com/DarkFlorist"
rel="noopener noreferrer"
target="_blank"
>
Expand All @@ -2403,7 +2403,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
</a>
<a
class="c89"
href="https://github.com/Uniswap"
href="https://github.com/DarkFlorist/Horswap"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -2550,7 +2550,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
>
<a
class="c89"
href="https://discord.gg/FCfyBSbCU5"
href="https://discord.com/invite/aCSKcvf5VW"
rel="noopener noreferrer"
target="_blank"
>
Expand All @@ -2563,7 +2563,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
</a>
<a
class="c89"
href="https://twitter.com/uniswap"
href="https://twitter.com/DarkFlorist"
rel="noopener noreferrer"
target="_blank"
>
Expand All @@ -2576,7 +2576,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
</a>
<a
class="c89"
href="https://github.com/Uniswap"
href="https://github.com/DarkFlorist/Horswap"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -5049,7 +5049,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
>
<a
class="c90"
href="https://discord.gg/FCfyBSbCU5"
href="https://discord.com/invite/aCSKcvf5VW"
rel="noopener noreferrer"
target="_blank"
>
Expand All @@ -5062,7 +5062,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
</a>
<a
class="c90"
href="https://twitter.com/uniswap"
href="https://twitter.com/DarkFlorist"
rel="noopener noreferrer"
target="_blank"
>
Expand All @@ -5075,7 +5075,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
</a>
<a
class="c90"
href="https://github.com/Uniswap"
href="https://github.com/DarkFlorist/Horswap"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -5228,7 +5228,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
>
<a
class="c90"
href="https://discord.gg/FCfyBSbCU5"
href="https://discord.com/invite/aCSKcvf5VW"
rel="noopener noreferrer"
target="_blank"
>
Expand All @@ -5241,7 +5241,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
</a>
<a
class="c90"
href="https://twitter.com/uniswap"
href="https://twitter.com/DarkFlorist"
rel="noopener noreferrer"
target="_blank"
>
Expand All @@ -5254,7 +5254,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
</a>
<a
class="c90"
href="https://github.com/Uniswap"
href="https://github.com/DarkFlorist/Horswap"
rel="noopener noreferrer"
target="_blank"
>
Expand Down
Loading