From 0d65f8d894b0f49e630cfa7320b1cf270e9f0d19 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 18 Oct 2021 13:40:31 -0700
Subject: [PATCH] IO-1407 Resolve bill not clearing on enter again

---
 .../bill-enter-modal/bill-enter-modal.container.jsx           | 2 +-
 client/src/components/bill-form/bill-form.lines.component.jsx | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index 83ff2a7b2..e617cf3b5 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -216,7 +216,7 @@ function BillEnterModalContainer({
 
     if (enterAgain) {
       form.resetFields();
-      form.setFieldsValue(formValues);
+      form.setFieldsValue({ ...form.getFieldsValue(), billlines: [] });
     } else {
       toggleModalVisible();
     }
diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index 03e71f6c7..03afc6b9a 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -148,7 +148,7 @@ export function BillEnterModalLinesComponent({
             ],
           };
         },
-        formInput: (record, index, ...restProp) => (
+        formInput: (record, index) => (
           <CurrencyInput
             min={0}
             disabled={disabled}
@@ -156,7 +156,6 @@ export function BillEnterModalLinesComponent({
               setFieldsValue({
                 billlines: getFieldsValue("billlines").billlines.map(
                   (item, idx) => {
-                    console.log("Checking", index, idx, restProp);
                     if (idx === index) {
                       console.log(
                         "Found and setting.",
@@ -493,7 +492,6 @@ const EditableCell = ({
   additional,
   ...restProps
 }) => {
-  console.log(record);
   if (additional)
     return (
       <td {...restProps}>