Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/website/instant-configurator

9 files changed, 16 insertions, 16 deletions

diff --git a/packages/website/translations/chinese.json b/packages/website/translations/chinese.json
index eb88b43d0..2b1f2a3f5 100644
--- a/packages/website/translations/chinese.json
+++ b/packages/website/translations/chinese.json
@@ -76,9 +76,9 @@
     "STANDARD_RELAYER_API": "中继方标准API",
     "PORTAL_DAPP": "去中心化应用门户",
     "WEBSITE": "网站",
-    "DEVELOPERS": "首页",
-    "HOME": "Rocket.chat",
-    "ROCKETCHAT": "开发人员",
+    "DEVELOPERS": "开发人员",
+    "HOME": "首页",
+    "DISCORD": "discord chat",
     "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",
diff --git a/packages/website/translations/english.json b/packages/website/translations/english.json
index 5fba7a0ff..b2799e264 100644
--- a/packages/website/translations/english.json
+++ b/packages/website/translations/english.json
@@ -81,7 +81,7 @@
     "WEBSITE": "website",
     "DEVELOPERS": "developers",
     "HOME": "home",
-    "ROCKETCHAT": "rocket.chat",
+    "DISCORD": "discord chat",
     "TRADE_CALL_TO_ACTION": "trade on 0x",
     "BUILD_A_RELAYER": "build a relayer",
     "BUILD_A_RELAYER_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
diff --git a/packages/website/translations/korean.json b/packages/website/translations/korean.json
index e3ce74676..61c431a5a 100644
--- a/packages/website/translations/korean.json
+++ b/packages/website/translations/korean.json
@@ -77,7 +77,7 @@
     "PORTAL_DAPP": "포털 dApp",
     "WEBSITE": "Website",
     "HOME": "홈",
-    "ROCKETCHAT": "Rocket.chat",
+    "DISCORD": "discord chat",
     "DEVELOPERS": "개발자",
     "BUILD_A_RELAYER": "build a relayer",
     "BUILD_A_RELAYER_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
diff --git a/packages/website/translations/russian.json b/packages/website/translations/russian.json
index c74fb5e32..3180d4a8e 100644
--- a/packages/website/translations/russian.json
+++ b/packages/website/translations/russian.json
@@ -76,9 +76,9 @@
     "STANDARD_RELAYER_API": "standard relayer API",
     "PORTAL_DAPP": "DApp-портал",
     "WEBSITE": "Веб-сайт",
-    "DEVELOPERS": "Домашняя страница",
-    "HOME": "Rocket.chat",
-    "ROCKETCHAT": "Для разработчиков",
+    "DEVELOPERS": "Для разработчиков",
+    "HOME": "Домашняя страница",
+    "DISCORD": "discord chat",
     "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",
diff --git a/packages/website/translations/spanish.json b/packages/website/translations/spanish.json
index e29db711b..c23bd609b 100644
--- a/packages/website/translations/spanish.json
+++ b/packages/website/translations/spanish.json
@@ -77,9 +77,9 @@
     "STANDARD_RELAYER_API": "API de transmisión estándar",
     "PORTAL_DAPP": "portal dApp",
     "WEBSITE": "website",
-    "DEVELOPERS": "inicio",
-    "HOME": "rocket.chat",
-    "ROCKETCHAT": "desarrolladores",
+    "DEVELOPERS": "desarrolladores",
+    "HOME": "inicio",
+    "DISCORD": "discord chat",
     "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",
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index e10005a0a..57071ee29 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -71,7 +71,7 @@ export class Footer extends React.Component<FooterProps, FooterState> {
             ],
             [Key.Community]: [
                 {
-                    title: this.props.translate.get(Key.RocketChat, Deco.Cap),
+                    title: this.props.translate.get(Key.Discord, Deco.Cap),
                     to: constants.URL_ZEROEX_CHAT,
                     shouldOpenInNewTab: true,
                 },
@@ -177,7 +177,7 @@ export class Footer extends React.Component<FooterProps, FooterState> {
     }
     private _renderMenuItem(link: ALink): React.ReactNode {
         const titleToIcon: { [title: string]: string } = {
-            [this.props.translate.get(Key.RocketChat, Deco.Cap)]: 'rocketchat.png',
+            [this.props.translate.get(Key.Discord, Deco.Cap)]: 'rocketchat.png',
             [this.props.translate.get(Key.Blog, Deco.Cap)]: 'medium.png',
             Twitter: 'twitter.png',
             Reddit: 'reddit.png',
diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx
index 10d91bae8..c4965e61c 100644
--- a/packages/website/ts/pages/faq/faq.tsx
+++ b/packages/website/ts/pages/faq/faq.tsx
@@ -379,7 +379,7 @@ const sections: FAQSection[] = [
                     <div>
                         Join our{' '}
                         <a href={constants.URL_ZEROEX_CHAT} target="_blank">
-                            Rocket.chat
+                            Discord
                         </a>! As an open source project, 0x will rely on a worldwide community of passionate developers
                         to contribute proposals, ideas and code.
                     </div>
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 9c4b8a018..d2914dbfe 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -463,7 +463,7 @@ export enum Key {
     Website = 'WEBSITE',
     Developers = 'DEVELOPERS',
     Home = 'HOME',
-    RocketChat = 'ROCKETCHAT',
+    Discord = 'DISCORD',
     TradeCallToAction = 'TRADE_CALL_TO_ACTION',
     OurMissionAndValues = 'OUR_MISSION_AND_VALUES',
     BuildARelayer = 'BUILD_A_RELAYER',
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index e9afc8763..6597d51b4 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -3,7 +3,7 @@ import { BigNumber } from '@0x/utils';
 import { Key, WebsitePaths } from 'ts/types';
 
 const URL_FORUM = 'https://forum.0xproject.com';
-const URL_ZEROEX_CHAT = 'https://chat.0xproject.com';
+const URL_ZEROEX_CHAT = 'https://discord.gg/d3FTX3M';
 
 export const constants = {
     DECIMAL_PLACES_ETH: 18,