From 7e7650eeaecf3d53a57cc7dd9e4a478821512c09 Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Mon, 9 Dec 2019 15:57:32 -0600
Subject: [PATCH] Bugfixes (#105)

* Make KYC field mandatory

* Fix tip jar names

* adjust tip jar language
---
 .../client/components/Settings/Account/TipJarAddress.tsx    | 4 ++--
 .../client/components/Settings/Account/TipJarViewKey.tsx    | 6 +++---
 frontend/client/modules/create/utils.ts                     | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/frontend/client/components/Settings/Account/TipJarAddress.tsx b/frontend/client/components/Settings/Account/TipJarAddress.tsx
index cb4a4193..68e494d4 100644
--- a/frontend/client/components/Settings/Account/TipJarAddress.tsx
+++ b/frontend/client/components/Settings/Account/TipJarAddress.tsx
@@ -74,7 +74,7 @@ export default class TipJarAddress extends React.Component<Props, State> {
 
     return (
       <Form className="RefundAddress" layout="vertical" onSubmit={this.handleSubmit}>
-        <Form.Item label="Tip jar address" validateStatus={status} help={help}>
+        <Form.Item label="Tip address" validateStatus={status} help={help}>
           <Input
             value={tipJarAddress || ''}
             placeholder="Z address"
@@ -97,7 +97,7 @@ export default class TipJarAddress extends React.Component<Props, State> {
           loading={isSaving}
           block
         >
-          Change tip jar address
+          Change tip address
         </Button>
       </Form>
     );
diff --git a/frontend/client/components/Settings/Account/TipJarViewKey.tsx b/frontend/client/components/Settings/Account/TipJarViewKey.tsx
index 7a9ca3f4..1b44cf9c 100644
--- a/frontend/client/components/Settings/Account/TipJarViewKey.tsx
+++ b/frontend/client/components/Settings/Account/TipJarViewKey.tsx
@@ -64,10 +64,10 @@ export default class TipJarViewKey extends React.Component<Props, State> {
 
     return (
       <Form className="RefundAddress" layout="vertical" onSubmit={this.handleSubmit}>
-        <Form.Item label="Tip jar view key">
+        <Form.Item label="Tip view key">
           <Input
             value={tipJarViewKey || ''}
-            placeholder="A view key for your tip jar address (optional)"
+            placeholder="A view key for your tip address (optional)"
             onChange={this.handleChange}
             disabled={viewKeyDisabled || isFetching || isSaving || errorFetching}
           />
@@ -87,7 +87,7 @@ export default class TipJarViewKey extends React.Component<Props, State> {
           loading={isSaving}
           block
         >
-          Change tip jar view key
+          Change tip view key
         </Button>
       </Form>
     );
diff --git a/frontend/client/modules/create/utils.ts b/frontend/client/modules/create/utils.ts
index 7ef8b394..5995982b 100644
--- a/frontend/client/modules/create/utils.ts
+++ b/frontend/client/modules/create/utils.ts
@@ -35,7 +35,7 @@ interface CreateFormErrors {
 
 export type KeyOfForm = keyof CreateFormErrors;
 export const FIELD_NAME_MAP: { [key in KeyOfForm]: string } = {
-  rfpOptIn: 'RFP KYC',
+  rfpOptIn: 'KYC',
   title: 'Title',
   brief: 'Brief',
   target: 'Target amount',
@@ -61,7 +61,6 @@ export function getCreateErrors(
     target,
     payoutAddress,
     tipJarAddress,
-    rfp,
     rfpOptIn,
     brief,
   } = form;
@@ -83,7 +82,7 @@ export function getCreateErrors(
   }
 
   // RFP opt-in
-  if (rfp && (rfp.bounty || rfp.matching) && rfpOptIn === null) {
+  if (rfpOptIn === null) {
     errors.rfpOptIn = 'Please accept or decline KYC';
   }