From 9ee5b8fcb0ee0e8be760de3a95150c0f80bb8101 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 16 Mar 2021 12:12:58 -0700
Subject: [PATCH] IO-765 Resolve bill save issues.

---
 .../bill-detail-edit.container.jsx            | 55 +++++++++----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
index 6b1a8d303..bf4467758 100644
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -41,7 +41,6 @@ export default function BillDetailEditcontainer() {
 
     billlines.forEach((il) => {
       delete il.__typename;
-
       if (il.id) {
         updates.push(
           updateBillLine({
@@ -71,8 +70,11 @@ export default function BillDetailEditcontainer() {
         );
       }
     });
-
     await Promise.all(updates);
+
+    await refetch();
+    form.resetFields();
+    form.resetFields();
     setUpdateLoading(false);
   };
 
@@ -92,32 +94,7 @@ export default function BillDetailEditcontainer() {
       <Form
         form={form}
         onFinish={handleFinish}
-        initialValues={
-          data
-            ? {
-                ...data.bills_by_pk,
-
-                billlines: data.bills_by_pk.billlines.map((i) => {
-                  return {
-                    ...i,
-                    joblineid: !!i.joblineid ? i.joblineid : "noline",
-                    applicable_taxes: {
-                      federal:
-                        (i.applicable_taxes && i.applicable_taxes.federal) ||
-                        false,
-                      state:
-                        (i.applicable_taxes && i.applicable_taxes.state) ||
-                        false,
-                      local:
-                        (i.applicable_taxes && i.applicable_taxes.local) ||
-                        false,
-                    },
-                  };
-                }),
-                date: data.bills_by_pk ? moment(data.bills_by_pk.date) : null,
-              }
-            : {}
-        }
+        initialValues={transformData(data)}
       >
         <Button
           htmlType="submit"
@@ -138,3 +115,25 @@ export default function BillDetailEditcontainer() {
     </LoadingSkeleton>
   );
 }
+
+const transformData = (data) => {
+  return data
+    ? {
+        ...data.bills_by_pk,
+
+        billlines: data.bills_by_pk.billlines.map((i) => {
+          return {
+            ...i,
+            joblineid: !!i.joblineid ? i.joblineid : "noline",
+            applicable_taxes: {
+              federal:
+                (i.applicable_taxes && i.applicable_taxes.federal) || false,
+              state: (i.applicable_taxes && i.applicable_taxes.state) || false,
+              local: (i.applicable_taxes && i.applicable_taxes.local) || false,
+            },
+          };
+        }),
+        date: data.bills_by_pk ? moment(data.bills_by_pk.date) : null,
+      }
+    : {};
+};