Skip to content

Commit

Permalink
Hotfix 1.20.2 🔥 (#926)
Browse files Browse the repository at this point in the history
* Rebrand CowSwap into CoW Swap (#920)

* Rebrand CowSwap into CoW Swap

* Change title

* Fix additional rebranding

* Fix cowmmunity

* Fix CoW stars

* Fix CoW DAO

* Fix cowmunnity

* Fix small label

* Fix code style issues with Prettier

* Fix CoWmunity messages

* Change description

* Fix code style issues with Prettier

* Change name to game

Co-authored-by: Lint Action <[email protected]>

* goerli: adding tokens with liquidity (#845)

* goerli: adding tokens with liquidity

* fix dai/usdc addresses

* Small fix for the goerli token list

* Updated failed test

Co-authored-by: Lint Action <[email protected]>
Co-authored-by: dave <[email protected]>
Co-authored-by: nenadV91 <[email protected]>
  • Loading branch information
4 people authored Aug 16, 2022
1 parent 3dfdf4f commit 136cdfb
Show file tree
Hide file tree
Showing 51 changed files with 168 additions and 276 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ yarn start

# Contributing

Thank you for your interest in contributing to the CowSwap interface! 🐮
Thank you for your interest in contributing to the CoW Swap interface! 🐮

## Finding a first issue

Expand All @@ -34,9 +34,9 @@ CI checks will run against all PRs.

<!-- # Translations
TODO: read and re-enable
Help CowSwap reach a global audience!
Help CoW Swap reach a global audience!
CowSwap uses [Crowdin](https://crowdin.com/project/cowswap)
CoW Swap uses [Crowdin](https://crowdin.com/project/cowswap)
for managing translations. Whenever a new string is added to the project,
it gets uploaded to Crowdin for translation by [this workflow](./.github/workflows/crowdin.yaml).
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Tests](https://github.com/cowprotocol/cowswap/workflows/CI/badge.svg)](https://github.com/cowprotocol/cowswap/actions/workflows/ci.yml?query=workflow%3ACI)
[![Styled With Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io/)

CowSwap is the first trading interface built on top of CoW Protocol.
CoW Swap is the first trading interface built on top of CoW Protocol.

It allows you to buy and sell tokens using gas-less orders that are settled peer-to-peer among its users or into any on-chain liquidity source while providing MEV protection.

Expand Down Expand Up @@ -87,7 +87,7 @@ Modify the environment variables in `.env.production`, or override them in build

### Price feeds

CowSwap tries to find the best price available on-chain using some price feeds.
CoW Swap tries to find the best price available on-chain using some price feeds.

All price feeds are enabled by default, but they can be individually disabled by using an environment variable:

Expand All @@ -107,7 +107,7 @@ This metadata will be sent to the smart contract as a hexadecimal value in an or
Any web app or client using CoW Protocol can upload to IPFS a metadata JSON and use the digest hex to attach that
information to the order.

For example, CowSwap uploaded the file https://cloudflare-ipfs.com/ipfs/QmTDarZ47oek1miuRd8uuNCy5AFfjzQbWJ7348izx9N8wQ
For example, CoW Swap uploaded the file https://cloudflare-ipfs.com/ipfs/QmTDarZ47oek1miuRd8uuNCy5AFfjzQbWJ7348izx9N8wQ
which has the hexadecimal digest `0x487B02C558D729ABAF3ECF17881A4181E5BC2446429A0995142297E897B6EB37` (See
[CID Explorer](https://cid.ipfs.io/#QmTDarZ47oek1miuRd8uuNCy5AFfjzQbWJ7348izx9N8wQ) for more details).

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cowprotocol/cowswap",
"description": "CowSwap - CoW Protocol",
"description": "CoW Swap",
"homepage": ".",
"files": [
"dist"
Expand Down
19 changes: 10 additions & 9 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html lang="en">

<head>
<title>CowSwap - Meta DEX aggregator</title>
<title>CoW Swap | The smartest way to trade cryptocurrencies</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description"
content="Save money on token swaps by trading directly with peers and avoiding front-running attacks">
content="CoW Swap finds the lowest prices from all decentralized exchanges and DEX aggregators & saves you more with p2p trading and protection from MEV">

<!-- Manifest, theme & colors -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
Expand All @@ -18,16 +18,16 @@

<!-- Social media tags -->
<meta property="og:type" content="website" />
<meta property="og:title" content="CowSwap | Meta DEX aggregator">
<meta property="og:title" content="CoW Swap | The smartest way to trade cryptocurrencies">
<meta property="og:description"
content="Save money on token swaps by trading directly with peers and avoiding front-running attacks">
content="CoW Swap finds the lowest prices from all decentralized exchanges and DEX aggregators & saves you more with p2p trading and protection from MEV">
<meta property="og:image" content="https://cowswap.exchange/images/og-meta-cowswap.png?v=1">
<meta property="og:url" content="https://cowswap.exchange">

<!-- Twitter media tags -->
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="@MEVprotection">
<meta name="twitter:title" content="CowSwap | Meta DEX aggregator">
<meta name="twitter:title" content="CoW Swap | The smartest way to trade cryptocurrencies">
<meta name="twitter:image" content="https://cowswap.exchange/images/og-meta-cowswap.png?v=1">

<!-- Other tags -->
Expand All @@ -53,12 +53,13 @@
}
</style>
<main>
<img src="https://cowswap.exchange/images/og-meta-cowswap.png?v=1" alt="CowSwap Logo" />
<p class="banner">CowSwap uses JavasScript. Please <a href="https://support.google.com/adsense/answer/12654?hl=en"
target="_blank" rel="noopener noreferrer">enable it in your browser</a> 🐮</p>
<img src="https://cowswap.exchange/images/og-meta-cowswap.png?v=1" alt="CoW Swap Logo" />
<p class="banner">CoW Swap uses JavasScript. Please <a
href="https://support.google.com/adsense/answer/12654?hl=en" target="_blank" rel="noopener noreferrer">enable
it in your browser</a> 🐮</p>

<ul>
<li><a href="https://cowswap.exchange/">Home | CowSwap</a></li>
<li><a href="https://cowswap.exchange/">Home | CoW Swap</a></li>
<li><a href="https://chat.cowswap.exchange">Chat</a></li>
<li><a href="https://docs.cow.fi">Docs</a></li>
<li><a href="https://dune.xyz/gnosis.protocol/Gnosis-Protocol-V2">Stats</a></li>
Expand Down
6 changes: 3 additions & 3 deletions public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"background_color": "#fff",
"display": "standalone",
"homepage_url": "https://cowswap.exchange",
"description": "Save money on token swaps by trading directly with peers and avoiding front-running attacks",
"description": "CoW Swap finds the lowest prices from all decentralized exchanges and DEX aggregators & saves you more with p2p trading and protection from MEV",
"iconPath": "favicon.png",
"icons": [
{
Expand All @@ -19,8 +19,8 @@
}
],
"orientation": "portrait",
"name": "CowSwap",
"short_name": "CowSwap",
"name": "CoW Swap",
"short_name": "CoW Swap",
"start_url": ".",
"theme_color": "#ff784a"
}
7 changes: 0 additions & 7 deletions src/assets/metadata/CowSwap-ENS.json

This file was deleted.

7 changes: 0 additions & 7 deletions src/assets/metadata/CowSwap-barn.json

This file was deleted.

7 changes: 0 additions & 7 deletions src/assets/metadata/CowSwap-development.json

This file was deleted.

7 changes: 0 additions & 7 deletions src/assets/metadata/CowSwap-local.json

This file was deleted.

7 changes: 0 additions & 7 deletions src/assets/metadata/CowSwap-pr.json

This file was deleted.

7 changes: 0 additions & 7 deletions src/assets/metadata/CowSwap-production.json

This file was deleted.

7 changes: 0 additions & 7 deletions src/assets/metadata/CowSwap-staging.json

This file was deleted.

44 changes: 0 additions & 44 deletions src/assets/metadata/ipfs_hashes.json

This file was deleted.

2 changes: 1 addition & 1 deletion src/custom/api/gnosisProtocol/errors/OperatorError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export enum ApiErrorCodeDetails {
InsufficientValidTo = 'The order you are signing is already expired. This can happen if you set a short expiration in the settings and waited too long before signing the transaction. Please try again.',
InsufficientAllowance = "The account doesn't have enough funds.",
InsufficientBalance = 'The account needs to approve the selling token in order to trade.',
WrongOwner = "The signature is invalid.\n\nIt's likely that the signing method provided by your wallet doesn't comply with the standards required by CowSwap.\n\nCheck whether your Wallet app supports off-chain signing (EIP-712 or ETHSIGN).",
WrongOwner = "The signature is invalid.\n\nIt's likely that the signing method provided by your wallet doesn't comply with the standards required by CoW Swap.\n\nCheck whether your Wallet app supports off-chain signing (EIP-712 or ETHSIGN).",
NotFound = 'Token pair selected has insufficient liquidity.',
OrderNotFound = 'The order you are trying to cancel does not exist.',
AlreadyCancelled = 'Order is already cancelled.',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function GnosisSafeTxDetails(props: {
? order?.fulfillmentTime !== undefined
: enhancedTransaction?.confirmedTime !== undefined

// Check if its in a state where we dont need more signatures. We do this, because this state comes from CowSwap API, which
// Check if its in a state where we dont need more signatures. We do this, because this state comes from CoW Swap API, which
// sometimes can be faster getting the state than Gnosis Safe API (that would give us the pending signatures). We use
// this check to infer that we don't need to sign anything anymore
const alreadySigned = isOrder ? status !== ActivityStatus.PRESIGNATURE_PENDING : status !== ActivityStatus.PENDING
Expand Down
2 changes: 1 addition & 1 deletion src/custom/components/ErrorBoundary/ErrorBoundaryMod.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export default class ErrorBoundary extends React.Component<unknown, ErrorBoundar
<StyledTitle>
<Trans> Something went wrong</Trans>
</StyledTitle>
<img src={CowError} alt="CowSwap Error" height="125" />
<img src={CowError} alt="CoW Swap Error" height="125" />
</FlexContainer>
<AutoColumn gap={'md'}>
<CodeBlockWrapper>
Expand Down
8 changes: 4 additions & 4 deletions src/custom/components/OrderProgressBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export function OrderProgressBar(props: OrderProgressBarProps) {
<StatusGraph>
<img src={cowGraph} alt="Loading for a CoW..." />
<p>
<strong>CowSwap</strong> can save you gas costs and get a better price if another trader takes the
<strong>CoW Swap</strong> can save you gas costs and get a better price if another trader takes the
opposite side of your trade.
</p>
</StatusGraph>
Expand Down Expand Up @@ -161,7 +161,7 @@ export function OrderProgressBar(props: OrderProgressBarProps) {
alt="Finding the best price ..."
/>
<p>
<strong>CowSwap</strong> searches all on-chain liquidity sources to find you the best price.
<strong>CoW Swap</strong> searches all on-chain liquidity sources to find you the best price.
</p>
</StatusGraph>
</StatusMsgContainer>
Expand Down Expand Up @@ -228,7 +228,7 @@ export function OrderProgressBar(props: OrderProgressBarProps) {
Your price: $1300.55 (<span>+8%</span>)
</p>*/}
<p>
<strong>CowSwap</strong> won&apos;t charge you if the trade is reverted or if you cancel.
<strong>CoW Swap</strong> won&apos;t charge you if the trade is reverted or if you cancel.
</p>
</StatusGraph>
</StatusMsgContainer>
Expand Down Expand Up @@ -262,7 +262,7 @@ export function OrderProgressBar(props: OrderProgressBarProps) {
<StatusGraph>
<img src={cowMeditatingGraph} alt="Cow meditating ..." className="meditating-cow" />
<p>
<strong>CowSwap</strong> won&apos;t charge you if the trade is reverted or if you cancel.
<strong>CoW Swap</strong> won&apos;t charge you if the trade is reverted or if you cancel.
</p>
</StatusGraph>
</StatusMsgContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function FailedNetworkSwitchPopup({
<Trans>
{isUnsupportedNetwork
? `Please connect your wallet to one of the supported networks: Ethereum Mainnet or Gnosis Chain.`
: `Failed to switch networks from the CowSwap Interface. In order to use CowSwap on ${chainInfo.label}, you must change the network in your wallet.`}
: `Failed to switch networks from the CoW Swap Interface. In order to use CoW Swap on ${chainInfo.label}, you must change the network in your wallet.`}
</Trans>
</ThemedText.Body>
</AutoColumn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const BlockedToken = ({ onBack, onDismiss, blockedTokens }: BlockedTokenProps) =
<Icon />
<Content>
<Copy>
<Trans>This token is not supported in the Cowswap app</Trans>
<Trans>This token is not supported in the CoW Swap app</Trans>
</Copy>
<TokenImportCard token={blockedTokens[0]} />
<Button disabled>
Expand Down
4 changes: 2 additions & 2 deletions src/custom/components/SideBanner/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@ export default function SideBanner({ type }: BannerProps) {
<br />
of the ever evolving COW 🎉
</h3>
<img src={AnniversaryImage} height="162" alt="CowSwap evolving icons" />
<img src={AnniversaryImage} height="162" alt="CoW Swap evolving icons" />
<FooterContent>
<p>Share and be eligible for a celebratory NFT!</p>
<ExternalLink href={`https://twitter.com/intent/tweet?text=${ANNIVERSARY_TWEET_TEMPLATE}`}>
<button>
<StyledTwitterIcon src={TwitterImage} height="18" width="18" description="Share CowSwap on Twitter" />
<StyledTwitterIcon src={TwitterImage} height="18" width="18" description="Share CoW Swap on Twitter" />
Share on Twitter
</button>
</ExternalLink>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const useTargetLocale = (activeLocale: SupportedLocale) => {
}

// export function SwitchLocaleLink() {
export function SwitchLocaleLink({ label = 'CowSwap available in: ' }: { label?: string }) {
export function SwitchLocaleLink({ label = 'CoW Swap available in: ' }: { label?: string }) {
const activeLocale = useActiveLocale()
const targetLocale = useTargetLocale(activeLocale)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ export function TransactionSubmittedContent({
<ButtonCustom>
<InternalLink to={Routes.PLAY_COWRUNNER} onClick={onDismiss}>
<StyledIcon src={GameIcon} alt="Play CowGame" />
Play the Cow Runner Game!
Play the CoW Runner Game!
</InternalLink>
</ButtonCustom>
</ButtonGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/custom/components/swap/EthWethWrap/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export default function EthWethWrap({ account, native, nativeInput, wrapped, wra
<ModalMessage>
<span>
<Trans>
CowSwap is a gasless exchange. <strong>{nativeSymbol}</strong> however, is required for paying{' '}
CoW Swap is a gasless exchange. <strong>{nativeSymbol}</strong> however, is required for paying{' '}
<strong>
on-chain transaction costs associated with enabling tokens and the wrapping/unwrapping of{' '}
{nativeSymbol}/{wrappedSymbol}
Expand Down
2 changes: 1 addition & 1 deletion src/custom/components/swap/TradeSummary/RowFee.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { AMOUNT_PRECISION, FIAT_PRECISION } from 'constants/index'
import { LightGreyText } from 'pages/Swap'

export const GASLESS_FEE_TOOLTIP_MSG =
'On CowSwap you sign your order (hence no gas costs!). The fees are covering your gas costs already.'
'On CoW Swap you sign your order (hence no gas costs!). The fees are covering your gas costs already.'

export const PRESIGN_FEE_TOOLTIP_MSG =
'These fees cover the gas costs for executing the order once it has been placed. However - since you are using a smart contract wallet - you will need to pay the gas for signing an on-chain tx in order to place it.'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import styled from 'styled-components/macro'

const DEFAULT_DETAILS_TEXT = (
<div>
CowSwap does not support all tokens. Some tokens implement similar, but logically different ERC20 contract methods
CoW Swap does not support all tokens. Some tokens implement similar, but logically different ERC20 contract methods
which do not operate optimally with CoW Protocol.
<p>
For more information, please refer to the <HashLink to={UNSUPPORTED_TOKENS_FAQ_URL}>FAQ</HashLink>.
Expand Down
2 changes: 1 addition & 1 deletion src/custom/connectors/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export const portis = new PortisConnector({

export const walletlink = new WalletLinkConnector({
url: rpcNetworks[NETWORK_CHAIN_ID],
appName: 'CowSwap',
appName: 'CoW Swap',
appLogoUrl: 'https://raw.githubusercontent.com/cowprotocol/cowswap/develop/public/favicon.png',
supportedChainIds: getSupportedChainIds(),
})
Expand Down
2 changes: 1 addition & 1 deletion src/custom/constants/chains/chainsMod.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* List of all the networks supported by the CowSwap Interface
* List of all the networks supported by the CoW Swap Interface
*/

import { CHAIN_IDS_TO_NAMES as UNI_CHAIN_IDS_TO_NAMES } from '@src/constants/chains'
Expand Down
2 changes: 1 addition & 1 deletion src/custom/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const SHORT_LOAD_THRESHOLD = 500
export const LONG_LOAD_THRESHOLD = 2000

export const APP_DATA_HASH = getAppDataHash()
export const DEFAULT_APP_CODE = 'CowSwap'
export const DEFAULT_APP_CODE = 'CoW Swap'
export const SAFE_APP_CODE = `${DEFAULT_APP_CODE}-SafeApp`

export const PRODUCTION_URL = 'cowswap.exchange'
Expand Down
Loading

0 comments on commit 136cdfb

Please sign in to comment.