resolving final merge conflicts and fixing code styles

Author: paigesrossi

launcher-csharp/Properties/launchSettings.json

@@ -11,18 +11,18 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "applicationUrl": "https://localhost:8080;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:8080;http://localhost:5000"
+      }
     },
     "CodeExamples": {
       "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "https://localhost:44333;http://localhost:5002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:44333;http://localhost:5002"
+      }
     }
   }
 }

launcher-csharp/WebForms/Examples/CreateAndEmbedFormService.cs

@@ -17,18 +17,12 @@ public static class CreateAndEmbedFormService
     {
         public static WebFormSummaryList GetForms(Client.DocuSignClient docuSignClient, string accountId)
         {
-<<<<<<< HEAD
             //ds-snippet-start:WebForms1Step3
-=======
->>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
             FormManagementApi formManagementApi = new FormManagementApi(docuSignClient);
             FormManagementApi.ListFormsOptions listFormsOptions = new FormManagementApi.ListFormsOptions();
             listFormsOptions.search = "Web Form Example Template";
             return formManagementApi.ListForms(accountId, listFormsOptions);
-<<<<<<< HEAD
             //ds-snippet-end:WebForms1Step3
-=======
->>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
         }
 
         public static void AddTemplateIdToForm(string fileLocation, string templateId)
@@ -81,19 +75,13 @@ public static List<EnvelopeTemplate> GetTemplatesByName(
             string accountId,
             string templateName)
         {
-<<<<<<< HEAD
-=======
             //ds-snippet-start:WebForms1Step3
->>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
             var templatesApi = new TemplatesApi(docuSignClient);
             var listTemplateOptions = new TemplatesApi.ListTemplatesOptions();
             listTemplateOptions.searchText = templateName;
 
             EnvelopeTemplateResults templates = templatesApi.ListTemplates(accountId, listTemplateOptions);
-<<<<<<< HEAD
-=======
             //ds-snippet-end:WebForms1Step3
->>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
 
             return templates.EnvelopeTemplates;
         }

launcher-csharp/WebForms/Views/CreateAndEmbedForm/Embed.cshtml

@@ -29,11 +29,7 @@ async function loadWebform() {
   var instanceToken = '@ViewBag.InstanceToken'.replace(/+/g, "+");
   const { loadDocuSign } = window.DocuSign
   const docusign = await loadDocuSign('@ViewBag.IntegrationKey');
-<<<<<<< HEAD
-
-=======
     
->>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
   const webFormOptions = {
     //Used with the runtime API workflow, for private webforms this is needed to render anything
     instanceToken: instanceToken,
@@ -50,25 +46,12 @@ async function loadWebform() {
       minHeight: "1500px",
     },
     //Controls the auto resize behavior of the iframe
-<<<<<<< HEAD
     autoResizeHeight: true
-=======
-    autoResizeHeight: true,
-    //These values are passed to the iframe URL as query params
-    tracking: {
-      "tracking-field": "tracking-value",
-    },
-    //These values are passed to the iframe URL as hash params
-    hidden: {
-      "hidden-field": "hidden-value",
-    },
->>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
   };
 
   const webFormWidget = docusign.webforms({
     url: "@ViewBag.Url",
     options: webFormOptions,
-<<<<<<< HEAD
   });
 
   //Basic milestones in this workflow
@@ -107,9 +90,6 @@ async function loadWebform() {
     // event = { type: 'userActivity', activityType: 'click' | 'keydown' };
     console.log('debug form userActivity', event);
   });
-=======
-  })
->>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
 
   webFormWidget.mount("#docusign");
 }

launcher-csharp/eSignature/Examples/DocumentGeneration.cs

@@ -122,6 +122,7 @@ public static EnvelopeTemplate MakeTemplate()
                 Status = "created",
             };
         }
+
         //ds-snippet-end:eSign42Step2
 
         //ds-snippet-start:eSign42Step4
@@ -148,6 +149,7 @@ public static TemplateTabs PrepareTabs()
                 DateSignedTabs = new List<DateSigned> { dateSignedTabs },
             };
         }
+
         //ds-snippet-end:eSign42Step4
 
         //ds-snippet-start:eSign42Step3
@@ -169,6 +171,7 @@ public static EnvelopeDefinition AddDocumentTemplate(string offerDocumentDocx)
                 Documents = new List<Document> { document },
             };
         }
+
         //ds-snippet-end:eSign42Step3
 
         //ds-snippet-start:eSign42Step5
@@ -188,6 +191,7 @@ public static EnvelopeDefinition MakeEnvelope(string candidateEmail, string cand
                 TemplateId = templateId,
             };
         }
+
         //ds-snippet-end:eSign42Step5
 
         //ds-snippet-start:eSign42Step7
@@ -238,6 +242,7 @@ public static DocGenFormFieldRequest FormFields(
                 },
             };
         }
+
         //ds-snippet-end:eSign42Step7
     }
-}
+}