Merge development

11 files changed, 29 insertions, 27 deletions

diff --git a/packages/website/package.json b/packages/website/package.json
index bb97ea4e8..af43fabf9 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/website",
-    "version": "0.0.63",
+    "version": "0.0.64",
     "engines": {
         "node": ">=6.12"
     },
@@ -20,23 +20,23 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0x/asset-buyer": "^3.0.4",
-        "@0x/contract-addresses": "^2.0.0",
-        "@0x/contract-wrappers": "^4.1.1",
-        "@0x/json-schemas": "^2.1.2",
-        "@0x/order-utils": "^3.0.4",
-        "@0x/react-docs": "^1.0.20",
-        "@0x/react-shared": "^1.0.23",
-        "@0x/subproviders": "^2.1.6",
-        "@0x/types": "^1.3.0",
+        "@0x/asset-buyer": "^3.0.5",
+        "@0x/contract-addresses": "^2.1.0",
+        "@0x/contract-wrappers": "^4.2.0",
+        "@0x/json-schemas": "^2.1.5",
+        "@0x/order-utils": "^3.1.0",
+        "@0x/react-docs": "^1.0.23",
+        "@0x/react-shared": "^1.1.0",
+        "@0x/subproviders": "^2.1.9",
+        "@0x/types": "^1.5.0",
         "@0x/typescript-typings": "^3.0.4",
-        "@0x/utils": "^2.0.6",
-        "@0x/web3-wrapper": "^3.1.6",
+        "@0x/utils": "^2.1.1",
+        "@0x/web3-wrapper": "^3.2.2",
         "@reach/dialog": "^0.1.2",
         "@types/react-lazyload": "^2.3.1",
         "@types/react-loadable": "^5.4.2",
         "@types/react-syntax-highlighter": "^0.0.8",
-        "@types/styled-components": "^4.1.1",
+        "@types/styled-components": "4.1.1",
         "accounting": "^0.4.1",
         "basscss": "^8.0.3",
         "blockies": "^0.0.2",
diff --git a/packages/website/translations/chinese.json b/packages/website/translations/chinese.json
index b99a3cdcb..88193a181 100644
--- a/packages/website/translations/chinese.json
+++ b/packages/website/translations/chinese.json
@@ -83,7 +83,7 @@
     "BUILD_A_RELAYER": "build a relayer",
     "BUILD_A_RELAYER_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
     "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
-    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications on top of Ethereum",
     "ORDER_BASICS": "Make & take orders",
     "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
     "USE_NETWORKED_LIQUIDITY": "use networked liquidity",
diff --git a/packages/website/translations/english.json b/packages/website/translations/english.json
index 2914ffead..a1d8ecc43 100644
--- a/packages/website/translations/english.json
+++ b/packages/website/translations/english.json
@@ -87,7 +87,7 @@
     "BUILD_A_RELAYER": "build a relayer",
     "BUILD_A_RELAYER_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
     "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
-    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications on top of Ethereum",
     "ORDER_BASICS": "Make & take orders",
     "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
     "USE_NETWORKED_LIQUIDITY": "use networked liquidity",
diff --git a/packages/website/translations/korean.json b/packages/website/translations/korean.json
index a421ffb94..539b81470 100644
--- a/packages/website/translations/korean.json
+++ b/packages/website/translations/korean.json
@@ -83,7 +83,7 @@
     "BUILD_A_RELAYER": "build a relayer",
     "BUILD_A_RELAYER_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
     "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
-    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications on top of Ethereum",
     "ORDER_BASICS": "Make & take orders",
     "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
     "USE_NETWORKED_LIQUIDITY": "use networked liquidity",
diff --git a/packages/website/translations/russian.json b/packages/website/translations/russian.json
index b3ea29cf3..feb5df02e 100644
--- a/packages/website/translations/russian.json
+++ b/packages/website/translations/russian.json
@@ -83,7 +83,7 @@
     "BUILD_A_RELAYER": "build a relayer",
     "BUILD_A_RELAYER_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
     "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
-    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications on top of Ethereum",
     "ORDER_BASICS": "Make & take orders",
     "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
     "USE_NETWORKED_LIQUIDITY": "use networked liquidity",
diff --git a/packages/website/translations/spanish.json b/packages/website/translations/spanish.json
index db75312c5..f4762a67e 100644
--- a/packages/website/translations/spanish.json
+++ b/packages/website/translations/spanish.json
@@ -84,7 +84,7 @@
     "BUILD_A_RELAYER": "build a relayer",
     "BUILD_A_RELAYER_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
     "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
-    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn more about building applications on top of Ethereum",
     "ORDER_BASICS": "Make & take orders",
     "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
     "USE_NETWORKED_LIQUIDITY": "use networked liquidity",
diff --git a/packages/website/ts/components/documentation/sidebar_header.tsx b/packages/website/ts/components/documentation/sidebar_header.tsx
index 0ab24ab5e..d158ab926 100644
--- a/packages/website/ts/components/documentation/sidebar_header.tsx
+++ b/packages/website/ts/components/documentation/sidebar_header.tsx
@@ -24,7 +24,7 @@ export const SidebarHeader: React.StatelessComponent<SidebarHeaderProps> = ({
     return (
         <Container>
             <Container className="flex justify-bottom">
-                <Container className="col col-7 pl1">
+                <Container className="col col-8 pl1">
                     <Text
                         fontColor={colors.lightLinkBlue}
                         fontSize={screenWidth === ScreenWidths.Sm ? '20px' : '22px'}
@@ -37,7 +37,7 @@ export const SidebarHeader: React.StatelessComponent<SidebarHeaderProps> = ({
                 {!_.isUndefined(docsVersion) &&
                     !_.isUndefined(availableDocVersions) &&
                     !_.isUndefined(onVersionSelected) && (
-                        <div className="col col-5 pl1" style={{ alignSelf: 'flex-end', paddingBottom: 4 }}>
+                        <div className="col col-4 pl1" style={{ alignSelf: 'flex-end', paddingBottom: 4 }}>
                             <Container className="right">
                                 <VersionDropDown
                                     selectedVersion={docsVersion}
diff --git a/packages/website/ts/components/modals/modal_contact.tsx b/packages/website/ts/components/modals/modal_contact.tsx
index a3a1f13f5..7414df7d9 100644
--- a/packages/website/ts/components/modals/modal_contact.tsx
+++ b/packages/website/ts/components/modals/modal_contact.tsx
@@ -12,6 +12,7 @@ import { Icon } from 'ts/components/icon';
 import { Input, InputWidth } from 'ts/components/modals/input';
 import { Heading, Paragraph } from 'ts/components/text';
 import { GlobalStyle } from 'ts/constants/globalStyle';
+import { utils } from 'ts/utils/utils';
 
 export enum ModalContactType {
     General = 'GENERAL',
@@ -279,7 +280,7 @@ export class ModalContact extends React.Component<Props> {
         try {
             // Disabling no-unbound method b/c no reason for _.isEmpty to be bound
             // tslint:disable:no-unbound-method
-            const response = await fetch(`https://website-api.0xproject.com${endpoint}`, {
+            const response = await fetch(`${utils.getBackendBaseUrl()}${endpoint}`, {
                 method: 'post',
                 mode: 'cors',
                 credentials: 'same-origin',
diff --git a/packages/website/ts/components/newsletter_form.tsx b/packages/website/ts/components/newsletter_form.tsx
index 4a7abb7ec..bd61e3f4d 100644
--- a/packages/website/ts/components/newsletter_form.tsx
+++ b/packages/website/ts/components/newsletter_form.tsx
@@ -4,6 +4,7 @@ import styled, { withTheme } from 'styled-components';
 import { ThemeValuesInterface } from 'ts/components/siteWrap';
 import { colors } from 'ts/style/colors';
 import { errorReporter } from 'ts/utils/error_reporter';
+import { utils } from 'ts/utils/utils';
 
 interface FormProps {
     theme: ThemeValuesInterface;
@@ -92,7 +93,7 @@ class Form extends React.Component<FormProps> {
         }
 
         try {
-            await fetch('https://website-api.0x.org/newsletter_subscriber/substack', {
+            await fetch(`${utils.getBackendBaseUrl()}/newsletter_subscriber/substack`, {
                 method: 'post',
                 mode: 'cors',
                 headers: {
diff --git a/packages/website/ts/pages/documentation/developers_page.tsx b/packages/website/ts/pages/documentation/developers_page.tsx
index fcca2b6ad..78376a0f2 100644
--- a/packages/website/ts/pages/documentation/developers_page.tsx
+++ b/packages/website/ts/pages/documentation/developers_page.tsx
@@ -153,7 +153,7 @@ export class DevelopersPage extends React.Component<DevelopersPageProps, Develop
                 <Container className="flex mx-auto" height="100vh">
                     <Container
                         className="sm-hide xs-hide relative"
-                        width={234}
+                        width={270}
                         paddingLeft={22}
                         paddingRight={22}
                         paddingTop={0}
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index fab382b07..7cc854ca0 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -5,8 +5,8 @@ const INFURA_API_KEY = 'T5WSC8cautR4KXyYgsRs';
 
 export const configs = {
     AMOUNT_DISPLAY_PRECSION: 5,
-    BACKEND_BASE_PROD_URL: 'https://website-api.0xproject.com',
-    BACKEND_BASE_STAGING_URL: 'https://staging-website-api.0xproject.com',
+    BACKEND_BASE_PROD_URL: 'https://website-api.0x.org',
+    BACKEND_BASE_STAGING_URL: 'https://staging-website-api.0x.org',
     BASE_URL,
     BITLY_ACCESS_TOKEN: 'ffc4c1a31e5143848fb7c523b39f91b9b213d208',
     DEFAULT_DERIVATION_PATH: `44'/60'/0'`,
@@ -39,8 +39,8 @@ export const configs = {
     ] as OutdatedWrappedEtherByNetworkId[],
     // The order matters. We first try first node and only then fall back to others.
     PUBLIC_NODE_URLS_BY_NETWORK_ID: {
-        [1]: [`https://mainnet.infura.io/${INFURA_API_KEY}`, 'https://mainnet.0xproject.com'],
-        [42]: [`https://kovan.infura.io/${INFURA_API_KEY}`, 'https://kovan.0xproject.com'],
+        [1]: [`https://mainnet.infura.io/${INFURA_API_KEY}`, 'https://mainnet.0x.org'],
+        [42]: [`https://kovan.infura.io/${INFURA_API_KEY}`, 'https://kovan.0x.org'],
         [3]: [`https://ropsten.infura.io/${INFURA_API_KEY}`],
         [4]: [`https://rinkeby.infura.io/${INFURA_API_KEY}`],
     } as PublicNodeUrlsByNetworkId,