diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx index 7bb018d17e..e0418ffa7c 100644 --- a/packages/website/ts/index.tsx +++ b/packages/website/ts/index.tsx @@ -25,6 +25,7 @@ import { Next0xInstant } from 'ts/pages/instant'; import { NextLanding } from 'ts/pages/landing'; import { NextLaunchKit } from 'ts/pages/launch_kit'; import { NextMarketMaker } from 'ts/pages/market_maker'; +import { VotePlaceholder } from 'ts/pages/vote_placeholder'; import { NextWhy } from 'ts/pages/why'; // Check if we've introduced an update that requires us to clear the tradeHistory local storage entries @@ -113,6 +114,7 @@ render( + ( + + +
+ + + Come back on February 18th to vote + + + 0x is conducting a vote on ZEIP-23, which adds the ability to trade bundles of ERC-20 and ERC-721 + tokens via the 0x protocol. Integrating ZEIP-23 requires a modification to the protocol’s smart + contract pipeline, which has access to live digital assets. All ZRX token holders have the right to + vote on this improvement proposal. + + + + + +
+
+); + +const LinkWrap = styled.div` + display: inline-flex; + margin-top: 60px; + + a + a { + margin-left: 60px; + } +`; diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index 081c6d0144..669b54fbb8 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -379,6 +379,7 @@ export enum WebsitePaths { AssetBuyer = '/docs/asset-buyer', Migrations = '/docs/migrations', Careers = '/careers', + Vote = '/vote', } export enum DocPackages { diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index 03c1a0b83c..5b7668736b 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -78,6 +78,7 @@ export const constants = { URL_DISCOURSE_FORUM: 'https://forum.0x.org', URL_ECOSYSTEM_APPLY: 'https://0x.smapply.io/', URL_ECOSYSTEM_BLOG_POST: 'https://blog.0xproject.com/announcing-the-0x-ecosystem-acceleration-program-89d1cb89d565', + URL_VOTE_BLOG_POST: 'https://blog.0xproject.com/zeip-23-trade-bundles-of-assets-fe69eb3ed960', URL_FIREFOX_U2F_ADDON: 'https://addons.mozilla.org/en-US/firefox/addon/u2f-support-add-on/', URL_TESTNET_FAUCET: 'https://faucet.0x.org', URL_GITHUB_ORG: 'https://github.com/0xProject', diff --git a/yarn.lock b/yarn.lock index b4aae4b0af..c1f53d3f95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -587,6 +587,19 @@ ethers "~4.0.4" lodash "^4.17.11" +"@0x/web3-wrapper@^4.0.1": + version "4.0.2" + resolved "https://registry.npmjs.org/@0x/web3-wrapper/-/web3-wrapper-4.0.2.tgz#d4e0a4fa1217155e1aed4cd91086654fd99f2959" + dependencies: + "@0x/assert" "^2.0.2" + "@0x/json-schemas" "^3.0.2" + "@0x/typescript-typings" "^4.0.0" + "@0x/utils" "^4.0.3" + ethereum-types "^2.0.0" + ethereumjs-util "^5.1.1" + ethers "~4.0.4" + lodash "^4.17.11" + "@0xproject/npm-cli-login@^0.0.11": version "0.0.11" resolved "https://registry.yarnpkg.com/@0xproject/npm-cli-login/-/npm-cli-login-0.0.11.tgz#3f1ec06112ce62aad300ff0575358f68aeecde2e" @@ -13518,6 +13531,8 @@ react-highlight@0xproject/react-highlight#react-peer-deps: dependencies: highlight.js "^9.11.0" highlightjs-solidity "^1.0.5" + react "^16.4.2" + react-dom "^16.4.2" react-hot-loader@^4.3.3: version "4.3.4"