Merge pull request #1489 from 0xProject/fix/website/0x-org-endpoints

[website] Audit and fix 0x.org migration URLs

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',

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: {

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,