From 136cdfbca614d7a023784f7bd9b3d62048f47719 Mon Sep 17 00:00:00 2001 From: Anxo Rodriguez Date: Tue, 16 Aug 2022 16:44:23 +0200 Subject: [PATCH] Hotfix 1.20.2 :fire: (#926) * 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 * 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 Co-authored-by: dave Co-authored-by: nenadV91 --- CONTRIBUTING.md | 6 +-- README.md | 6 +-- package.json | 2 +- public/index.html | 19 +++---- public/manifest.json | 6 +-- src/assets/metadata/CowSwap-ENS.json | 7 --- src/assets/metadata/CowSwap-barn.json | 7 --- src/assets/metadata/CowSwap-development.json | 7 --- src/assets/metadata/CowSwap-local.json | 7 --- src/assets/metadata/CowSwap-pr.json | 7 --- src/assets/metadata/CowSwap-production.json | 7 --- src/assets/metadata/CowSwap-staging.json | 7 --- src/assets/metadata/ipfs_hashes.json | 44 ---------------- .../gnosisProtocol/errors/OperatorError.ts | 2 +- .../Transaction/ActivityDetails.tsx | 2 +- .../ErrorBoundary/ErrorBoundaryMod.tsx | 2 +- .../components/OrderProgressBar/index.tsx | 8 +-- .../Popups/FailedNetworkSwitchPopupMod.tsx | 2 +- .../BlockedToken/BlockedTokenMod.tsx | 2 +- src/custom/components/SideBanner/index.tsx | 4 +- .../SwitchLocaleLink/SwitchLocaleLinkMod.tsx | 2 +- .../TransactionConfirmationModal/index.tsx | 2 +- .../components/swap/EthWethWrap/index.tsx | 2 +- .../components/swap/TradeSummary/RowFee.tsx | 2 +- .../swap/UnsupportedCurrencyFooter/index.tsx | 2 +- src/custom/connectors/index.ts | 2 +- src/custom/constants/chains/chainsMod.ts | 2 +- src/custom/constants/index.ts | 2 +- src/custom/hooks/useErrorMessageAndModal.tsx | 2 +- .../useCurrencyLogoURIsMod.ts | 2 +- src/custom/pages/About/index.tsx | 18 +++---- src/custom/pages/Account/index.tsx | 4 +- .../pages/Claim/CanUserClaimMessage.tsx | 2 +- src/custom/pages/Faq/AffiliateFaq.tsx | 12 ++--- src/custom/pages/Faq/ProtocolFaq.tsx | 32 ++++++------ src/custom/pages/Faq/TokenFaq.tsx | 22 ++++---- src/custom/pages/Faq/TradingFaq.tsx | 46 ++++++++--------- src/custom/pages/Faq/index.tsx | 50 +++++++++---------- src/custom/pages/Swap/SwapMod.tsx | 4 +- .../TermsAndConditions/TermsAndConditions.md | 8 +-- .../error/AnySwapAffectedUsers/index.tsx | 2 +- src/custom/pages/games/CowRunner/index.tsx | 2 +- src/custom/pages/games/MevSlicer/index.tsx | 2 +- src/custom/state/swap/TradeGp.ts | 2 +- src/custom/theme/baseTheme.tsx | 2 +- src/custom/theme/cowSwapAssets.ts | 2 +- src/custom/tokens/goerli-token-list.json | 46 ++++++----------- src/custom/utils/analytics/otherEvents.ts | 2 +- src/custom/utils/deterministicHash.test.ts | 8 +-- src/service-worker.ts | 2 +- src/state/application/reducer.ts | 2 +- 51 files changed, 168 insertions(+), 276 deletions(-) delete mode 100644 src/assets/metadata/CowSwap-ENS.json delete mode 100644 src/assets/metadata/CowSwap-barn.json delete mode 100644 src/assets/metadata/CowSwap-development.json delete mode 100644 src/assets/metadata/CowSwap-local.json delete mode 100644 src/assets/metadata/CowSwap-pr.json delete mode 100644 src/assets/metadata/CowSwap-production.json delete mode 100644 src/assets/metadata/CowSwap-staging.json delete mode 100644 src/assets/metadata/ipfs_hashes.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df2ad2a156..08364611ae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -34,9 +34,9 @@ CI checks will run against all PRs. @@ -18,16 +18,16 @@ - + + content="CoW Swap finds the lowest prices from all decentralized exchanges and DEX aggregators & saves you more with p2p trading and protection from MEV"> - + @@ -53,12 +53,13 @@ }
- CowSwap Logo - + CoW Swap Logo +
    -
  • Home | CowSwap
    • +
  • Home | CoW Swap
  • Chat
  • Docs
  • Stats
    • diff --git a/public/manifest.json b/public/manifest.json index ca2a674aa3..f033b14d76 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -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": [ { @@ -19,8 +19,8 @@ } ], "orientation": "portrait", - "name": "CowSwap", - "short_name": "CowSwap", + "name": "CoW Swap", + "short_name": "CoW Swap", "start_url": ".", "theme_color": "#ff784a" } diff --git a/src/assets/metadata/CowSwap-ENS.json b/src/assets/metadata/CowSwap-ENS.json deleted file mode 100644 index 162c3f2deb..0000000000 --- a/src/assets/metadata/CowSwap-ENS.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "0.1.0", - "appCode": "CowSwap", - "metadata": { - "environment": "ens" - } -} diff --git a/src/assets/metadata/CowSwap-barn.json b/src/assets/metadata/CowSwap-barn.json deleted file mode 100644 index de92b61511..0000000000 --- a/src/assets/metadata/CowSwap-barn.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "0.1.0", - "appCode": "CowSwap", - "metadata": { - "environment": "barn" - } -} diff --git a/src/assets/metadata/CowSwap-development.json b/src/assets/metadata/CowSwap-development.json deleted file mode 100644 index 146dfac667..0000000000 --- a/src/assets/metadata/CowSwap-development.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "0.1.0", - "appCode": "CowSwap", - "metadata": { - "environment": "development" - } -} diff --git a/src/assets/metadata/CowSwap-local.json b/src/assets/metadata/CowSwap-local.json deleted file mode 100644 index 3a68ba80b7..0000000000 --- a/src/assets/metadata/CowSwap-local.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "0.1.0", - "appCode": "CowSwap", - "metadata": { - "environment": "local" - } -} diff --git a/src/assets/metadata/CowSwap-pr.json b/src/assets/metadata/CowSwap-pr.json deleted file mode 100644 index a95b407fb9..0000000000 --- a/src/assets/metadata/CowSwap-pr.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "0.1.0", - "appCode": "CowSwap", - "metadata": { - "environment": "pr" - } -} diff --git a/src/assets/metadata/CowSwap-production.json b/src/assets/metadata/CowSwap-production.json deleted file mode 100644 index 07fb825dce..0000000000 --- a/src/assets/metadata/CowSwap-production.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "0.1.0", - "appCode": "CowSwap", - "metadata": { - "environment": "production" - } -} diff --git a/src/assets/metadata/CowSwap-staging.json b/src/assets/metadata/CowSwap-staging.json deleted file mode 100644 index 962ac96ba6..0000000000 --- a/src/assets/metadata/CowSwap-staging.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "0.1.0", - "appCode": "CowSwap", - "metadata": { - "environment": "staging" - } -} diff --git a/src/assets/metadata/ipfs_hashes.json b/src/assets/metadata/ipfs_hashes.json deleted file mode 100644 index 4fedb1c834..0000000000 --- a/src/assets/metadata/ipfs_hashes.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "CowSwap: Production": { - "cid": "QmTDarZ47oek1miuRd8uuNCy5AFfjzQbWJ7348izx9N8wQ", - "digestHex": "0x487B02C558D729ABAF3ECF17881A4181E5BC2446429A0995142297E897B6EB37", - "cidInspector": "https://cid.ipfs.io/#QmTDarZ47oek1miuRd8uuNCy5AFfjzQbWJ7348izx9N8wQ", - "file": "https://cloudflare-ipfs.com/ipfs/QmTDarZ47oek1miuRd8uuNCy5AFfjzQbWJ7348izx9N8wQ" - }, - "CowSwap: ENS": { - "cid": "QmauXhxhGwgTeATMStK6vfB71Yb2tDaX5bFvYxPr5vCKQL", - "digestHex": "0xBAB87DF726E41C0941786CA710194982D753FBC140C6DC9951AC3450D8917699", - "cidInspector": "https://cid.ipfs.io/#QmauXhxhGwgTeATMStK6vfB71Yb2tDaX5bFvYxPr5vCKQL", - "file": "https://cloudflare-ipfs.com/ipfs/QmauXhxhGwgTeATMStK6vfB71Yb2tDaX5bFvYxPr5vCKQL" - }, - "CowSwap: Barn": { - "cid": "Qmdjs6Y7BvTKxwyPpJK7J34xESjZXiqMht2D2wUcbWvZcX", - "digestHex": "0xE4D1AB10F2C9FFE7BDD23C315B03F18CFF90888D6B2BB5022BACD46AB9CDDF24", - "cidInspector": "https://cid.ipfs.io/#Qmdjs6Y7BvTKxwyPpJK7J34xESjZXiqMht2D2wUcbWvZcX", - "file": "https://cloudflare-ipfs.com/ipfs/Qmdjs6Y7BvTKxwyPpJK7J34xESjZXiqMht2D2wUcbWvZcX" - }, - "CowSwap: Staging": { - "cid": "QmZ92rfrrt1Ya8PxLjznKN58BWNTEsMPe6Gj25cLuwGJs1", - "digestHex": "0xA076A100C2535DC6047C4C9940AE647D7DEAAC1729745117D19D4A63BC2F4D30", - "cidInspector": "https://cid.ipfs.io/#QmZ92rfrrt1Ya8PxLjznKN58BWNTEsMPe6Gj25cLuwGJs1", - "file": "https://cloudflare-ipfs.com/ipfs/QmZ92rfrrt1Ya8PxLjznKN58BWNTEsMPe6Gj25cLuwGJs1" - }, - "CowSwap: PR": { - "cid": "QmP8gfNGbkqJHyPCGaBfvH9aogU8hJKqg3r1SU5qVTH2Te", - "digestHex": "0x0BCAECDB9A1FDB3B207A7593EBF703836AD591D4E5E75DFDBF65E7B328F209CD", - "cidInspector": "https://cid.ipfs.io/#QmP8gfNGbkqJHyPCGaBfvH9aogU8hJKqg3r1SU5qVTH2Te", - "file": "https://cloudflare-ipfs.com/ipfs/QmP8gfNGbkqJHyPCGaBfvH9aogU8hJKqg3r1SU5qVTH2Te" - }, - "CowSwap: Development": { - "cid": "QmX89hgVfoCuuPDq5Yc74pG8RNg6LLYPbMWBwfRzzUwvKY", - "digestHex": "0x828569F802B7F8957F76996BDD875674821E41A688541A9E9EC97D5E897D44A7", - "cidInspector": "https://cid.ipfs.io/#QmX89hgVfoCuuPDq5Yc74pG8RNg6LLYPbMWBwfRzzUwvKY", - "file": "https://cloudflare-ipfs.com/ipfs/QmX89hgVfoCuuPDq5Yc74pG8RNg6LLYPbMWBwfRzzUwvKY" - }, - "CowSwap: Local": { - "cid": "QmZW5abzempvhyPvSMbLhnmZ6d6SEGgGQd3paaHRK7CSfm", - "digestHex": "0xA5DAE7A114F1BD6BB9B3FF976150380A95CB18856212DB555C25EF9D7801E9A4", - "cidInspector": "https://cid.ipfs.io/#QmZW5abzempvhyPvSMbLhnmZ6d6SEGgGQd3paaHRK7CSfm", - "file": "https://cloudflare-ipfs.com/ipfs/QmZW5abzempvhyPvSMbLhnmZ6d6SEGgGQd3paaHRK7CSfm" - } -} diff --git a/src/custom/api/gnosisProtocol/errors/OperatorError.ts b/src/custom/api/gnosisProtocol/errors/OperatorError.ts index 708e5bd175..4478dd9d65 100644 --- a/src/custom/api/gnosisProtocol/errors/OperatorError.ts +++ b/src/custom/api/gnosisProtocol/errors/OperatorError.ts @@ -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.', diff --git a/src/custom/components/AccountDetails/Transaction/ActivityDetails.tsx b/src/custom/components/AccountDetails/Transaction/ActivityDetails.tsx index b902640e80..ac1f80a11c 100644 --- a/src/custom/components/AccountDetails/Transaction/ActivityDetails.tsx +++ b/src/custom/components/AccountDetails/Transaction/ActivityDetails.tsx @@ -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 diff --git a/src/custom/components/ErrorBoundary/ErrorBoundaryMod.tsx b/src/custom/components/ErrorBoundary/ErrorBoundaryMod.tsx index 3728adf6ab..73f281c2af 100644 --- a/src/custom/components/ErrorBoundary/ErrorBoundaryMod.tsx +++ b/src/custom/components/ErrorBoundary/ErrorBoundaryMod.tsx @@ -208,7 +208,7 @@ export default class ErrorBoundary extends React.Component Something went wrong - CowSwap Error + CoW Swap Error diff --git a/src/custom/components/OrderProgressBar/index.tsx b/src/custom/components/OrderProgressBar/index.tsx index f5c9bbe7ef..ff8a87da34 100644 --- a/src/custom/components/OrderProgressBar/index.tsx +++ b/src/custom/components/OrderProgressBar/index.tsx @@ -132,7 +132,7 @@ export function OrderProgressBar(props: OrderProgressBarProps) { Loading for a CoW...

    - CowSwap can save you gas costs and get a better price if another trader takes the + CoW Swap can save you gas costs and get a better price if another trader takes the opposite side of your trade.

    @@ -161,7 +161,7 @@ export function OrderProgressBar(props: OrderProgressBarProps) { alt="Finding the best price ..." />

    - CowSwap searches all on-chain liquidity sources to find you the best price. + CoW Swap searches all on-chain liquidity sources to find you the best price.

    @@ -228,7 +228,7 @@ export function OrderProgressBar(props: OrderProgressBarProps) { Your price: $1300.55 (+8%)

    */}

    - CowSwap won't charge you if the trade is reverted or if you cancel. + CoW Swap won't charge you if the trade is reverted or if you cancel.

    @@ -262,7 +262,7 @@ export function OrderProgressBar(props: OrderProgressBarProps) { Cow meditating ...

    - CowSwap won't charge you if the trade is reverted or if you cancel. + CoW Swap won't charge you if the trade is reverted or if you cancel.

    diff --git a/src/custom/components/Popups/FailedNetworkSwitchPopupMod.tsx b/src/custom/components/Popups/FailedNetworkSwitchPopupMod.tsx index 5c835885e6..014d3c6ac1 100644 --- a/src/custom/components/Popups/FailedNetworkSwitchPopupMod.tsx +++ b/src/custom/components/Popups/FailedNetworkSwitchPopupMod.tsx @@ -33,7 +33,7 @@ export default function FailedNetworkSwitchPopup({ {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.`}     diff --git a/src/custom/components/SearchModal/BlockedToken/BlockedTokenMod.tsx b/src/custom/components/SearchModal/BlockedToken/BlockedTokenMod.tsx index 1d14c5533c..ccf636021d 100644 --- a/src/custom/components/SearchModal/BlockedToken/BlockedTokenMod.tsx +++ b/src/custom/components/SearchModal/BlockedToken/BlockedTokenMod.tsx @@ -63,7 +63,7 @@ const BlockedToken = ({ onBack, onDismiss, blockedTokens }: BlockedTokenProps) = - This token is not supported in the Cowswap app + This token is not supported in the CoW Swap app diff --git a/src/custom/components/SwitchLocaleLink/SwitchLocaleLinkMod.tsx b/src/custom/components/SwitchLocaleLink/SwitchLocaleLinkMod.tsx index 374885d0d6..be0ffccd81 100644 --- a/src/custom/components/SwitchLocaleLink/SwitchLocaleLinkMod.tsx +++ b/src/custom/components/SwitchLocaleLink/SwitchLocaleLinkMod.tsx @@ -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) diff --git a/src/custom/components/TransactionConfirmationModal/index.tsx b/src/custom/components/TransactionConfirmationModal/index.tsx index e15b5e5cfa..9766fef81e 100644 --- a/src/custom/components/TransactionConfirmationModal/index.tsx +++ b/src/custom/components/TransactionConfirmationModal/index.tsx @@ -575,7 +575,7 @@ export function TransactionSubmittedContent({ - Play the Cow Runner Game! + Play the CoW Runner Game! diff --git a/src/custom/components/swap/EthWethWrap/index.tsx b/src/custom/components/swap/EthWethWrap/index.tsx index de251cf458..52b8add32e 100644 --- a/src/custom/components/swap/EthWethWrap/index.tsx +++ b/src/custom/components/swap/EthWethWrap/index.tsx @@ -203,7 +203,7 @@ export default function EthWethWrap({ account, native, nativeInput, wrapped, wra - CowSwap is a gasless exchange. {nativeSymbol} however, is required for paying{' '} + CoW Swap is a gasless exchange. {nativeSymbol} however, is required for paying{' '} on-chain transaction costs associated with enabling tokens and the wrapping/unwrapping of{' '} {nativeSymbol}/{wrappedSymbol} diff --git a/src/custom/components/swap/TradeSummary/RowFee.tsx b/src/custom/components/swap/TradeSummary/RowFee.tsx index 5833d04fc0..567f51890a 100644 --- a/src/custom/components/swap/TradeSummary/RowFee.tsx +++ b/src/custom/components/swap/TradeSummary/RowFee.tsx @@ -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.' diff --git a/src/custom/components/swap/UnsupportedCurrencyFooter/index.tsx b/src/custom/components/swap/UnsupportedCurrencyFooter/index.tsx index 807a90ad99..7fd55fa5be 100644 --- a/src/custom/components/swap/UnsupportedCurrencyFooter/index.tsx +++ b/src/custom/components/swap/UnsupportedCurrencyFooter/index.tsx @@ -8,7 +8,7 @@ import styled from 'styled-components/macro' const DEFAULT_DETAILS_TEXT = (
    - 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.

    For more information, please refer to the FAQ. diff --git a/src/custom/connectors/index.ts b/src/custom/connectors/index.ts index 7162041dd1..34764ffaab 100644 --- a/src/custom/connectors/index.ts +++ b/src/custom/connectors/index.ts @@ -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(), }) diff --git a/src/custom/constants/chains/chainsMod.ts b/src/custom/constants/chains/chainsMod.ts index 6827360ea0..b564cf7969 100644 --- a/src/custom/constants/chains/chainsMod.ts +++ b/src/custom/constants/chains/chainsMod.ts @@ -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' diff --git a/src/custom/constants/index.ts b/src/custom/constants/index.ts index 06fe58a663..6205766cc1 100644 --- a/src/custom/constants/index.ts +++ b/src/custom/constants/index.ts @@ -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' diff --git a/src/custom/hooks/useErrorMessageAndModal.tsx b/src/custom/hooks/useErrorMessageAndModal.tsx index f00a269812..f51a9e5778 100644 --- a/src/custom/hooks/useErrorMessageAndModal.tsx +++ b/src/custom/hooks/useErrorMessageAndModal.tsx @@ -3,7 +3,7 @@ import { ErrorMessageProps, SwapCallbackError } from 'components/swap/styleds' import useTransactionErrorModal from './useTransactionErrorModal' /** - * @description hook for getting CowSwap error and handling them visually + * @description hook for getting CoW Swap error and handling them visually * @description ErrorMessage component accepts an error message to override exported error state, and a close option * @returns returns object: { error, setError, ErrorMessage } => error message, error message setter, and our ErrorMessage component */ diff --git a/src/custom/lib/hooks/useCurrencyLogoURIs/useCurrencyLogoURIsMod.ts b/src/custom/lib/hooks/useCurrencyLogoURIs/useCurrencyLogoURIsMod.ts index adce461232..d2a7b37991 100644 --- a/src/custom/lib/hooks/useCurrencyLogoURIs/useCurrencyLogoURIsMod.ts +++ b/src/custom/lib/hooks/useCurrencyLogoURIs/useCurrencyLogoURIsMod.ts @@ -57,7 +57,7 @@ export default function useCurrencyLogoURIs(currency?: Currency | null): string[ return useMemo(() => { const logoURIs = [...locations] if (currency) { - // mod: CowSwap Native buy orders have address set to EeeEE... rather than `isNative` flag + // mod: CoW Swap Native buy orders have address set to EeeEE... rather than `isNative` flag if (currency.isNative || currency.address === NATIVE_CURRENCY_BUY_ADDRESS) { logoURIs.push(getNativeLogoURI(currency.chainId)) } else if (currency.isToken) { diff --git a/src/custom/pages/About/index.tsx b/src/custom/pages/About/index.tsx index 35f06c4b32..1c5c463913 100644 --- a/src/custom/pages/About/index.tsx +++ b/src/custom/pages/About/index.tsx @@ -31,7 +31,7 @@ export default function About() { About -

    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. @@ -41,12 +41,12 @@ export default function About() {

    - CowSwap vs. AMM's + CoW Swap vs. AMM's

    Every time you and another trader each hold an asset the other wants, your trade is settled directly without using an AMM (Automated Market Maker) and therefore without incurring any slippage + fees. Only amounts that - can't be settled with other CowSwap traders are sent to the underlying AMMs. + can't be settled with other CoW Swap traders are sent to the underlying AMMs.

    This economic phenomenon is known as Coincidence Of Wants (CoW). @@ -54,18 +54,18 @@ export default function About() {

    Gas Free Transactions

    - CowSwap - Gas Free Transactions + CoW Swap - Gas Free Transactions

    - Gas costs are accounted for in your sell token already - no gas costs need to be paid! CowSwap uses an + Gas costs are accounted for in your sell token already - no gas costs need to be paid! CoW Swap uses an off-chain design for submitting trades:

    1. -

      You sign a trade message which is submitted to CowSwap’s off-chain service

      +

      You sign a trade message which is submitted to CoW Swap’s off-chain service

    2. -

      CowSwap's off-chain service optimizes your trade's execution by considering:

      +

      CoW Swap's off-chain service optimizes your trade's execution by considering:

      • Coincidence Of Wants

        @@ -90,7 +90,7 @@ export default function About() {

        Maximum Extractable Value (MEV)

        - CowSwap - Maximum Extractable Value + CoW Swap - Maximum Extractable Value

        Heard about Maximum Extractable Value yet? It's scary. To date more than{' '} @@ -98,7 +98,7 @@ export default function About() { bots frontrunning transactions, exploiting the slippage users allow in a trade.

        - CowSwap is the first DEX Aggregator offering some protection against it: COWs enable tight slippages and can + CoW Swap is the first DEX Aggregator offering some protection against it: COWs enable tight slippages and can even avoid settlement on AMMs altogether.

        diff --git a/src/custom/pages/Account/index.tsx b/src/custom/pages/Account/index.tsx index 77b6f6e7bc..2077ed4eb7 100644 --- a/src/custom/pages/Account/index.tsx +++ b/src/custom/pages/Account/index.tsx @@ -91,7 +91,7 @@ export default function Profile() { // Locked GNO balance const { loading: isLockedGnoLoading, ...lockedGnoBalances } = useCowFromLockedGnoBalances() - // Cow balance + // CoW balance const cow = useTokenBalance(account || undefined, chainId ? COW[chainId] : undefined) // vCow balance values @@ -349,7 +349,7 @@ export default function Profile() { CoW forum ↗ - + )} diff --git a/src/custom/pages/Claim/CanUserClaimMessage.tsx b/src/custom/pages/Claim/CanUserClaimMessage.tsx index 8068dcf15d..33f4f44f6c 100644 --- a/src/custom/pages/Claim/CanUserClaimMessage.tsx +++ b/src/custom/pages/Claim/CanUserClaimMessage.tsx @@ -37,7 +37,7 @@ export default function CanUserClaimMessage({

        - Thank you for being a supporter of CowSwap and the CoW protocol. As an important member of the CowSwap + Thank you for being a supporter of CoW Swap and the CoW protocol. As an important member of the CoW Swap Community you may claim vCOW to be used for voting and governance. You can claim your tokens until{' '} {formatDateWithTimezone(airdropDeadline)}. diff --git a/src/custom/pages/Faq/AffiliateFaq.tsx b/src/custom/pages/Faq/AffiliateFaq.tsx index 1360dbe4e9..1113d83753 100644 --- a/src/custom/pages/Faq/AffiliateFaq.tsx +++ b/src/custom/pages/Faq/AffiliateFaq.tsx @@ -47,12 +47,12 @@ export default function AffiliateFaq() {

        - CowSwap's positive network effect scales exponentially with more people using it, therefore, the + CoW Swap's positive network effect scales exponentially with more people using it, therefore, the affiliate program aims to acknowledge which users are contributing more to the success of the protocol.{' '}

        - We now briefly explain CowSwap’s positive network effect. CowSwap's name comes from the economic + We now briefly explain CoW Swap’s positive network effect. CoW Swap's name comes from the economic phenomenon "Coincidence of Wants", where users' orders can be matched with each other to obtain better prices. When the protocol finds a CoW, trades are directly settled among traders, which allows saving on slippage, gas, and LP fees. The network effect of CoWs increases alongside with the number of @@ -70,13 +70,13 @@ export default function AffiliateFaq() {

        - Everyone! Please share the excitement for the CowSwap protocol & dapp. It would really make a difference for - the Cow-mmunity if you share it with your friends, Twitter/YouTube followers, or anyone that would be + Everyone! Please share the excitement for the CoW Swap protocol & dapp. It would really make a difference + for the CoWmunity if you share it with your friends, Twitter/YouTube followers, or anyone that would be interested.

        - Share your referral link with all your friends if you think they can be interested in the qualities Cowswap + Share your referral link with all your friends if you think they can be interested in the qualities CoW Swap has to offer. These qualities range from ETH-less trading experience, MEV protection, no fees for failed transactions, and more.{' '} @@ -85,7 +85,7 @@ export default function AffiliateFaq() {

        - Note that trades and volume will only be credited to your wallet if the user has not traded in CowSwap with + Note that trades and volume will only be credited to your wallet if the user has not traded in CoW Swap with that address before, and their first trade is done after following your link.

        diff --git a/src/custom/pages/Faq/ProtocolFaq.tsx b/src/custom/pages/Faq/ProtocolFaq.tsx index 407b6c0810..a9917248ae 100644 --- a/src/custom/pages/Faq/ProtocolFaq.tsx +++ b/src/custom/pages/Faq/ProtocolFaq.tsx @@ -17,7 +17,7 @@ export default function ProtocolFaq() {

        Protocol

        -

        What is CowSwap’s fee model?

        +

        What is CoW Swap’s fee model?

        Each executed order has a fee which is captured by the protocol. Part of the fee is paid to solvers (entities which provide order settlement solutions) to incentivize their participation. @@ -37,34 +37,34 @@ export default function ProtocolFaq() {

        - How does CowSwap connect to all on-chain liquidity? + How does CoW Swap connect to all on-chain liquidity?

        -

        CowSwap can connect to all on-chain liquidity.

        +

        CoW Swap can connect to all on-chain liquidity.

        - When CowSwap does not have enough CoWs (Coincidence of Wants) among the orders available for a batch, it + When CoW Swap does not have enough CoWs (Coincidence of Wants) among the orders available for a batch, it taps other AMMs’ liquidity to be able to settle the traders’ orders. CoW Protocol can be connected to any on-chain liquidity sources and can therefore enjoy the benefits of concentrating the fragmented liquidity across decentralized finance.

        - How is CowSwap able to offer better prices? + How is CoW Swap able to offer better prices?

        - Before using on-chain liquidity, CowSwap tries to find CoWs (Coincidences of Wants) within the set of + Before using on-chain liquidity, CoW Swap tries to find CoWs (Coincidences of Wants) within the set of currently valid orders and match them directly with one another. CoWs result in better prices because no fee - is paid to the liquidity provider (e.g., 0.3% for Uniswap v2). In the case that CowSwap does not have CoWs, + is paid to the liquidity provider (e.g., 0.3% for Uniswap v2). In the case that CoW Swap does not have CoWs, it taps into the DEX that gives the next best price. This results in the same or better performance than existing DEX aggregators.

        How can I become a liquidity provider?

        - CowSwap does not have liquidity providers. Instead, it connects to all on-chain liquidity that is provided + CoW Swap does not have liquidity providers. Instead, it connects to all on-chain liquidity that is provided across different protocols. Since orders only incur a cost if traded, active market makers can observe the orderbook and place counter orders (creating a CoW) to prevent settling trades via external liquidity.

        Why is my wallet not supported?

        - CowSwap uses offline signatures to offer gasless orders. Additionally, Smart Contract (SC) wallets are + CoW Swap uses offline signatures to offer gasless orders. Additionally, Smart Contract (SC) wallets are supported through an alternative signing method called{' '} pre-sign.

        @@ -79,7 +79,7 @@ export default function ProtocolFaq() {

        Are Smart Contract wallets supported?

        - Yes! Any Smart Contract (be it a wallet or regular contract) can trade in CowSwap by using one signing + Yes! Any Smart Contract (be it a wallet or regular contract) can trade in CoW Swap by using one signing method called pre-sign.

        @@ -112,23 +112,23 @@ export default function ProtocolFaq() {

        1. To become a solver, an Ethereum address needs to deposit a bond in the form of tokens. Asset type and - amounts are pending to be defined by the CowDAO. + amounts are pending to be defined by the CoW DAO.
        2. - Once the tokens have been staked (locked up), CowDAO must vote to approve or reject the Ethereum address + Once the tokens have been staked (locked up), CoW DAO must vote to approve or reject the Ethereum address that will identify the solver. If the vote is successful, the solver Ethereum address will be included in the allowlist (verification) solvers contract.
        3. Additionally, a solver must have the technical knowledge to create the appropriate batch settlement - solutions, or take the risk of being slashed by the CowDAO for wrongdoing. + solutions, or take the risk of being slashed by the CoW DAO for wrongdoing.

        - What interactions can I encounter when using CowSwap? + What interactions can I encounter when using CoW Swap?

        - CowSwap Operations + CoW Swap Operations

        @@ -205,7 +205,7 @@ export default function ProtocolFaq() {

        Submit order (Sign order)
        Signature of a gasless off-chain order. You define your limit price and expiration date. The order will - try to be executed using MEV protection against different on-chain liquidity sources or other CowSwap + try to be executed using MEV protection against different on-chain liquidity sources or other CoW Swap users trading in the same block.

        diff --git a/src/custom/pages/Faq/TokenFaq.tsx b/src/custom/pages/Faq/TokenFaq.tsx index 69e8c86667..7c3dddaa03 100644 --- a/src/custom/pages/Faq/TokenFaq.tsx +++ b/src/custom/pages/Faq/TokenFaq.tsx @@ -18,7 +18,7 @@ export default function TokenFaq() {

        Token

        -

        Does CowSwap have a token?

        +

        Does CoW Swap have a token?

        Yes,{' '} @@ -28,8 +28,8 @@ export default function TokenFaq() {

        At launch the token will be a pure virtual token for governance. This implies that the token will not be - transferable. The token entitles its holders with voting rights in the CowDAO. It is up to CowDAO to vote on - whether making the token transferable complies with applicable laws. + transferable. The token entitles its holders with voting rights in the CoW DAO. It is up to CoW DAO to vote + on whether making the token transferable complies with applicable laws.

        The token's main purpose is to govern and curate essential infrastructure components of the CoW @@ -44,7 +44,7 @@ export default function TokenFaq() {

        Yes! A CoWmunity member created a{' '} - CoWDAO Proposal + CoW DAO Proposal {' '} on the forum.

        @@ -53,7 +53,7 @@ export default function TokenFaq() {

        {' '} - Directly in the CowSwap UI. Simply click on the account menu item at the + Directly in the CoW Swap UI. Simply click on the account menu item at the top left of the page (desktop) or in the mobile menu. You then will be redirected to the{' '} account page where you can see your total COW and/or vCOW balance. You will then be able to convert your vCOW to COW (if applicable). @@ -61,13 +61,13 @@ export default function TokenFaq() {

        What is the purpose of COW Token?

        - The COW token will entitle its holders to voting rights within the CowDAO. The main purpose of CowDAO is to - govern and curate essential infrastructure components of the CoW Protocol ecosystem, including: + The COW token will entitle its holders to voting rights within the CoW DAO. The main purpose of CoW DAO is + to govern and curate essential infrastructure components of the CoW Protocol ecosystem, including:

        • - System Parameters: CowDAO will be in charge of all system parameters such as the + System Parameters: CoW DAO will be in charge of all system parameters such as the objective function for solution scoring and solver slashing conditions.
        • @@ -95,9 +95,9 @@ export default function TokenFaq() {

          • - CoW POAP: Awarded POAPs from the testing sessions, Batch challenges, CowStars or user - research sessions. Not all are equally valuable. Some that are most special are the ones for our - CowStars and User Test Participants. Note that we say “awarded” and not “owns”, since we know that there + CoW POAP: Awarded POAPs from the testing sessions, Batch challenges, CoW Stars or user + research sessions. Not all are equally valuable. Some that are most special are the ones for our CoW + Stars and User Test Participants. Note that we say “awarded” and not “owns”, since we know that there have been secondary markets for these POAPS. We only took awardees into consideration.
          • diff --git a/src/custom/pages/Faq/TradingFaq.tsx b/src/custom/pages/Faq/TradingFaq.tsx index 349cf662b9..f08d03baf4 100644 --- a/src/custom/pages/Faq/TradingFaq.tsx +++ b/src/custom/pages/Faq/TradingFaq.tsx @@ -18,11 +18,11 @@ export default function TokenFaq() {

            Trading

            -

            What types of orders does CowSwap support?

            +

            What types of orders does CoW Swap support?

            At the moment, only limit sell and buy orders (fill-or-kill) are enabled.

            -

            What token pairs does CowSwap allow you to trade?

            +

            What token pairs does CoW Swap allow you to trade?

            Any valid ERC20 token pair that does not apply transfer fees, and for which there is some basic liquidity on @@ -30,20 +30,20 @@ export default function TokenFaq() {

            - What token pairs does CowSwap NOT allow you to trade? + What token pairs does CoW Swap NOT allow you to trade?

            - Unfortunately, CowSwap does not support some tokens. While these tokens implement the typical ERC20 + Unfortunately, CoW Swap does not support some tokens. While these tokens implement the typical ERC20 interface, when calling the transfer and transferFrom methods, the actual amount the receiver will get will - be smaller than the specified sent amount. This causes problems with CowSwap's settlement logic which + be smaller than the specified sent amount. This causes problems with CoW Swap's settlement logic which expects the received amount (e.g., from a Uniswap interaction) to be fully transferable to the trader.

            -

            Why is CowSwap able to offer gas-free trades?

            +

            Why is CoW Swap able to offer gas-free trades?

            - CowSwap is able to offer gas-free trades because the orders are submitted off-chain via signed messages. + CoW Swap is able to offer gas-free trades because the orders are submitted off-chain via signed messages. Once you approve your funds for spending on the dapp, you can submit orders via signed messages that contain the trade’s details, such as limit price, amount, timestamp, and so on.

            @@ -51,9 +51,9 @@ export default function TokenFaq() {

            Do I need ETH to trade?

            - For the trade itself you do not need to hold ETH. Although, in order to be able to trade on CowSwap, you + For the trade itself you do not need to hold ETH. Although, in order to be able to trade on CoW Swap, you first need to approve your funds for spending on the dapp*. For that action, you need ETH to - pay for gas fees. Once you have done this, ETH is no longer required as CowSwap charges the fee from the + pay for gas fees. Once you have done this, ETH is no longer required as CoW Swap charges the fee from the sell token.

            @@ -67,23 +67,23 @@ export default function TokenFaq() {

            - How does a trader submit a valid order in CowSwap? + How does a trader submit a valid order in CoW Swap?

            -

            In order for a trader to submit a valid order to CowSwap, they must do the following steps:

            +

            In order for a trader to submit a valid order to CoW Swap, they must do the following steps:

            1. - Approve the CowSwap smart contract to spend the token on your behalf. By executing this smart contract + Approve the CoW Swap smart contract to spend the token on your behalf. By executing this smart contract interaction you are approving the contract to withdraw the funds from your wallet once the trade you have signed has been filled in a batch auction.
            2. Once the approval has been mined, the next step is to sign a meta-tx in which you will see the parameters - of the order you are about to place in the CowSwap interface. After that, there is nothing else to do. + of the order you are about to place in the CoW Swap interface. After that, there is nothing else to do.
            3. - Once the order is executed, you will see a notification in the CowSwap UI and hear a confirming “Moo” + Once the order is executed, you will see a notification in the CoW Swap UI and hear a confirming “Moo” sound.
            @@ -105,7 +105,7 @@ export default function TokenFaq() {

            Alternatively, there is the so-called hard cancellation, which allows to cancel an order on-chain. This is - not currently supported by the CowSwap web interface, and you would need to pay for the gas of the on-chain + not currently supported by the CoW Swap web interface, and you would need to pay for the gas of the on-chain cancellation. For more information, check the Smart Contract implementation.

            @@ -154,7 +154,7 @@ export default function TokenFaq() { route an order is matched against without requiring the user to submit a new order.

            -

            Can I buy and sell ETH in CowSwap?

            +

            Can I buy and sell ETH in CoW Swap?

            Yes, you can directly place buy and sell orders for ETH. Before the actual order is placed, the UI will @@ -164,7 +164,7 @@ export default function TokenFaq() {

            Why is selling ETH more troublesome?

            - CowSwap only operates with ERC20 tokens. ETH is the native Ethereum currency, which is not an ERC20 token. + CoW Swap only operates with ERC20 tokens. ETH is the native Ethereum currency, which is not an ERC20 token.

            @@ -176,18 +176,18 @@ export default function TokenFaq() {

            You can withdraw your ETH from the WETH contract at any time, and this is called unwrapping WETH.

            - Wrapping and unwrapping ETH are simple Ethereum transactions not related to CowSwap, meaning gas costs for + Wrapping and unwrapping ETH are simple Ethereum transactions not related to CoW Swap, meaning gas costs for executing the transactions are involved.

            - Although CowSwap does not allow you to sell ETH directly, it will assist you with the wrapping/unwrapping, + Although CoW Swap does not allow you to sell ETH directly, it will assist you with the wrapping/unwrapping, so you can easily handle ETH/WETH, as needed.

            - While ETH cannot be sold directly, it is possible to directly buy ETH. This is because CowSwap allows you to - buy WETH and will directly unwrap it for you. + While ETH cannot be sold directly, it is possible to directly buy ETH. This is because CoW Swap allows you + to buy WETH and will directly unwrap it for you.

            {/* @@ -195,7 +195,7 @@ export default function TokenFaq() {
            • - **How can I cancel an order that I placed on CowSwap? Canceling an order in CowSwap can be done in two + **How can I cancel an order that I placed on CoW Swap? Canceling an order in CoW Swap can be done in two different ways:
            @@ -207,7 +207,7 @@ export default function TokenFaq() {
          • - Calling the CowSwap contract to register onchain that you want to cancel a specific order. In this case the + Calling the CoW Swap contract to register onchain that you want to cancel a specific order. In this case the cancellation does have a cost as the onchain interaction requires gas fees
            • diff --git a/src/custom/pages/Faq/index.tsx b/src/custom/pages/Faq/index.tsx index f8b26b9297..0eaa0c1e64 100644 --- a/src/custom/pages/Faq/index.tsx +++ b/src/custom/pages/Faq/index.tsx @@ -38,7 +38,7 @@ export function Footer() { {' '}

            - We really hope you like CowSwap. If you do, Milk it! + We really hope you like CoW Swap. If you do, Milk it! 🥛 @@ -57,16 +57,16 @@ export default function Faq() {

            General

            -

            What is CowSwap?

            -

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

            +

            What is CoW Swap?

            +

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

            - CowSwap is a Meta DEX aggregator that allows you to buy and sell tokens using gasless orders that are + CoW Swap is a Meta DEX aggregator that allows you to buy and sell tokens using gasless orders that are settled peer-to-peer among its users, or into any on-chain liquidity source while providing MEV protection.

            -

            What makes CowSwap a "Meta" DEX aggregator?

            +

            What makes CoW Swap a "Meta" DEX aggregator?

            - Cowswap is built on top of the CoW Protocol which matches trades via batch auctions for a variety of + CoW Swap is built on top of the CoW Protocol which matches trades via batch auctions for a variety of on-chain liquidity sources.

            @@ -103,29 +103,29 @@ export default function Faq() {

            Coincidence of Wants (CoWs) can be explained as “an economic phenomenon where two parties each hold an item the other wants, so they exchange these items - directly.” CowSwap facilitates CoWs among traders and their orders through using batch auctions as a core + directly.” CoW Swap facilitates CoWs among traders and their orders through using batch auctions as a core mechanism.

            - This means, on CowSwap, when two traders each hold an asset the other wants, a trade can be settled directly - between them without an external market maker or liquidity provider. This leads to better prices for the - individual traders (because traditionally market makers add a fee — referred to as spread — for their - service). + This means, on CoW Swap, when two traders each hold an asset the other wants, a trade can be settled + directly between them without an external market maker or liquidity provider. This leads to better prices + for the individual traders (because traditionally market makers add a fee — referred to as spread — for + their service).

            - CowSwap allows for coincidence of wants (CoWs) orders to be traded directly against one another. Only the - excess order amounts that cannot be settled directly with other CowSwap traders are sent to the underlying + CoW Swap allows for coincidence of wants (CoWs) orders to be traded directly against one another. Only the + excess order amounts that cannot be settled directly with other CoW Swap traders are sent to the underlying AMMs (automated market makers).

            - How am I protected from MEV (Arbitrage, Front running, Sandwiching) with CowSwap? + How am I protected from MEV (Arbitrage, Front running, Sandwiching) with CoW Swap?

            - CowSwap leverages batch auctions with uniform clearing prices for all trades in the same batch. Because of + CoW Swap leverages batch auctions with uniform clearing prices for all trades in the same batch. Because of the uniform clearing price, there is no need for ordering the transactions within a single batch. Because everyone receives the same price across assets it's not possible for any value to be extracted by placing transactions in a certain order. This prevents the primary strategy used in MEV. @@ -145,18 +145,18 @@ export default function Faq() { protocols, such as Uniswap.

            -

            How does CowSwap determine prices?

            +

            How does CoW Swap determine prices?

            - CowSwap settles batch auctions in discrete time intervals. In the absence of other traders, CowSwap matches - traders against the best available on-chain liquidity (note: currently the solvers have integrated liquidity - from Uni v2, Uni v3, Balancer, Balancer v2, Sushiswap and the liquidity that Aggregators such as Paraswap, - Matcha and 1inch leverage). + CoW Swap settles batch auctions in discrete time intervals. In the absence of other traders, CoW Swap + matches traders against the best available on-chain liquidity (note: currently the solvers have integrated + liquidity from Uni v2, Uni v3, Balancer, Balancer v2, Sushiswap and the liquidity that Aggregators such as + Paraswap, Matcha and 1inch leverage).

            If CoWs (Coincidence of Wants) orders exist in a batch, the “smaller” order is matched fully with the larger - order. The excess of the larger order is settled with the best available base liquidity CowSwap integrates + order. The excess of the larger order is settled with the best available base liquidity CoW Swap integrates with, which is, for now, Uniswap. The clearing price for both orders will be the price of the token with the excess amount on external liquidity sources to which the protocol is connected.

            @@ -166,17 +166,17 @@ export default function Faq() { decentralized competition.

            -

            Is CowSwap secure to use?

            +

            Is CoW Swap secure to use?

            - As of August 11th, 2021, CowSwap is no longer in alpha and moves to a final, stable version. The underlying + As of August 11th, 2021, CoW Swap is no longer in alpha and moves to a final, stable version. The underlying CoW Protocol Smart contracts have been upgraded to integrate tightly with Balancer v2.

            - With this upgrade, CowSwap evolves into its most stable, performant form: the code has been thoroughly and + With this upgrade, CoW Swap evolves into its most stable, performant form: the code has been thoroughly and carefully tested, peer-reviewed and fully audited. - Whilst CowSwap has taken a major step forward in terms of security and stability, as with other crypto + Whilst CoW Swap has taken a major step forward in terms of security and stability, as with other crypto protocols or dapps, your use is at your own risk.{' '} Please review our{' '} diff --git a/src/custom/pages/Swap/SwapMod.tsx b/src/custom/pages/Swap/SwapMod.tsx index 7605c27ac6..d582989851 100644 --- a/src/custom/pages/Swap/SwapMod.tsx +++ b/src/custom/pages/Swap/SwapMod.tsx @@ -899,7 +899,7 @@ export default function Swap({ {approvalState === ApprovalState.APPROVED || signatureState === UseERC20PermitState.SIGNED ? ( You can now trade {currencies[Field.INPUT]?.symbol} ) : ( - Allow CowSwap to use your {currencies[Field.INPUT]?.symbol} + Allow CoW Swap to use your {currencies[Field.INPUT]?.symbol} )} {approvalState === ApprovalState.PENDING ? ( @@ -1012,7 +1012,7 @@ export default function Swap({ showDetailsText="Read more about unsupported wallets" detailsText={ <> -

            CowSwap requires offline signatures, which is currently not supported by some wallets.

            +

            CoW Swap requires offline signatures, which is currently not supported by some wallets.

            Read more in the FAQ.

            diff --git a/src/custom/pages/TermsAndConditions/TermsAndConditions.md b/src/custom/pages/TermsAndConditions/TermsAndConditions.md index 63130833d0..0b46c0b400 100644 --- a/src/custom/pages/TermsAndConditions/TermsAndConditions.md +++ b/src/custom/pages/TermsAndConditions/TermsAndConditions.md @@ -1,4 +1,4 @@ -**CowSwap Terms & Conditions** +**CoW Swap Terms & Conditions** Last updated: August 2021 @@ -8,7 +8,7 @@ Please read these Terms carefully before using our Platform. By using our Platfo **1. WHO WE ARE AND HOW TO CONTACT US** -1. CowSwap is operated by GnosisDAO (”**we**” or “**us**”). We are an +1. CoW Swap is operated by GnosisDAO (”**we**” or “**us**”). We are an Ethereum based organisation managed by community members. To contact us, please write to us via the GnosisDAO subcategory of forum.gnosis.io. @@ -82,9 +82,9 @@ Please read these Terms carefully before using our Platform. By using our Platfo **5. FEES** -Cowswap does not levy any fees on users of the Platform, however the +CoW Swap does not levy any fees on users of the Platform, however the user incurs a fee on the Protocol level, which is shown to the user on -the Cowswap interface when the user places their trade. +the CoW Swap interface when the user places their trade. **6. WE MAY MAKE CHANGES TO OR SUSPEND OR WITHDRAW OUR PLATFORM** diff --git a/src/custom/pages/error/AnySwapAffectedUsers/index.tsx b/src/custom/pages/error/AnySwapAffectedUsers/index.tsx index 0694633fe9..daccaae78a 100644 --- a/src/custom/pages/error/AnySwapAffectedUsers/index.tsx +++ b/src/custom/pages/error/AnySwapAffectedUsers/index.tsx @@ -76,7 +76,7 @@ export default function AnySwapAffectedUsers() { Your account is affected by the AnySwap Hack - CowSwap 404 not found + CoW Swap 404 not found

            Read how to prevent losing funds

            diff --git a/src/custom/pages/games/CowRunner/index.tsx b/src/custom/pages/games/CowRunner/index.tsx index 6d6eb441dc..9f9f119be9 100644 --- a/src/custom/pages/games/CowRunner/index.tsx +++ b/src/custom/pages/games/CowRunner/index.tsx @@ -32,7 +32,7 @@ const Wrapper = styled(Page)` export default function CowRunnerPage() { useEffect(() => { - gameAnalytics('Cow Runner') + gameAnalytics('CoW Runner') }, []) return ( diff --git a/src/custom/pages/games/MevSlicer/index.tsx b/src/custom/pages/games/MevSlicer/index.tsx index dd1ca0ca00..52ecc7fc01 100644 --- a/src/custom/pages/games/MevSlicer/index.tsx +++ b/src/custom/pages/games/MevSlicer/index.tsx @@ -48,7 +48,7 @@ function openGame() { export default function MevSlicer() { return ( -

            This Cow doesn't run away any more! Not from MEV!

            +

            This CoW doesn't run away any more! Not from MEV!

            Now is the time to take some action! -{' '} diff --git a/src/custom/state/swap/TradeGp.ts b/src/custom/state/swap/TradeGp.ts index 5aded8fdf4..3cfdeb2071 100644 --- a/src/custom/state/swap/TradeGp.ts +++ b/src/custom/state/swap/TradeGp.ts @@ -102,7 +102,7 @@ export default class TradeGp { readonly executionPrice: Price /** - * The id returned by CowSwap's quote backend, if any + * The id returned by CoW Swap's quote backend, if any * * Note that it won't be set for fast quotes, nor for quotes from other sources (paraswap, 0x, etc) */ diff --git a/src/custom/theme/baseTheme.tsx b/src/custom/theme/baseTheme.tsx index b9b2734e81..52a609a886 100644 --- a/src/custom/theme/baseTheme.tsx +++ b/src/custom/theme/baseTheme.tsx @@ -124,7 +124,7 @@ export function themeVariables(darkMode: boolean, colorsTheme: Colors) { }, logo: { src: `data:image/svg+xml;base64,${cowSwapLogo(darkMode)}`, - alt: 'CowSwap Logo', + alt: 'CoW Swap Logo', width: '137px', height: '44px', }, diff --git a/src/custom/theme/cowSwapAssets.ts b/src/custom/theme/cowSwapAssets.ts index 66c59c7a7f..a0f7020f3e 100644 --- a/src/custom/theme/cowSwapAssets.ts +++ b/src/custom/theme/cowSwapAssets.ts @@ -367,7 +367,7 @@ export function cowSwapLogo(darkMode: boolean): string { ` // Please note, this Light Mode logo is using a different blue from the branding kit. - // Instead it uses #152943 to adapt to the existing CowSwap theme colors. + // Instead it uses #152943 to adapt to the existing CoW Swap theme colors. const lightModeLogo = ` diff --git a/src/custom/tokens/goerli-token-list.json b/src/custom/tokens/goerli-token-list.json index 79ceee962c..81bbf80772 100644 --- a/src/custom/tokens/goerli-token-list.json +++ b/src/custom/tokens/goerli-token-list.json @@ -14,7 +14,7 @@ "chainId": 5, "symbol": "GNO", "decimals": 18, - "address": "0x02abbdbaaa7b1bb64b5c878f7ac17f8dda169532", + "address": "0x02ABBDbAaa7b1BB64B5c878f7ac17f8DDa169532", "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x6810e776880C02933D47DB1b9fc05908e5386b96/logo.png" }, { @@ -25,20 +25,12 @@ "address": "0x3430d04E42a722c5Ae52C5Bffbf1F230C2677600", "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xDEf1CA1fb7FBcDC777520aa7f396b4E015F497aB/logo.png" }, - { - "name": "USDT", - "chainId": 5, - "symbol": "USDT", - "decimals": 6, - "address": "0xe583769738b6dd4e7caf8451050d1948be717679", - "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png" - }, { "name": "USD Coin", "chainId": 5, "symbol": "USDC", "decimals": 6, - "address": "0x5ddba296458986e462ba4aeb4dddc00fadc9c43b", + "address": "0xD87Ba7A50B2E7E660f678A895E4B72E7CB4CCd9C", "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png" }, { @@ -46,40 +38,32 @@ "chainId": 5, "symbol": "DAI", "decimals": 18, - "address": "0x5c221e77624690fff6dd741493d735a17716c26b", + "address": "0xdc31Ee1784292379Fbb2964b3B9C4124D8F89C60", "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png" }, { - "name": "wBTC", - "chainId": 5, - "symbol": "wBTC", - "decimals": 8, - "address": "0xca063a2ab07491ee991dcecb456d1265f842b568", - "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png" - }, - { - "name": "Liquid staked Ether 2.0", + "name": "0x", "chainId": 5, - "symbol": "stETH", + "symbol": "ZRX", "decimals": 18, - "address": "0x1643e812ae58766192cf7d2cf9567df2c37e9b7f", - "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84/logo.png" + "address": "0xe4E81Fa6B16327D4B78CFEB83AAdE04bA7075165", + "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xE41d2489571d322189246DaFA5ebDe1F4699F498/logo.png" }, { - "name": "Wrapped Ether", + "name": "Basic Attention Token", "chainId": 5, - "symbol": "WETH", + "symbol": "BAT", "decimals": 18, - "address": "0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6", - "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png" + "address": "0x70cBa46d2e933030E2f274AE58c951C800548AeF", + "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x0D8775F648430679A709E98d2b0Cb6250d2887EF/logo.png" }, { - "name": "Chainlink", + "name": "Polymath Network", "chainId": 5, - "symbol": "LINK", + "symbol": "POLY", "decimals": 18, - "address": "0x63bfb2118771bd0da7a6936667a7bb705a06c1ba", - "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x514910771AF9Ca656af840dff83E8264EcF986CA/logo.png" + "address": "0x9e32c0EfF886B6Ccae99350Fd5e7002dCED55F15", + "logoURI": "https://assets.coingecko.com/coins/images/2784/thumb/inKkF01.png?1605007034" } ] } diff --git a/src/custom/utils/analytics/otherEvents.ts b/src/custom/utils/analytics/otherEvents.ts index 91cc56c726..28a687655e 100644 --- a/src/custom/utils/analytics/otherEvents.ts +++ b/src/custom/utils/analytics/otherEvents.ts @@ -1,7 +1,7 @@ import { Category, reportEvent } from './index' import { detectExplorer } from 'utils/explorer' -type GameType = 'Cow Runner' | 'MEV Slicer' +type GameType = 'CoW Runner' | 'MEV Slicer' export function gameAnalytics(gameType: GameType) { reportEvent({ category: Category.GAMES, diff --git a/src/custom/utils/deterministicHash.test.ts b/src/custom/utils/deterministicHash.test.ts index 16d882418e..558c169bec 100644 --- a/src/custom/utils/deterministicHash.test.ts +++ b/src/custom/utils/deterministicHash.test.ts @@ -4,7 +4,7 @@ describe('deterministicHash', () => { it('correctly generates the sha256 of an object', () => { const doc = { version: '1.0.0', - appCode: 'CowSwap', + appCode: 'CoW Swap', metadata: { referrer: { kind: 'referrer', @@ -14,12 +14,12 @@ describe('deterministicHash', () => { }, } - expect(deterministicHash(doc)).toBe('0xd5f44c18e6cc2e16023dcd145710208339bb26f6c52df20d1c2f49f3f31c7014') + expect(deterministicHash(doc)).toBe('0xb2fd9de6391637033411986be9ff8549a3902456d2517cd9c5acad427b332fdb') }) it('always generates the same sha256 of an object no matter the order of the properties', () => { const doc1 = { version: '1.0.0', - appCode: 'CowSwap', + appCode: 'CoW Swap', metadata: { referrer: { kind: 'referrer', @@ -29,7 +29,7 @@ describe('deterministicHash', () => { }, } const doc2 = { - appCode: 'CowSwap', + appCode: 'CoW Swap', version: '1.0.0', metadata: { referrer: { diff --git a/src/service-worker.ts b/src/service-worker.ts index 04d10a232c..00dd8707fd 100644 --- a/src/service-worker.ts +++ b/src/service-worker.ts @@ -16,7 +16,7 @@ console.log(`[worker] registerRoutes for v${WEB_VERSION}`) // Set Cache name // See https://dev.to/atonchev/flawless-and-silent-upgrade-of-the-service-worker-2o95 setCacheNameDetails({ - prefix: 'CowSwap', + prefix: 'CoW Swap', suffix: WEB_VERSION, }) diff --git a/src/state/application/reducer.ts b/src/state/application/reducer.ts index 9703abde9a..c519692d1a 100644 --- a/src/state/application/reducer.ts +++ b/src/state/application/reducer.ts @@ -55,7 +55,7 @@ export enum ApplicationModal { NETWORK_SELECTOR, PRIVACY_POLICY, ARBITRUM_OPTIONS, - // ----------------- MOD: CowSwap specific modals -------------------- + // ----------------- MOD: CoW Swap specific modals -------------------- TRANSACTION_CONFIRMATION, TRANSACTION_ERROR, COW_SUBSIDY,