From d6c5e48d7ecadc882138279a558e6b50e0edf3d2 Mon Sep 17 00:00:00 2001
From: Krzysztof Bialoglowicz <krzysztof@mirumee.com>
Date: Thu, 17 Oct 2019 12:24:36 +0200
Subject: [PATCH] Move events translation enum to component

---
 src/misc.ts                                   | 55 -------------------
 .../WebhookEvents/WebhookEvents.tsx           | 33 ++++++++++-
 2 files changed, 31 insertions(+), 57 deletions(-)

diff --git a/src/misc.ts b/src/misc.ts
index 460127a08..4217de160 100644
--- a/src/misc.ts
+++ b/src/misc.ts
@@ -334,61 +334,6 @@ export const translatedTaxRates = (intl: IntlShape) => ({
   [TaxRateType.WATER]: intl.formatMessage(taxRatesMessages.water)
 });
 
-const webhooksEventMessages = defineMessages({
-  anyEvents: {
-    defaultMessage: "Any events",
-    description: "event"
-  },
-  customerCreated: {
-    defaultMessage: "Customer created",
-    description: "event"
-  },
-  orderCancelled: {
-    defaultMessage: "Order cancelled",
-    description: "event"
-  },
-  orderCreated: {
-    defaultMessage: "Order created",
-    description: "event"
-  },
-  orderFullyPaid: {
-    defaultMessage: "Order fully paid",
-    description: "event"
-  },
-  orderUpdated: {
-    defaultMessage: "Order updated",
-    description: "event"
-  },
-  productCreated: {
-    defaultMessage: "Product created",
-    description: "event"
-  }
-});
-
-export const translatedWebhookEvents = (intl: IntlShape) => ({
-  [WebhookEventTypeEnum.ANY_EVENTS]: intl.formatMessage(
-    webhooksEventMessages.anyEvents
-  ),
-  [WebhookEventTypeEnum.CUSTOMER_CREATED]: intl.formatMessage(
-    webhooksEventMessages.customerCreated
-  ),
-  [WebhookEventTypeEnum.ORDER_CANCELLED]: intl.formatMessage(
-    webhooksEventMessages.orderCancelled
-  ),
-  [WebhookEventTypeEnum.ORDER_CREATED]: intl.formatMessage(
-    webhooksEventMessages.orderCreated
-  ),
-  [WebhookEventTypeEnum.ORDER_FULLY_PAID]: intl.formatMessage(
-    webhooksEventMessages.orderFullyPaid
-  ),
-  [WebhookEventTypeEnum.ORDER_UPDATED]: intl.formatMessage(
-    webhooksEventMessages.orderUpdated
-  ),
-  [WebhookEventTypeEnum.PRODUCT_CREATED]: intl.formatMessage(
-    webhooksEventMessages.productCreated
-  )
-});
-
 export const authorizationKeyTypes = {
   [AuthorizationKeyType.FACEBOOK]: "Facebook",
   [AuthorizationKeyType.GOOGLE_OAUTH2]: "Google OAuth2"
diff --git a/src/webhooks/components/WebhookEvents/WebhookEvents.tsx b/src/webhooks/components/WebhookEvents/WebhookEvents.tsx
index 110907a32..3473fe947 100644
--- a/src/webhooks/components/WebhookEvents/WebhookEvents.tsx
+++ b/src/webhooks/components/WebhookEvents/WebhookEvents.tsx
@@ -5,7 +5,6 @@ import CardTitle from "@saleor/components/CardTitle";
 import ControlledCheckbox from "@saleor/components/ControlledCheckbox";
 import Hr from "@saleor/components/Hr";
 import { ChangeEvent } from "@saleor/hooks/useForm";
-import { translatedWebhookEvents } from "@saleor/misc";
 import { WebhookEventTypeEnum } from "@saleor/types/globalTypes";
 import React from "react";
 import { useIntl } from "react-intl";
@@ -26,7 +25,37 @@ const WebhookEvents: React.StatelessComponent<WebhookEventsProps> = ({
 }) => {
   const intl = useIntl();
   const eventsEnum = Object.values(WebhookEventTypeEnum);
-  const translatedEvents = translatedWebhookEvents(intl);
+
+  const translatedEvents = {
+    [WebhookEventTypeEnum.ANY_EVENTS]: intl.formatMessage({
+      defaultMessage: "Any events",
+      description: "event"
+    }),
+    [WebhookEventTypeEnum.CUSTOMER_CREATED]: intl.formatMessage({
+      defaultMessage: "Customer created",
+      description: "event"
+    }),
+    [WebhookEventTypeEnum.ORDER_CANCELLED]: intl.formatMessage({
+      defaultMessage: "Order cancelled",
+      description: "event"
+    }),
+    [WebhookEventTypeEnum.ORDER_CREATED]: intl.formatMessage({
+      defaultMessage: "Order created",
+      description: "event"
+    }),
+    [WebhookEventTypeEnum.ORDER_FULLY_PAID]: intl.formatMessage({
+      defaultMessage: "Order fully paid",
+      description: "event"
+    }),
+    [WebhookEventTypeEnum.ORDER_UPDATED]: intl.formatMessage({
+      defaultMessage: "Order updated",
+      description: "event"
+    }),
+    [WebhookEventTypeEnum.PRODUCT_CREATED]: intl.formatMessage({
+      defaultMessage: "Product created",
+      description: "event"
+    })
+  };
 
   const handleAllEventsChange = (event: ChangeEvent) =>
     onChange(event, () =>