refactor: applying PR feedback

zendesk · Jan 19, 2024 · 1fc4c2b · 1fc4c2b
1 parent 001d708
commit 1fc4c2b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/assets/new-request-form.js b/assets/new-request-form.js
diff --git a/src/modules/new-request-form/NewRequestForm.tsx b/src/modules/new-request-form/NewRequestForm.tsx
@@ -91,6 +91,9 @@ export function NewRequestForm({
       >
         {errors && <Alert type="error">{errors}</Alert>}
         {parentId && <ParentTicketField field={parent_id_field} />}
+        {ticket_form_field.options.length > 0 && (
+          <TicketFormField field={ticket_form_field} />
+        )}
         {email_field && (
           <Input
             key={email_field.name}
@@ -110,9 +113,6 @@ export function NewRequestForm({
             onChange={(value) => handleChange(organization_field, value)}
           />
         )}
-        {ticket_form_field.options.length > 0 && (
-          <TicketFormField field={ticket_form_field} />
-        )}
         {visibleFields.map((field) => {
           switch (field.type) {
             case "subject":

diff --git a/src/modules/new-request-form/ticket-form-field/TicketFormField.tsx b/src/modules/new-request-form/ticket-form-field/TicketFormField.tsx
@@ -18,7 +18,7 @@ export function TicketFormField({ field }: TicketFormFieldProps) {
   const ref = createRef<HTMLDivElement>();
 
   const handleChange: IComboboxProps["onChange"] = ({ selectionValue }) => {
-    if (selectionValue && typeof selectionValue === "string") {
+    if (selectionValue && typeof selectionValue === "number") {
       const url = new URL(window.location.href);
       const searchParams = url.searchParams;
 
@@ -48,7 +48,7 @@ export function TicketFormField({ field }: TicketFormFieldProps) {
           <Combobox isEditable={false} onChange={handleChange} ref={ref}>
             {field.options.map((option) => (
               <Option
-                key={option.name}
+                key={option.value}
                 value={option.value}
                 label={option.name}
                 isSelected={field.value === option.value}