From b3a85871068c0df1c143eefbe4cd78a88d70a116 Mon Sep 17 00:00:00 2001
From: ricardo <ricardoespinoza105@gmail.com>
Date: Mon, 10 Aug 2020 09:41:10 -0400
Subject: [PATCH] :zap: Improvements

---
 .../credentials/ConvertKitApi.credentials.ts  |  2 +-
 .../ConvertKit/ConvertKitTrigger.node.ts      |  4 ++-
 .../nodes/ConvertKit/FormDescription.ts       | 36 +++++++++----------
 .../nodes/ConvertKit/SequenceDescription.ts   | 36 +++++++++----------
 4 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/packages/nodes-base/credentials/ConvertKitApi.credentials.ts b/packages/nodes-base/credentials/ConvertKitApi.credentials.ts
index 1685c11a24..d7e8697555 100644
--- a/packages/nodes-base/credentials/ConvertKitApi.credentials.ts
+++ b/packages/nodes-base/credentials/ConvertKitApi.credentials.ts
@@ -6,7 +6,7 @@ import {
 
 export class ConvertKitApi implements ICredentialType {
 	name = 'convertKitApi';
-	displayName = 'ConvertKit Api';
+	displayName = 'ConvertKit API';
 	properties = [
 		{
 			displayName: 'API Secret',
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
index cb5bdbeb2c..0332facf72 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
@@ -297,6 +297,8 @@ export class ConvertKitTrigger implements INodeType {
 					},
 				};
 
+				console.log(event);
+
 				if (event === 'subscriber.form_subscribe') {
 					//@ts-ignore
 					body.event['form_id'] = this.getNodeParameter('formId', 0);
@@ -317,7 +319,7 @@ export class ConvertKitTrigger implements INodeType {
 					body.event['product_id'] = this.getNodeParameter('productId', 0);
 				}
 
-				if (event === 'subscriber.tag_add' || event === 'subscriber.tag_remove"') {
+				if (event === 'subscriber.tag_add' || event === 'subscriber.tag_remove') {
 					//@ts-ignore
 					body.event['tag_id'] = this.getNodeParameter('tagId', 0);
 				}
diff --git a/packages/nodes-base/nodes/ConvertKit/FormDescription.ts b/packages/nodes-base/nodes/ConvertKit/FormDescription.ts
index f6e1a6f3e5..a8496805bc 100644
--- a/packages/nodes-base/nodes/ConvertKit/FormDescription.ts
+++ b/packages/nodes-base/nodes/ConvertKit/FormDescription.ts
@@ -37,24 +37,6 @@ export const formOperations = [
 ] as INodeProperties[];
 
 export const formFields = [
-	{
-		displayName: 'Email',
-		name: 'email',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'form',
-				],
-				operation: [
-					'addSubscriber',
-				],
-			},
-		},
-		default: '',
-		description: `The subscriber's email address.`,
-	},
 	{
 		displayName: 'Form ID',
 		name: 'id',
@@ -77,6 +59,24 @@ export const formFields = [
 		default: '',
 		description: 'Form ID.',
 	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'form',
+				],
+				operation: [
+					'addSubscriber',
+				],
+			},
+		},
+		default: '',
+		description: `The subscriber's email address.`,
+	},
 	{
 		displayName: 'Additional Fields',
 		name: 'additionalFields',
diff --git a/packages/nodes-base/nodes/ConvertKit/SequenceDescription.ts b/packages/nodes-base/nodes/ConvertKit/SequenceDescription.ts
index 5f1186cd55..42437cc155 100644
--- a/packages/nodes-base/nodes/ConvertKit/SequenceDescription.ts
+++ b/packages/nodes-base/nodes/ConvertKit/SequenceDescription.ts
@@ -37,24 +37,6 @@ export const sequenceOperations = [
 ] as INodeProperties[];
 
 export const sequenceFields = [
-	{
-		displayName: 'Email',
-		name: 'email',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'sequence',
-				],
-				operation: [
-					'addSubscriber',
-				],
-			},
-		},
-		default: '',
-		description: `The subscriber's email address.`,
-	},
 	{
 		displayName: 'Sequence ID',
 		name: 'id',
@@ -77,6 +59,24 @@ export const sequenceFields = [
 		default: '',
 		description: 'Sequence ID.',
 	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'sequence',
+				],
+				operation: [
+					'addSubscriber',
+				],
+			},
+		},
+		default: '',
+		description: `The subscriber's email address.`,
+	},
 	{
 		displayName: 'Return All',
 		name: 'returnAll',