From f9034cbb394bc509feaa027dc13533d463ec3b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 11:49:43 +0100
Subject: [PATCH 01/20] Revert `isProduction` helper to get value from the Vite

---
 src/common/helpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/helpers.ts b/src/common/helpers.ts
index a2dafc3c59..1a80e0acce 100644
--- a/src/common/helpers.ts
+++ b/src/common/helpers.ts
@@ -105,5 +105,5 @@ export function isDemo() {
 }
 
 export function isProduction() {
-  return import.meta.env.VITE_IS_PRODUCTION === 'true';
+  return import.meta.env.PROD;
 }

From 40c96e0ce7d80948211c8b118a9da1ab9188f0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 11:50:15 +0100
Subject: [PATCH 02/20] Remove VITE_IS_PRODUCTION variable

---
 .env.example | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.env.example b/.env.example
index 858f2bda40..15ac4e39fc 100644
--- a/.env.example
+++ b/.env.example
@@ -1,7 +1,6 @@
 VITE_API_URL=
 VITE_IS_HOSTED=false
 VITE_APP_TITLE="Invoice Ninja"
-VITE_IS_PRODUCTION=false
 
 # Supported values: "browser", "hash"
 VITE_ROUTER=hash

From 1f64d2a1f83c7aa1251002135901263650dd93c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 16:44:01 +0100
Subject: [PATCH 03/20] DebouncedCombobox: Support for loading spinner while in
 disabled state

---
 src/components/forms/DebouncedCombobox.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/forms/DebouncedCombobox.tsx b/src/components/forms/DebouncedCombobox.tsx
index 3be61afcd3..e6030590ac 100644
--- a/src/components/forms/DebouncedCombobox.tsx
+++ b/src/components/forms/DebouncedCombobox.tsx
@@ -53,6 +53,7 @@ interface Props {
   withProperty?: string;
   sortBy?: string;
   staleTime?: number; // in ms
+  disableWithSpinner?: boolean;
 }
 
 export function DebouncedCombobox(props: Props) {
@@ -304,7 +305,7 @@ export function DebouncedCombobox(props: Props) {
 
             {(!props.clearButton || (!props.defaultValue && !props.value)) &&
               !isLoading && (
-                <div className="absolute inset-y-0 right-0 mt-2.5 mr-1 cursor-pointer">
+                <div className="absolute inset-y-0 right-0 mt-2.5 mr-1 cursor-pointer bg-white">
                   <ChevronDown
                     className="absolute inset-y-0 right-0 text-gray-400 h-4"
                     aria-hidden="true"
@@ -313,8 +314,8 @@ export function DebouncedCombobox(props: Props) {
                 </div>
               )}
 
-            {isLoading && (
-              <div className="absolute inset-y-0 right-0 mt-2 mr-1.5 cursor-pointer">
+            {(isLoading || (props.disabled && props.disableWithSpinner)) && (
+              <div className="absolute inset-y-0 right-0 mt-2 mr-1.5 cursor-pointer bg-white">
                 <Spinner />
               </div>
             )}

From c9749a9326b4eec84d63466df1e8459d0db6a1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 16:44:17 +0100
Subject: [PATCH 04/20] ClientSelector: disableWithSpinner support

---
 src/components/clients/ClientSelector.tsx               | 2 ++
 src/pages/invoices/common/components/ClientSelector.tsx | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/clients/ClientSelector.tsx b/src/components/clients/ClientSelector.tsx
index b466eb9867..07ef6baabd 100644
--- a/src/components/clients/ClientSelector.tsx
+++ b/src/components/clients/ClientSelector.tsx
@@ -20,6 +20,7 @@ export interface ClientSelectorProps extends GenericSelectorProps<Client> {
   withoutAction?: boolean;
   exclude?: (string | number)[];
   staleTime?: number;
+  disableWithSpinner?: boolean;
 }
 
 export function ClientSelector(props: ClientSelectorProps) {
@@ -52,6 +53,7 @@ export function ClientSelector(props: ClientSelectorProps) {
         sortBy="display_name|asc"
         exclude={props.exclude}
         staleTime={props.staleTime || 500}
+        disableWithSpinner={props.disableWithSpinner}
       />
     </>
   );
diff --git a/src/pages/invoices/common/components/ClientSelector.tsx b/src/pages/invoices/common/components/ClientSelector.tsx
index f43f97081f..9f9cea37b9 100644
--- a/src/pages/invoices/common/components/ClientSelector.tsx
+++ b/src/pages/invoices/common/components/ClientSelector.tsx
@@ -26,6 +26,7 @@ interface Props {
   onClearButtonClick: () => unknown;
   onContactCheckboxChange: (contactId: string, value: boolean) => unknown;
   errorMessage?: string | string[];
+  disableWithSpinner?: boolean;
 }
 
 export function ClientSelector(props: Props) {
@@ -58,11 +59,12 @@ export function ClientSelector(props: Props) {
           inputLabel={t('client')}
           onChange={(client) => props.onChange(client.id)}
           value={resource?.client_id}
-          readonly={props.readonly}
+          readonly={props.readonly || !resource}
           clearButton={Boolean(resource?.client_id)}
           onClearButtonClick={props.onClearButtonClick}
           initiallyVisible={!resource?.client_id}
           errorMessage={props.errorMessage}
+          disableWithSpinner={props.disableWithSpinner}
         />
 
         {client && (

From cea856c80aba86af15fb02ca8676fa0255c504fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 16:44:57 +0100
Subject: [PATCH 05/20] Credits: Fixes for create page

---
 src/pages/credits/common/hooks.tsx  |  4 +--
 src/pages/credits/create/Create.tsx | 43 +++++++++++++++++++----------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/pages/credits/common/hooks.tsx b/src/pages/credits/common/hooks.tsx
index 83e95e8b1b..bf753e72ea 100644
--- a/src/pages/credits/common/hooks.tsx
+++ b/src/pages/credits/common/hooks.tsx
@@ -273,7 +273,7 @@ export function useActions() {
   const cloneToCredit = (credit: Credit) => {
     setCredit({ ...credit, number: '', documents: [] });
 
-    navigate('/credits/create');
+    navigate('/credits/create?action=clone');
   };
 
   const cloneToInvoice = (credit: Credit) => {
@@ -482,7 +482,7 @@ export const creditColumns = [
   // 'vendor', @Todo: Need to fetch the relationship
 ] as const;
 
-type CreditColumns = typeof creditColumns[number];
+type CreditColumns = (typeof creditColumns)[number];
 
 export const defaultColumns: CreditColumns[] = [
   'status',
diff --git a/src/pages/credits/create/Create.tsx b/src/pages/credits/create/Create.tsx
index 7559ff424c..0fa38e8cbf 100644
--- a/src/pages/credits/create/Create.tsx
+++ b/src/pages/credits/create/Create.tsx
@@ -9,7 +9,6 @@
  */
 
 import { blankInvitation } from 'common/constants/blank-invitation';
-import { isProduction } from 'common/helpers';
 import { useClientResolver } from 'common/hooks/clients/useClientResolver';
 import { useTitle } from 'common/hooks/useTitle';
 import { Client } from 'common/interfaces/client';
@@ -49,7 +48,7 @@ export function Create() {
   const [searchParams] = useSearchParams();
 
   const [credit, setCredit] = useAtom(creditAtom);
-  const [invoiceSum] = useAtom(invoiceSumAtom);
+  const [invoiceSum, setInvoiceSum] = useAtom(invoiceSumAtom);
 
   const [client, setClient] = useState<Client>();
   const [errors, setErrors] = useState<ValidationBag>();
@@ -58,7 +57,8 @@ export function Create() {
   const productColumns = useProductColumns();
 
   const { data } = useBlankCreditQuery({
-    enabled: typeof credit === 'undefined',
+    enabled:
+      typeof credit === 'undefined' || searchParams.get('action') === 'clone',
   });
 
   const {
@@ -74,23 +74,35 @@ export function Create() {
   });
 
   useEffect(() => {
-    if (typeof data !== 'undefined' && typeof credit === 'undefined') {
-      const _credit = cloneDeep(data);
+    setInvoiceSum(undefined);
 
-      if (typeof _credit.line_items === 'string') {
-        _credit.line_items = [];
-      }
+    setCredit((current) => {
+      let value = current;
 
-      if (searchParams.get('client')) {
-        _credit.client_id = searchParams.get('client')!;
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
       }
 
-      setCredit(_credit);
-    }
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone'
+      ) {
+        const _credit = cloneDeep(data);
+
+        if (typeof _credit.line_items === 'string') {
+          _credit.line_items = [];
+        }
+
+        if (searchParams.get('client')) {
+          _credit.client_id = searchParams.get('client')!;
+        }
+
+        value = _credit;
+      }
 
-    return () => {
-      isProduction() && setCredit(undefined);
-    };
+      return value;
+    });
   }, [data]);
 
   useEffect(() => {
@@ -135,6 +147,7 @@ export function Create() {
           onClearButtonClick={() => handleChange('client_id', '')}
           onContactCheckboxChange={handleInvitationChange}
           errorMessage={errors?.errors.client_id}
+          disableWithSpinner={searchParams.get('action') === 'create'}
         />
 
         <CreditDetails handleChange={handleChange} errors={errors} />

From 9c3cfbc43f3373d606abdcf4e3ab41280f4be800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 16:57:57 +0100
Subject: [PATCH 06/20] Expenses: Fixes for create page

---
 src/pages/credits/create/Create.tsx  |  3 +-
 src/pages/expenses/common/hooks.tsx  |  2 +-
 src/pages/expenses/create/Create.tsx | 61 +++++++++++++++-------------
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/pages/credits/create/Create.tsx b/src/pages/credits/create/Create.tsx
index 0fa38e8cbf..f22d2594a1 100644
--- a/src/pages/credits/create/Create.tsx
+++ b/src/pages/credits/create/Create.tsx
@@ -57,8 +57,7 @@ export function Create() {
   const productColumns = useProductColumns();
 
   const { data } = useBlankCreditQuery({
-    enabled:
-      typeof credit === 'undefined' || searchParams.get('action') === 'clone',
+    enabled: typeof credit === 'undefined',
   });
 
   const {
diff --git a/src/pages/expenses/common/hooks.tsx b/src/pages/expenses/common/hooks.tsx
index bfa220d71a..1678c9faf8 100644
--- a/src/pages/expenses/common/hooks.tsx
+++ b/src/pages/expenses/common/hooks.tsx
@@ -89,7 +89,7 @@ export function useActions() {
   const cloneToExpense = (expense: Expense) => {
     setExpense({ ...expense, documents: [], number: '' });
 
-    navigate('/expenses/create');
+    navigate('/expenses/create?action=clone');
   };
 
   const cloneToRecurringExpense = (expense: Expense) => {
diff --git a/src/pages/expenses/create/Create.tsx b/src/pages/expenses/create/Create.tsx
index 1fdcc63d48..17b0d317da 100644
--- a/src/pages/expenses/create/Create.tsx
+++ b/src/pages/expenses/create/Create.tsx
@@ -18,7 +18,7 @@ import { Details } from './components/Details';
 import { Notes } from './components/Notes';
 import { AdditionalInfo } from './components/AdditionalInfo';
 import { request } from 'common/helpers/request';
-import { endpoint, isProduction } from 'common/helpers';
+import { endpoint } from 'common/helpers';
 import { toast } from 'common/helpers/toast/toast';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { GenericSingleResourceResponse } from 'common/interfaces/generic-api-response';
@@ -29,6 +29,7 @@ import { route } from 'common/helpers/route';
 import { useAtom } from 'jotai';
 import { expenseAtom } from '../common/atoms';
 import { useHandleChange } from '../common/hooks';
+import { cloneDeep } from 'lodash';
 
 export function Create() {
   const [t] = useTranslation();
@@ -46,7 +47,9 @@ export function Create() {
 
   const [expense, setExpense] = useAtom(expenseAtom);
 
-  const { data } = useBlankExpenseQuery({ enabled: !expense });
+  const { data } = useBlankExpenseQuery({
+    enabled: typeof expense === 'undefined',
+  });
 
   const [taxInputType, setTaxInputType] = useState<'by_rate' | 'by_amount'>(
     'by_rate'
@@ -57,33 +60,33 @@ export function Create() {
   const handleChange = useHandleChange({ setExpense, setErrors });
 
   useEffect(() => {
-    if (data && !expense) {
-      setExpense(data);
-    }
-
-    if (searchParams.has('vendor')) {
-      setExpense(
-        (current) =>
-          current && {
-            ...current,
-            vendor_id: searchParams.get('vendor') as string,
-          }
-      );
-    }
-
-    if (searchParams.has('client')) {
-      setExpense(
-        (prevState) =>
-          prevState && {
-            ...prevState,
-            client_id: searchParams.get('client') as string,
-          }
-      );
-    }
-
-    return () => {
-      isProduction() && setExpense(undefined);
-    };
+    setExpense((current) => {
+      let value = current;
+
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
+      }
+
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone'
+      ) {
+        const _expense = cloneDeep(data);
+
+        if (searchParams.has('vendor')) {
+          _expense.vendor_id = searchParams.get('vendor') as string;
+        }
+
+        if (searchParams.has('client')) {
+          _expense.vendor_id = searchParams.get('client') as string;
+        }
+
+        value = _expense;
+      }
+
+      return value;
+    });
   }, [data]);
 
   const onSave = (expense: Expense) => {

From 0c6a9baba5efa7795c89f360ae01cd0574971921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 17:03:12 +0100
Subject: [PATCH 07/20] Invoices: Fixes for create page

---
 src/pages/invoices/create/Create.tsx          | 68 +++++++++++--------
 .../invoices/edit/components/Actions.tsx      | 10 +--
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/pages/invoices/create/Create.tsx b/src/pages/invoices/create/Create.tsx
index 0ef6cc5681..4e07ddac27 100644
--- a/src/pages/invoices/create/Create.tsx
+++ b/src/pages/invoices/create/Create.tsx
@@ -9,7 +9,6 @@
  */
 
 import { blankInvitation } from 'common/constants/blank-invitation';
-import { isProduction } from 'common/helpers';
 import { useClientResolver } from 'common/hooks/clients/useClientResolver';
 import { useCurrentCompany } from 'common/hooks/useCurrentCompany';
 import { useTitle } from 'common/hooks/useTitle';
@@ -61,7 +60,7 @@ export function Create() {
   const productColumns = useProductColumns();
   const taskColumns = useTaskColumns();
 
-  const [invoiceSum] = useAtom(invoiceSumAtom);
+  const [invoiceSum, setInvoiceSum] = useAtom(invoiceSumAtom);
 
   const [searchParams] = useSearchParams();
   const [errors, setErrors] = useState<ValidationBag>();
@@ -88,38 +87,50 @@ export function Create() {
   const save = useHandleCreate(setErrors);
 
   useEffect(() => {
-    if (typeof data !== 'undefined' && typeof invoice === 'undefined') {
-      const _invoice = cloneDeep(data);
+    setInvoiceSum(undefined);
 
-      if (company && company.enabled_tax_rates > 0) {
-        _invoice.tax_name1 = company.settings.tax_name1;
-        _invoice.tax_rate1 = company.settings.tax_rate1;
-      }
-
-      if (company && company.enabled_tax_rates > 1) {
-        _invoice.tax_name2 = company.settings.tax_name2;
-        _invoice.tax_rate2 = company.settings.tax_rate2;
-      }
+    setInvoice((current) => {
+      let value = current;
 
-      if (company && company.enabled_tax_rates > 2) {
-        _invoice.tax_name3 = company.settings.tax_name3;
-        _invoice.tax_rate3 = company.settings.tax_rate3;
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
       }
 
-      if (typeof _invoice.line_items === 'string') {
-        _invoice.line_items = [];
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone'
+      ) {
+        const _invoice = cloneDeep(data);
+
+        if (company && company.enabled_tax_rates > 0) {
+          _invoice.tax_name1 = company.settings.tax_name1;
+          _invoice.tax_rate1 = company.settings.tax_rate1;
+        }
+
+        if (company && company.enabled_tax_rates > 1) {
+          _invoice.tax_name2 = company.settings.tax_name2;
+          _invoice.tax_rate2 = company.settings.tax_rate2;
+        }
+
+        if (company && company.enabled_tax_rates > 2) {
+          _invoice.tax_name3 = company.settings.tax_name3;
+          _invoice.tax_rate3 = company.settings.tax_rate3;
+        }
+
+        if (typeof _invoice.line_items === 'string') {
+          _invoice.line_items = [];
+        }
+
+        if (searchParams.get('client')) {
+          _invoice.client_id = searchParams.get('client')!;
+        }
+
+        value = _invoice;
       }
 
-      if (searchParams.get('client')) {
-        _invoice.client_id = searchParams.get('client')!;
-      }
-
-      setInvoice(_invoice);
-    }
-
-    return () => {
-      isProduction() && setInvoice(undefined);
-    };
+      return value;
+    });
   }, [data]);
 
   useEffect(() => {
@@ -165,6 +176,7 @@ export function Create() {
           onContactCheckboxChange={handleInvitationChange}
           readonly={searchParams.get('table') === 'tasks'}
           errorMessage={errors?.errors.client_id}
+          disableWithSpinner={searchParams.get('action') === 'create'}
         />
 
         <InvoiceDetails
diff --git a/src/pages/invoices/edit/components/Actions.tsx b/src/pages/invoices/edit/components/Actions.tsx
index d38b2a8f01..6d6475e3a0 100644
--- a/src/pages/invoices/edit/components/Actions.tsx
+++ b/src/pages/invoices/edit/components/Actions.tsx
@@ -72,19 +72,19 @@ export function useActions() {
   const cloneToInvoice = (invoice: Invoice) => {
     setInvoice({ ...invoice, number: '', documents: [] });
 
-    navigate('/invoices/create');
+    navigate('/invoices/create?action=clone');
   };
 
   const cloneToQuote = (invoice: Invoice) => {
     setQuote({ ...(invoice as unknown as Quote), number: '', documents: [] });
 
-    navigate('/quotes/create');
+    navigate('/quotes/create?action=clone');
   };
 
   const cloneToCredit = (invoice: Invoice) => {
     setCredit({ ...(invoice as unknown as Credit), number: '', documents: [] });
 
-    navigate('/credits/create');
+    navigate('/credits/create?action=clone');
   };
 
   const cloneToRecurringInvoice = (invoice: Invoice) => {
@@ -94,7 +94,7 @@ export function useActions() {
       documents: [],
     });
 
-    navigate('/recurring_invoices/create');
+    navigate('/recurring_invoices/create?action=clone');
   };
 
   const cloneToPurchaseOrder = (invoice: Invoice) => {
@@ -104,7 +104,7 @@ export function useActions() {
       documents: [],
     });
 
-    navigate('/purchase_orders/create');
+    navigate('/purchase_orders/create?action=clone');
   };
 
   return [

From e7e38e9173e192b363418b1c79672e73211dc572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 17:12:07 +0100
Subject: [PATCH 08/20] Products: Fixes for create page

---
 src/common/queries/products.ts                | 10 ++--
 .../common/components/ProductCreate.tsx       |  2 +-
 src/pages/products/common/hooks.tsx           |  2 +-
 src/pages/products/create/Create.tsx          | 50 +++++++++++++------
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/common/queries/products.ts b/src/common/queries/products.ts
index 1ef463d742..cd6cbf1ca4 100644
--- a/src/common/queries/products.ts
+++ b/src/common/queries/products.ts
@@ -15,6 +15,7 @@ import { route } from 'common/helpers/route';
 import { endpoint } from '../helpers';
 import { Product } from 'common/interfaces/product';
 import { GenericSingleResourceResponse } from 'common/interfaces/generic-api-response';
+import { GenericQueryOptions } from './invoices';
 
 export function useProductsQuery() {
   return useQuery<Product[]>(
@@ -35,11 +36,14 @@ export function useProductQuery(params: { id: string | undefined }) {
     { staleTime: Infinity }
   );
 }
-export function useBlankProductQuery() {
+export function useBlankProductQuery(options?: GenericQueryOptions) {
   return useQuery(
     route('/api/v1/products/create'),
-    () => request('GET', endpoint('/api/v1/products/create')),
-    { staleTime: Infinity }
+    () =>
+      request('GET', endpoint('/api/v1/products/create')).then(
+        (response: GenericSingleResourceResponse<Product>) => response.data.data
+      ),
+    { staleTime: Infinity, ...options }
   );
 }
 
diff --git a/src/pages/invoices/common/components/ProductCreate.tsx b/src/pages/invoices/common/components/ProductCreate.tsx
index 3d8c7a78db..3538d406f8 100644
--- a/src/pages/invoices/common/components/ProductCreate.tsx
+++ b/src/pages/invoices/common/components/ProductCreate.tsx
@@ -84,7 +84,7 @@ export function ProductCreate(props: Props) {
 
   useEffect(() => {
     if (blankProduct) {
-      setProduct(blankProduct.data.data);
+      setProduct(blankProduct);
     }
   }, [blankProduct]);
 
diff --git a/src/pages/products/common/hooks.tsx b/src/pages/products/common/hooks.tsx
index 9d8b5f4b35..f8218c03cf 100644
--- a/src/pages/products/common/hooks.tsx
+++ b/src/pages/products/common/hooks.tsx
@@ -248,7 +248,7 @@ export function useActions() {
   const cloneToProduct = (product: Product) => {
     setProduct({ ...product, id: '', documents: [] });
 
-    navigate('/products/create');
+    navigate('/products/create?action=clone');
   };
 
   const handleResourcefulAction = (
diff --git a/src/pages/products/create/Create.tsx b/src/pages/products/create/Create.tsx
index 3c21f8199b..9b1ceded95 100644
--- a/src/pages/products/create/Create.tsx
+++ b/src/pages/products/create/Create.tsx
@@ -19,31 +19,33 @@ import { useBlankProductQuery } from 'common/queries/products';
 import { Container } from 'components/Container';
 import { Default } from 'components/layouts/Default';
 import { Spinner } from 'components/Spinner';
-import { useAtomValue } from 'jotai';
+import { useAtom } from 'jotai';
+import { cloneDeep } from 'lodash';
 import { ProductTableResource } from 'pages/invoices/common/components/ProductsTable';
-import { FormEvent, useState } from 'react';
+import { FormEvent, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { productAtom } from '../common/atoms';
 import { CreateProduct } from '../common/components/CreateProduct';
 
 export function Create() {
   const [t] = useTranslation();
 
-  const { data: blankProductData } = useBlankProductQuery();
-
+  const [product, setProduct] = useAtom(productAtom);
   const navigate = useNavigate();
 
+  const { data } = useBlankProductQuery({
+    enabled: typeof product === 'undefined',
+  });
+
   const pages = [
     { name: t('products'), href: '/products' },
     { name: t('new_product'), href: '/products/create' },
   ];
 
-  const product = useAtomValue(productAtom);
-
   const [isFormBusy, setIsFormBusy] = useState<boolean>(false);
-
   const [errors, setErrors] = useState<ValidationBag>();
+  const [searchParams] = useSearchParams();
 
   const handleSave = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
@@ -76,20 +78,38 @@ export function Create() {
     }
   };
 
+  useEffect(() => {
+    setProduct((current) => {
+      let value = current;
+
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
+      }
+
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone'
+      ) {
+        const _product = cloneDeep(data);
+
+        value = _product;
+      }
+
+      return value;
+    });
+  }, [data]);
+
   return (
     <Default
       title={t('new_product')}
       breadcrumbs={pages}
-      disableSaveButton={!blankProductData || isFormBusy}
+      disableSaveButton={!data || isFormBusy}
       onSaveClick={handleSave}
     >
       <Container>
-        {blankProductData?.data.data ? (
-          <CreateProduct
-            product={blankProductData.data.data}
-            errors={errors}
-            setErrors={setErrors}
-          />
+        {data ? (
+          <CreateProduct product={data} errors={errors} setErrors={setErrors} />
         ) : (
           <Spinner />
         )}

From 2a40c7cffc4946bb5b0f8b04a92d3d63942cfdc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 17:46:36 +0100
Subject: [PATCH 09/20] Reorder options for useBlankProductQuery

---
 src/common/queries/products.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/queries/products.ts b/src/common/queries/products.ts
index cd6cbf1ca4..3b1200eebb 100644
--- a/src/common/queries/products.ts
+++ b/src/common/queries/products.ts
@@ -43,7 +43,7 @@ export function useBlankProductQuery(options?: GenericQueryOptions) {
       request('GET', endpoint('/api/v1/products/create')).then(
         (response: GenericSingleResourceResponse<Product>) => response.data.data
       ),
-    { staleTime: Infinity, ...options }
+    { ...options, staleTime: Infinity }
   );
 }
 

From 8d39ac9b57e3595d710a9a585ec56bdd773b018e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 17:48:54 +0100
Subject: [PATCH 10/20] Fixes for reactivity on CreateProduct

---
 .../common/components/CreateProduct.tsx         | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/pages/products/common/components/CreateProduct.tsx b/src/pages/products/common/components/CreateProduct.tsx
index 5fae73075f..3eb179ed9f 100644
--- a/src/pages/products/common/components/CreateProduct.tsx
+++ b/src/pages/products/common/components/CreateProduct.tsx
@@ -8,20 +8,16 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-import { Dispatch, SetStateAction, useEffect } from 'react';
+import { Dispatch, SetStateAction } from 'react';
 import { useTranslation } from 'react-i18next';
-import { isProduction } from 'common/helpers';
 import { Card } from '@invoiceninja/cards';
-import { useTitle } from 'common/hooks/useTitle';
 import { ValidationBag } from 'common/interfaces/validation-bag';
 import { useAtom } from 'jotai';
 import { productAtom } from '../atoms';
-import { Product } from 'common/interfaces/product';
 import { useHandleChange } from '../hooks';
 import { ProductForm } from './ProductForm';
 
 interface Props {
-  product?: Product;
   errors: ValidationBag | undefined;
   setErrors: Dispatch<SetStateAction<ValidationBag | undefined>>;
 }
@@ -29,8 +25,6 @@ interface Props {
 export function CreateProduct(props: Props) {
   const [t] = useTranslation();
 
-  useTitle(t('new_product'));
-
   const [product, setProduct] = useAtom(productAtom);
 
   const handleChange = useHandleChange({
@@ -38,15 +32,6 @@ export function CreateProduct(props: Props) {
     setProduct,
   });
 
-  useEffect(() => {
-    if (!product) {
-      setProduct(props.product);
-    }
-
-    return () => {
-      isProduction() && setProduct(undefined);
-    };
-  }, [props.product]);
 
   return (
     <Card title={t('new_product')}>

From f7cabb12b88edbb6f6944d65d417afa0e20cc111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 17:49:08 +0100
Subject: [PATCH 11/20] Direct property bind on ProductForm

---
 .../common/components/ProductForm.tsx         | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/pages/products/common/components/ProductForm.tsx b/src/pages/products/common/components/ProductForm.tsx
index 2a26ade6c7..ab202a6d9a 100644
--- a/src/pages/products/common/components/ProductForm.tsx
+++ b/src/pages/products/common/components/ProductForm.tsx
@@ -34,20 +34,20 @@ export function ProductForm(props: Props) {
 
   const company = useCurrentCompany();
 
-  const { product, errors, handleChange, type } = props;
+  const { errors, handleChange, type } = props;
 
   return (
     <>
       {type === 'edit' && (
         <Element leftSide={t('status')}>
-          <EntityStatus entity={product} />
+          <EntityStatus entity={props.product} />
         </Element>
       )}
 
       <Element leftSide={t('product')} required>
         <InputField
           required
-          value={product.product_key}
+          value={props.product.product_key}
           onValueChange={(value) => handleChange('product_key', value)}
           errorMessage={errors?.errors.product_key}
         />
@@ -56,7 +56,7 @@ export function ProductForm(props: Props) {
       <Element leftSide={t('notes')}>
         <InputField
           element="textarea"
-          value={product.notes}
+          value={props.product.notes}
           onValueChange={(value) => handleChange('notes', value)}
           errorMessage={errors?.errors.notes}
         />
@@ -64,7 +64,7 @@ export function ProductForm(props: Props) {
 
       <Element leftSide={t('price')}>
         <InputField
-          value={product.price}
+          value={props.product.price}
           onValueChange={(value) => handleChange('price', value)}
           errorMessage={errors?.errors.price}
         />
@@ -73,7 +73,7 @@ export function ProductForm(props: Props) {
       {company?.enable_product_cost && (
         <Element leftSide={t('cost')}>
           <InputField
-            value={product.cost}
+            value={props.product.cost}
             onValueChange={(value) => handleChange('cost', value)}
             errorMessage={errors?.errors.cost}
           />
@@ -83,7 +83,7 @@ export function ProductForm(props: Props) {
       {company?.enable_product_quantity && (
         <Element leftSide={t('default_quantity')}>
           <InputField
-            value={product.quantity}
+            value={props.product.quantity}
             onValueChange={(value) => handleChange('quantity', value)}
             errorMessage={errors?.errors.quantity}
           />
@@ -94,7 +94,7 @@ export function ProductForm(props: Props) {
         <>
           <Element leftSide={t('stock_quantity')}>
             <InputField
-              value={product.in_stock_quantity}
+              value={props.product.in_stock_quantity}
               onValueChange={(value) =>
                 handleChange('in_stock_quantity', Number(value))
               }
@@ -104,7 +104,7 @@ export function ProductForm(props: Props) {
 
           <Element leftSide={t('stock_notifications')}>
             <Toggle
-              checked={product.stock_notification}
+              checked={props.product.stock_notification}
               onValueChange={(value) =>
                 handleChange('stock_notification', value)
               }
@@ -113,7 +113,7 @@ export function ProductForm(props: Props) {
 
           <Element leftSide={t('notification_threshold')}>
             <InputField
-              value={product.stock_notification_threshold}
+              value={props.product.stock_notification_threshold}
               onValueChange={(value) =>
                 handleChange('stock_notification_threshold', value)
               }
@@ -130,8 +130,8 @@ export function ProductForm(props: Props) {
               handleChange('tax_rate1', value.resource?.rate);
               handleChange('tax_name1', value.resource?.name);
             }}
-            defaultValue={product.tax_rate1}
-            clearButton={Boolean(product.tax_rate1)}
+            defaultValue={props.product.tax_rate1}
+            clearButton={Boolean(props.product.tax_rate1)}
             onClearButtonClick={() => {
               handleChange('tax_rate1', 0);
               handleChange('tax_name1', '');
@@ -151,8 +151,8 @@ export function ProductForm(props: Props) {
               handleChange('tax_rate2', value.resource?.rate);
               handleChange('tax_name2', value.resource?.name);
             }}
-            defaultValue={product.tax_rate2}
-            clearButton={Boolean(product.tax_rate2)}
+            defaultValue={props.product.tax_rate2}
+            clearButton={Boolean(props.product.tax_rate2)}
             onClearButtonClick={() => {
               handleChange('tax_rate2', 0);
               handleChange('tax_name2', '');
@@ -172,8 +172,8 @@ export function ProductForm(props: Props) {
               handleChange('tax_rate3', value.resource?.rate);
               handleChange('tax_name3', value.resource?.name);
             }}
-            defaultValue={product.tax_rate3}
-            clearButton={Boolean(product.tax_rate3)}
+            defaultValue={props.product.tax_rate3}
+            clearButton={Boolean(props.product.tax_rate3)}
             onClearButtonClick={() => {
               handleChange('tax_rate3', 0);
               handleChange('tax_name3', '');
@@ -189,7 +189,7 @@ export function ProductForm(props: Props) {
       {company?.custom_fields?.product1 && (
         <CustomField
           field="custom_value1"
-          defaultValue={product.custom_value1}
+          defaultValue={props.product.custom_value1}
           value={company.custom_fields.product1}
           onValueChange={(value) => handleChange('custom_value1', value)}
         />
@@ -198,7 +198,7 @@ export function ProductForm(props: Props) {
       {company?.custom_fields?.product2 && (
         <CustomField
           field="custom_value2"
-          defaultValue={product.custom_value2}
+          defaultValue={props.product.custom_value2}
           value={company.custom_fields.product2}
           onValueChange={(value) => handleChange('custom_value2', value)}
         />
@@ -207,7 +207,7 @@ export function ProductForm(props: Props) {
       {company?.custom_fields?.product3 && (
         <CustomField
           field="custom_value3"
-          defaultValue={product.custom_value3}
+          defaultValue={props.product.custom_value3}
           value={company.custom_fields.product3}
           onValueChange={(value) => handleChange('custom_value3', value)}
         />
@@ -216,7 +216,7 @@ export function ProductForm(props: Props) {
       {company?.custom_fields?.product4 && (
         <CustomField
           field="custom_value4"
-          defaultValue={product.custom_value4}
+          defaultValue={props.product.custom_value4}
           value={company.custom_fields.product4}
           onValueChange={(value) => handleChange('custom_value4', value)}
         />

From 34e98fee60d825742941dbe1f24ccfe4e02a533e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 17:49:30 +0100
Subject: [PATCH 12/20] Direct value assignment

---
 src/pages/products/create/Create.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/products/create/Create.tsx b/src/pages/products/create/Create.tsx
index 9b1ceded95..9971f6f0fb 100644
--- a/src/pages/products/create/Create.tsx
+++ b/src/pages/products/create/Create.tsx
@@ -91,9 +91,7 @@ export function Create() {
         typeof value === 'undefined' &&
         searchParams.get('action') !== 'clone'
       ) {
-        const _product = cloneDeep(data);
-
-        value = _product;
+        value = cloneDeep(data);
       }
 
       return value;
@@ -109,7 +107,7 @@ export function Create() {
     >
       <Container>
         {data ? (
-          <CreateProduct product={data} errors={errors} setErrors={setErrors} />
+          <CreateProduct errors={errors} setErrors={setErrors} />
         ) : (
           <Spinner />
         )}

From 440d8c5a72d8e846033ff226a06527436d9bf541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 17:54:24 +0100
Subject: [PATCH 13/20] Projects: Fixes for create page

---
 src/common/queries/projects.ts       |  8 ++++--
 src/pages/projects/common/hooks.tsx  |  2 +-
 src/pages/projects/create/Create.tsx | 43 +++++++++++++++++++---------
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/common/queries/projects.ts b/src/common/queries/projects.ts
index 929da262a8..8113782385 100644
--- a/src/common/queries/projects.ts
+++ b/src/common/queries/projects.ts
@@ -13,15 +13,17 @@ import { request } from 'common/helpers/request';
 import { Project } from 'common/interfaces/project';
 import { useQuery } from 'react-query';
 import { route } from 'common/helpers/route';
+import { GenericQueryOptions } from './invoices';
+import { GenericSingleResourceResponse } from 'common/interfaces/generic-api-response';
 
-export function useBlankProjectQuery() {
+export function useBlankProjectQuery(options?: GenericQueryOptions) {
   return useQuery<Project>(
     '/api/v1/projects/create',
     () =>
       request('GET', endpoint('/api/v1/projects/create')).then(
-        (response) => response.data.data
+        (response: GenericSingleResourceResponse<Project>) => response.data.data
       ),
-    { staleTime: Infinity }
+    { ...options, staleTime: Infinity }
   );
 }
 
diff --git a/src/pages/projects/common/hooks.tsx b/src/pages/projects/common/hooks.tsx
index b2946d7d6b..65a5bd105f 100644
--- a/src/pages/projects/common/hooks.tsx
+++ b/src/pages/projects/common/hooks.tsx
@@ -231,7 +231,7 @@ export function useActions() {
   const cloneToProject = (project: Project) => {
     setProject({ ...project, id: '', documents: [], number: '' });
 
-    navigate('/projects/create');
+    navigate('/projects/create?action=clone');
   };
 
   const actions = [
diff --git a/src/pages/projects/create/Create.tsx b/src/pages/projects/create/Create.tsx
index 4b9fbd0a0f..e106c5e4ac 100644
--- a/src/pages/projects/create/Create.tsx
+++ b/src/pages/projects/create/Create.tsx
@@ -26,6 +26,7 @@ import { Container } from 'components/Container';
 import { DebouncedCombobox } from 'components/forms/DebouncedCombobox';
 import { Default } from 'components/layouts/Default';
 import { useAtom } from 'jotai';
+import { cloneDeep } from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -41,8 +42,6 @@ export function Create() {
     { name: t('new_project'), href: '/projects/create' },
   ];
 
-  const { data: blankProject } = useBlankProjectQuery();
-
   const [searchParams] = useSearchParams();
   const [project, setProject] = useAtom(projectAtom);
   const [errors, setErrors] = useState<ValidationBag>();
@@ -55,19 +54,37 @@ export function Create() {
     setProject((project) => project && { ...project, [property]: value });
   };
 
+  const { data } = useBlankProjectQuery({
+    enabled: typeof project === 'undefined',
+  });
+
   useEffect(() => {
-    if (blankProject && !project) {
-      setProject({
-        ...blankProject,
-        task_rate: company?.settings.default_task_rate || 0,
-        client_id: searchParams.get('client') || '',
-      });
-    }
+    setProject((current) => {
+      let value = current;
+
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
+      }
+
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone'
+      ) {
+        const _project = cloneDeep(data);
+
+        _project.task_rate = company?.settings.default_task_rate || 0;
+
+        if (searchParams.get('client')) {
+          _project.client_id = searchParams.get('client')!;
+        }
+
+        value = _project;
+      }
 
-    return () => {
-      isProduction() && setProject(undefined);
-    };
-  }, [blankProject]);
+      return value;
+    });
+  }, [data]);
 
   useEffect(() => {
     if (project?.client_id && project.client_id.length > 1) {

From fc139fc2d9efae0f79ba7e5cc214b08b5fc49b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 17:57:10 +0100
Subject: [PATCH 14/20] Purchase orders: Fixes for create page

---
 src/pages/purchase-orders/common/hooks.tsx  |  2 +-
 src/pages/purchase-orders/create/Create.tsx | 52 +++++++++++----------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/pages/purchase-orders/common/hooks.tsx b/src/pages/purchase-orders/common/hooks.tsx
index 8e9f977078..0ee76ce237 100644
--- a/src/pages/purchase-orders/common/hooks.tsx
+++ b/src/pages/purchase-orders/common/hooks.tsx
@@ -376,7 +376,7 @@ export function useActions() {
   const cloneToPurchaseOrder = (purchaseOrder: PurchaseOrder) => {
     setPurchaseOrder({ ...purchaseOrder, number: '', documents: [] });
 
-    navigate('/purchase_orders/create');
+    navigate('/purchase_orders/create?action=clone');
   };
 
   const actions: Action<PurchaseOrder>[] = [
diff --git a/src/pages/purchase-orders/create/Create.tsx b/src/pages/purchase-orders/create/Create.tsx
index 75f16be2f4..cfc00a5355 100644
--- a/src/pages/purchase-orders/create/Create.tsx
+++ b/src/pages/purchase-orders/create/Create.tsx
@@ -8,7 +8,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-import { isProduction } from 'common/helpers';
 import { InvoiceSum } from 'common/helpers/invoices/invoice-sum';
 import { useTitle } from 'common/hooks/useTitle';
 import { PurchaseOrder } from 'common/interfaces/purchase-order';
@@ -59,36 +58,41 @@ export function Create() {
   });
 
   useEffect(() => {
-    if (data && !purchaseOrder) {
-      const po = cloneDeep(data);
+    setPurchaseOrder((current) => {
+      let value = current;
 
-      if (typeof po.line_items === 'string') {
-        po.line_items = [];
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
       }
 
-      po.line_items.forEach((item) => (item._id = v4()));
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone'
+      ) {
+        const po = cloneDeep(data);
 
-      po.invitations.forEach(
-        (invitation) =>
-          (invitation['client_contact_id'] = invitation.client_contact_id || '')
-      );
+        if (typeof po.line_items === 'string') {
+          po.line_items = [];
+        }
 
-      setPurchaseOrder(po);
-    }
+        if (searchParams.get('vendor')) {
+          po.vendor_id = searchParams.get('vendor')!;
+        }
 
-    if (searchParams.has('vendor')) {
-      setPurchaseOrder(
-        (current) =>
-          current && {
-            ...current,
-            vendor_id: searchParams.get('vendor') as string,
-          }
-      );
-    }
+        po.line_items.forEach((item) => (item._id = v4()));
+
+        po.invitations.forEach(
+          (invitation) =>
+            (invitation['client_contact_id'] =
+              invitation.client_contact_id || '')
+        );
+
+        value = po;
+      }
 
-    return () => {
-      isProduction() && setPurchaseOrder(undefined);
-    };
+      return value;
+    });
   }, [data]);
 
   const [invoiceSum, setInvoiceSum] = useState<InvoiceSum>();

From 40bf23e8e5f5f48c9053e2f345dd0a08e3df3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 18:00:33 +0100
Subject: [PATCH 15/20] Quotes: Fixes for create page

---
 src/pages/quotes/common/hooks.tsx             | 10 +++---
 src/pages/quotes/create/Create.tsx            | 35 ++++++++++++-------
 .../recurring-invoices/create/Create.tsx      |  1 +
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/pages/quotes/common/hooks.tsx b/src/pages/quotes/common/hooks.tsx
index 696bcd677e..14442b301b 100644
--- a/src/pages/quotes/common/hooks.tsx
+++ b/src/pages/quotes/common/hooks.tsx
@@ -271,13 +271,13 @@ export function useActions() {
   const cloneToQuote = (quote: Quote) => {
     setQuote({ ...quote, number: '', documents: [] });
 
-    navigate('/quotes/create');
+    navigate('/quotes/create?action=clone');
   };
 
   const cloneToCredit = (quote: Quote) => {
     setCredit({ ...quote, number: '', documents: [] });
 
-    navigate('/credits/create');
+    navigate('/credits/create?action=clone');
   };
 
   const cloneToRecurringInvoice = (quote: Quote) => {
@@ -287,7 +287,7 @@ export function useActions() {
       documents: [],
     });
 
-    navigate('/recurring_invoices/create');
+    navigate('/recurring_invoices/create?action=clone');
   };
 
   const cloneToPurchaseOrder = (quote: Quote) => {
@@ -297,12 +297,12 @@ export function useActions() {
       documents: [],
     });
 
-    navigate('/purchase_orders/create');
+    navigate('/purchase_orders/create?action=clone');
   };
 
   const cloneToInvoice = (quote: Quote) => {
     setInvoice({ ...quote, number: '', documents: [] });
-    navigate('/invoices/create');
+    navigate('/invoices/create?action=clone');
   };
 
   const actions: Action<Quote>[] = [
diff --git a/src/pages/quotes/create/Create.tsx b/src/pages/quotes/create/Create.tsx
index 27721043f1..07a4c8a0d0 100644
--- a/src/pages/quotes/create/Create.tsx
+++ b/src/pages/quotes/create/Create.tsx
@@ -72,23 +72,33 @@ export function Create() {
   } = useQuoteUtilities({ client });
 
   useEffect(() => {
-    if (typeof data !== 'undefined' && typeof quote === 'undefined') {
-      const _quote = cloneDeep(data);
+    setQuote((current) => {
+      let value = current;
 
-      if (typeof _quote.line_items === 'string') {
-        _quote.line_items = [];
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
       }
 
-      if (searchParams.get('client')) {
-        _quote.client_id = searchParams.get('client')!;
-      }
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone'
+      ) {
+        const _quote = cloneDeep(data);
+
+        if (typeof _quote.line_items === 'string') {
+          _quote.line_items = [];
+        }
 
-      setQuote(_quote);
-    }
+        if (searchParams.get('client')) {
+          _quote.client_id = searchParams.get('client')!;
+        }
+
+        return (value = _quote);
+      }
 
-    return () => {
-      isProduction() && setQuote(undefined);
-    };
+      return value;
+    });
   }, [data]);
 
   useEffect(() => {
@@ -133,6 +143,7 @@ export function Create() {
           onClearButtonClick={() => handleChange('client_id', '')}
           onContactCheckboxChange={handleInvitationChange}
           errorMessage={errors?.errors.client_id}
+          disableWithSpinner={searchParams.get('action') === 'create'}
         />
 
         <QuoteDetails handleChange={handleChange} errors={errors} />
diff --git a/src/pages/recurring-invoices/create/Create.tsx b/src/pages/recurring-invoices/create/Create.tsx
index 3cfdcfb5e8..f727f41cbd 100644
--- a/src/pages/recurring-invoices/create/Create.tsx
+++ b/src/pages/recurring-invoices/create/Create.tsx
@@ -155,6 +155,7 @@ export function Create() {
           onClearButtonClick={() => handleChange('client_id', '')}
           onContactCheckboxChange={handleInvitationChange}
           errorMessage={errors?.errors.client_id}
+          disableWithSpinner={searchParams.get('action') === 'create'}
         />
 
         <InvoiceDetails handleChange={handleChange} errors={errors} />

From 670a3cddaf9728181e0bf134f9e139b041bc478f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 18:04:55 +0100
Subject: [PATCH 16/20] Recurring expenses: Fixes for create page

---
 src/pages/recurring-expenses/common/hooks.tsx |  4 +-
 .../recurring-expenses/components/Details.tsx |  4 ++
 .../recurring-expenses/create/Create.tsx      | 63 ++++++++++---------
 3 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/pages/recurring-expenses/common/hooks.tsx b/src/pages/recurring-expenses/common/hooks.tsx
index 4b721e143f..57a7f79f65 100644
--- a/src/pages/recurring-expenses/common/hooks.tsx
+++ b/src/pages/recurring-expenses/common/hooks.tsx
@@ -423,7 +423,7 @@ export function useActions() {
   const cloneToRecurringExpense = (recurringExpense: RecurringExpense) => {
     setRecurringExpense({ ...recurringExpense, documents: [], number: '' });
 
-    navigate('/recurring_expenses/create');
+    navigate('/recurring_expenses/create?action=clone');
   };
 
   const cloneToExpense = (recurringExpense: RecurringExpense) => {
@@ -433,7 +433,7 @@ export function useActions() {
       number: '',
     });
 
-    navigate('/expenses/create');
+    navigate('/expenses/create?action=clone');
   };
 
   const actions: Action<RecurringExpense>[] = [
diff --git a/src/pages/recurring-expenses/components/Details.tsx b/src/pages/recurring-expenses/components/Details.tsx
index ba64f28a5c..103b5e2fff 100644
--- a/src/pages/recurring-expenses/components/Details.tsx
+++ b/src/pages/recurring-expenses/components/Details.tsx
@@ -23,6 +23,7 @@ import { VendorSelector } from 'components/vendors/VendorSelector';
 import { useTranslation } from 'react-i18next';
 import frequencies from 'common/constants/recurring-expense-frequency';
 import dayjs from 'dayjs';
+import { useSearchParams } from 'react-router-dom';
 
 export interface RecurringExpenseCardProps {
   recurringExpense: RecurringExpense | undefined;
@@ -46,6 +47,8 @@ export function Details(props: Props) {
   const { recurringExpense, handleChange, taxInputType, pageType, errors } =
     props;
 
+  const [searchParams] = useSearchParams();
+
   return (
     <Card title={t('details')} isLoading={!recurringExpense}>
       {recurringExpense && pageType === 'edit' && (
@@ -79,6 +82,7 @@ export function Details(props: Props) {
             onChange={(client) => handleChange('client_id', client.id)}
             errorMessage={errors?.errors.client_id}
             staleTime={Infinity}
+            disableWithSpinner={searchParams.get('action') === 'create'}
           />
         </Element>
       )}
diff --git a/src/pages/recurring-expenses/create/Create.tsx b/src/pages/recurring-expenses/create/Create.tsx
index d0163cd72b..e28a627e2b 100644
--- a/src/pages/recurring-expenses/create/Create.tsx
+++ b/src/pages/recurring-expenses/create/Create.tsx
@@ -30,6 +30,7 @@ import { RecurringExpense } from 'common/interfaces/recurring-expense';
 import { useBlankRecurringExpenseQuery } from 'common/queries/recurring-expense';
 import { useHandleChange } from '../common/hooks';
 import { RecurringExpensesFrequency } from 'common/enums/recurring-expense-frequency';
+import { cloneDeep } from 'lodash';
 
 export function Create() {
   const [t] = useTranslation();
@@ -52,7 +53,7 @@ export function Create() {
   const [recurringExpense, setRecurringExpense] = useAtom(recurringExpenseAtom);
 
   const { data } = useBlankRecurringExpenseQuery({
-    enabled: !recurringExpense,
+    enabled: typeof recurringExpense === 'undefined',
   });
 
   const [errors, setErrors] = useState<ValidationBag>();
@@ -60,36 +61,36 @@ export function Create() {
   const handleChange = useHandleChange({ setRecurringExpense, setErrors });
 
   useEffect(() => {
-    if (data && !recurringExpense) {
-      setRecurringExpense({
-        ...data,
-        frequency_id: RecurringExpensesFrequency.FREQUENCY_MONTHLY,
-      });
-    }
-
-    if (searchParams.has('client')) {
-      setRecurringExpense(
-        (current) =>
-          current && {
-            ...current,
-            client_id: searchParams.get('client') as string,
-          }
-      );
-    }
-
-    if (searchParams.has('vendor')) {
-      setRecurringExpense(
-        (current) =>
-          current && {
-            ...current,
-            vendor_id: searchParams.get('vendor') as string,
-          }
-      );
-    }
-
-    return () => {
-      isProduction() && setRecurringExpense(undefined);
-    };
+    setRecurringExpense((current) => {
+      let value = current;
+
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
+      }
+
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone'
+      ) {
+        const _recurringExpense = cloneDeep(data);
+
+        _recurringExpense.frequency_id =
+          RecurringExpensesFrequency.FREQUENCY_MONTHLY;
+
+        if (searchParams.get('client')) {
+          _recurringExpense.client_id = searchParams.get('client')!;
+        }
+
+        if (searchParams.get('vendor')) {
+          _recurringExpense.vendor_id = searchParams.get('vendor')!;
+        }
+
+        value = _recurringExpense;
+      }
+
+      return value;
+    });
   }, [data]);
 
   const onSave = (recurringExpense: RecurringExpense) => {

From bd2d3e26184dc7ea5a3b7ea7eda2adb24ab9ea58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 18:06:51 +0100
Subject: [PATCH 17/20] Recurring invoices: Fixes for create page

---
 src/pages/recurring-invoices/common/hooks.tsx | 10 +--
 .../recurring-invoices/create/Create.tsx      | 67 ++++++++++---------
 2 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/src/pages/recurring-invoices/common/hooks.tsx b/src/pages/recurring-invoices/common/hooks.tsx
index 88479c4ffe..3551dc4862 100644
--- a/src/pages/recurring-invoices/common/hooks.tsx
+++ b/src/pages/recurring-invoices/common/hooks.tsx
@@ -270,7 +270,7 @@ export function useActions() {
   const cloneToRecurringInvoice = (recurringInvoice: RecurringInvoice) => {
     setRecurringInvoice({ ...recurringInvoice, documents: [], number: '' });
 
-    navigate('/recurring_invoices/create');
+    navigate('/recurring_invoices/create?action=clone');
   };
 
   const cloneToInvoice = (recurringInvoice: RecurringInvoice) => {
@@ -280,7 +280,7 @@ export function useActions() {
       number: '',
     });
 
-    navigate('/invoices/create');
+    navigate('/invoices/create?action=clone');
   };
 
   const cloneToQuote = (recurringInvoice: RecurringInvoice) => {
@@ -290,7 +290,7 @@ export function useActions() {
       documents: [],
     });
 
-    navigate('/quotes/create');
+    navigate('/quotes/create?action=clone');
   };
 
   const cloneToCredit = (recurringInvoice: RecurringInvoice) => {
@@ -300,7 +300,7 @@ export function useActions() {
       documents: [],
     });
 
-    navigate('/credits/create');
+    navigate('/credits/create?action=clone');
   };
 
   const cloneToPurchaseOrder = (recurringInvoice: RecurringInvoice) => {
@@ -310,7 +310,7 @@ export function useActions() {
       documents: [],
     });
 
-    navigate('/purchase_orders/create');
+    navigate('/purchase_orders/create?action=clone');
   };
 
   const actions: Action<RecurringInvoice>[] = [
diff --git a/src/pages/recurring-invoices/create/Create.tsx b/src/pages/recurring-invoices/create/Create.tsx
index f727f41cbd..5fda2e3289 100644
--- a/src/pages/recurring-invoices/create/Create.tsx
+++ b/src/pages/recurring-invoices/create/Create.tsx
@@ -76,41 +76,48 @@ export function Create() {
   });
 
   useEffect(() => {
-    if (
-      typeof data !== 'undefined' &&
-      typeof recurringInvoice === 'undefined'
-    ) {
-      const _recurringInvoice = cloneDeep(data);
-
-      if (company && company.enabled_tax_rates > 0) {
-        _recurringInvoice.tax_name1 = company.settings.tax_name1;
-        _recurringInvoice.tax_rate1 = company.settings.tax_rate1;
-      }
-
-      if (company && company.enabled_tax_rates > 1) {
-        _recurringInvoice.tax_name2 = company.settings.tax_name2;
-        _recurringInvoice.tax_rate2 = company.settings.tax_rate2;
-      }
+    setRecurringInvoice((current) => {
+      let value = current;
 
-      if (company && company.enabled_tax_rates > 2) {
-        _recurringInvoice.tax_name3 = company.settings.tax_name3;
-        _recurringInvoice.tax_rate3 = company.settings.tax_rate3;
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
       }
 
-      if (typeof _recurringInvoice.line_items === 'string') {
-        _recurringInvoice.line_items = [];
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone'
+      ) {
+        const _recurringInvoice = cloneDeep(data);
+
+        if (company && company.enabled_tax_rates > 0) {
+          _recurringInvoice.tax_name1 = company.settings.tax_name1;
+          _recurringInvoice.tax_rate1 = company.settings.tax_rate1;
+        }
+
+        if (company && company.enabled_tax_rates > 1) {
+          _recurringInvoice.tax_name2 = company.settings.tax_name2;
+          _recurringInvoice.tax_rate2 = company.settings.tax_rate2;
+        }
+
+        if (company && company.enabled_tax_rates > 2) {
+          _recurringInvoice.tax_name3 = company.settings.tax_name3;
+          _recurringInvoice.tax_rate3 = company.settings.tax_rate3;
+        }
+
+        if (typeof _recurringInvoice.line_items === 'string') {
+          _recurringInvoice.line_items = [];
+        }
+
+        if (searchParams.get('client')) {
+          _recurringInvoice.client_id = searchParams.get('client')!;
+        }
+
+        value = _recurringInvoice;
       }
 
-      if (searchParams.get('client')) {
-        _recurringInvoice.client_id = searchParams.get('client')!;
-      }
-
-      setRecurringInvoice(_recurringInvoice);
-    }
-
-    return () => {
-      isProduction() && setRecurringInvoice(undefined);
-    };
+      return value;
+    });
   }, [data]);
 
   useEffect(() => {

From 3ecce4d2fb7976220057cec77a061c48c1fc349b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 18:14:30 +0100
Subject: [PATCH 18/20] Tasks: Fixes for create page

---
 src/common/queries/tasks.ts                 | 15 +++--
 src/pages/tasks/common/hooks.tsx            |  2 +-
 src/pages/tasks/create/Create.tsx           | 72 +++++++++------------
 src/pages/tasks/edit/components/Actions.tsx |  2 +-
 4 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/src/common/queries/tasks.ts b/src/common/queries/tasks.ts
index 1ba8548bca..f82bcdfb21 100644
--- a/src/common/queries/tasks.ts
+++ b/src/common/queries/tasks.ts
@@ -14,6 +14,8 @@ import { GenericManyResponse } from 'common/interfaces/generic-many-response';
 import { Task } from 'common/interfaces/task';
 import { useQuery } from 'react-query';
 import { route } from 'common/helpers/route';
+import { GenericQueryOptions } from './invoices';
+import { GenericSingleResourceResponse } from 'common/interfaces/generic-api-response';
 
 interface TaskParams {
   id?: string;
@@ -31,11 +33,14 @@ export function useTaskQuery(params: TaskParams) {
   );
 }
 
-export function useBlankTaskQuery() {
-  return useQuery<Task>(route('/api/v1/tasks/create'), () =>
-    request('GET', endpoint('/api/v1/tasks/create')).then(
-      (response) => response.data.data
-    )
+export function useBlankTaskQuery(options?: GenericQueryOptions) {
+  return useQuery(
+    route('/api/v1/tasks/create'),
+    () =>
+      request('GET', endpoint('/api/v1/tasks/create')).then(
+        (response: GenericSingleResourceResponse<Task>) => response.data.data
+      ),
+    { ...options, staleTime: Infinity }
   );
 }
 
diff --git a/src/pages/tasks/common/hooks.tsx b/src/pages/tasks/common/hooks.tsx
index 285eaa5171..04c15ebe6b 100644
--- a/src/pages/tasks/common/hooks.tsx
+++ b/src/pages/tasks/common/hooks.tsx
@@ -323,7 +323,7 @@ export function useActions() {
   const cloneToTask = (task: Task) => {
     setTask({ ...task, id: '', documents: [], number: '' });
 
-    navigate('/tasks/create');
+    navigate('/tasks/create?action=clone');
   };
 
   const actions = [
diff --git a/src/pages/tasks/create/Create.tsx b/src/pages/tasks/create/Create.tsx
index ed91ac261f..dec163ee4d 100644
--- a/src/pages/tasks/create/Create.tsx
+++ b/src/pages/tasks/create/Create.tsx
@@ -21,6 +21,7 @@ import { useTaskStatusesQuery } from 'common/queries/task-statuses';
 import { useBlankTaskQuery } from 'common/queries/tasks';
 import { Default } from 'components/layouts/Default';
 import { useAtom } from 'jotai';
+import { cloneDeep } from 'lodash';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -32,61 +33,52 @@ import { useStart } from '../common/hooks/useStart';
 
 export function Create() {
   const [t] = useTranslation();
-
   const { documentTitle } = useTitle('new_task');
 
-  const [searchParams] = useSearchParams();
-
-  const { data } = useBlankTaskQuery();
   const company = useCurrentCompany();
-
   const start = useStart();
+  const navigate = useNavigate();
+
+  const [task, setTask] = useAtom(taskAtom);
+  const [searchParams] = useSearchParams();
+  const [errors, setErrors] = useState<ValidationBag>();
 
   const { data: taskStatuses } = useTaskStatusesQuery();
+  const { data } = useBlankTaskQuery({ enabled: typeof task === 'undefined' });
 
   const pages = [
     { name: t('tasks'), href: '/tasks' },
     { name: t('new_task'), href: '/tasks/create' },
   ];
 
-  const [task, setTask] = useAtom(taskAtom);
-
-  const [errors, setErrors] = useState<ValidationBag>();
-
-  const navigate = useNavigate();
-
   useEffect(() => {
-    if (data && taskStatuses && !task) {
-      setTask({
-        ...data,
-        status_id: taskStatuses.data.length > 0 ? taskStatuses.data[0].id : '',
-      });
-    }
-
-    if (data && taskStatuses && task) {
-      setTask(
-        (prevState) =>
-          prevState && {
-            ...prevState,
-            status_id:
-              taskStatuses.data.length > 0 ? taskStatuses.data[0].id : '',
-          }
-      );
-    }
+    setTask((current) => {
+      let value = current;
+
+      if (searchParams.get('action') !== 'clone') {
+        value = undefined;
+      }
+
+      if (
+        typeof data !== 'undefined' &&
+        typeof value === 'undefined' &&
+        searchParams.get('action') !== 'clone' &&
+        taskStatuses
+      ) {
+        const _task = cloneDeep(data);
+
+        _task.status_id =
+          taskStatuses.data.length > 0 ? taskStatuses.data[0].id : '';
+
+        if (searchParams.get('client')) {
+          _task.client_id = searchParams.get('client')!;
+        }
 
-    if (searchParams.has('client')) {
-      setTask(
-        (prevState) =>
-          prevState && {
-            ...prevState,
-            client_id: searchParams.get('client') as string,
-          }
-      );
-    }
+        value = _task;
+      }
 
-    return () => {
-      isProduction() && setTask(undefined);
-    };
+      return value;
+    });
   }, [data, taskStatuses]);
 
   const handleChange = (property: keyof Task, value: unknown) => {
diff --git a/src/pages/tasks/edit/components/Actions.tsx b/src/pages/tasks/edit/components/Actions.tsx
index b2d3e1ef50..aa55d4a019 100644
--- a/src/pages/tasks/edit/components/Actions.tsx
+++ b/src/pages/tasks/edit/components/Actions.tsx
@@ -51,7 +51,7 @@ export function Actions(props: Props) {
   const cloneToTask = () => {
     setTask({ ...task, id: '', documents: [], number: '' });
 
-    navigate('/tasks/create');
+    navigate('/tasks/create?action=clone');
   };
 
   return (

From 9d6af2415ee37ecefddece6701f53a7ed72d4f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 18:15:51 +0100
Subject: [PATCH 19/20] Fixes for missing action params

---
 src/pages/credits/common/hooks.tsx  | 8 ++++----
 src/pages/expenses/common/hooks.tsx | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/credits/common/hooks.tsx b/src/pages/credits/common/hooks.tsx
index bf753e72ea..31143b7ddf 100644
--- a/src/pages/credits/common/hooks.tsx
+++ b/src/pages/credits/common/hooks.tsx
@@ -279,13 +279,13 @@ export function useActions() {
   const cloneToInvoice = (credit: Credit) => {
     setInvoice({ ...credit, number: '', documents: [] });
 
-    navigate('/invoices/create');
+    navigate('/invoices/create?action=clone');
   };
 
   const cloneToQuote = (credit: Credit) => {
     setQuote({ ...(credit as Quote), number: '', documents: [] });
 
-    navigate('/quotes/create');
+    navigate('/quotes/create?action=clone');
   };
 
   const cloneToRecurringInvoice = (credit: Credit) => {
@@ -295,7 +295,7 @@ export function useActions() {
       documents: [],
     });
 
-    navigate('/recurring_invoices/create');
+    navigate('/recurring_invoices/create?action=clone');
   };
 
   const cloneToPurchaseOrder = (credit: Credit) => {
@@ -305,7 +305,7 @@ export function useActions() {
       documents: [],
     });
 
-    navigate('/purchase_orders/create');
+    navigate('/purchase_orders/create?action=clone');
   };
 
   const actions: Action<Credit>[] = [
diff --git a/src/pages/expenses/common/hooks.tsx b/src/pages/expenses/common/hooks.tsx
index 1678c9faf8..1ab62977ea 100644
--- a/src/pages/expenses/common/hooks.tsx
+++ b/src/pages/expenses/common/hooks.tsx
@@ -99,7 +99,7 @@ export function useActions() {
       number: '',
     });
 
-    navigate('/recurring_expenses/create');
+    navigate('/recurring_expenses/create?action=clone');
   };
 
   const actions: Action<Expense>[] = [

From 21c5bdb9884754aea03c96f2ec598a62a2c7def5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 9 Feb 2023 18:16:21 +0100
Subject: [PATCH 20/20] Style fixes

---
 src/pages/projects/create/Create.tsx           | 2 +-
 src/pages/quotes/create/Create.tsx             | 1 -
 src/pages/recurring-expenses/create/Create.tsx | 2 +-
 src/pages/recurring-invoices/create/Create.tsx | 1 -
 src/pages/tasks/create/Create.tsx              | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/projects/create/Create.tsx b/src/pages/projects/create/Create.tsx
index e106c5e4ac..aa4e15d20e 100644
--- a/src/pages/projects/create/Create.tsx
+++ b/src/pages/projects/create/Create.tsx
@@ -11,7 +11,7 @@
 import { Card, Element } from '@invoiceninja/cards';
 import { InputField } from '@invoiceninja/forms';
 import { AxiosError } from 'axios';
-import { endpoint, isProduction } from 'common/helpers';
+import { endpoint } from 'common/helpers';
 import { request } from 'common/helpers/request';
 import { route } from 'common/helpers/route';
 import { toast } from 'common/helpers/toast/toast';
diff --git a/src/pages/quotes/create/Create.tsx b/src/pages/quotes/create/Create.tsx
index 07a4c8a0d0..3cbe72fb98 100644
--- a/src/pages/quotes/create/Create.tsx
+++ b/src/pages/quotes/create/Create.tsx
@@ -9,7 +9,6 @@
  */
 
 import { blankInvitation } from 'common/constants/blank-invitation';
-import { isProduction } from 'common/helpers';
 import { useClientResolver } from 'common/hooks/clients/useClientResolver';
 import { useTitle } from 'common/hooks/useTitle';
 import { Client } from 'common/interfaces/client';
diff --git a/src/pages/recurring-expenses/create/Create.tsx b/src/pages/recurring-expenses/create/Create.tsx
index e28a627e2b..87b748674d 100644
--- a/src/pages/recurring-expenses/create/Create.tsx
+++ b/src/pages/recurring-expenses/create/Create.tsx
@@ -16,7 +16,7 @@ import { Details } from '../components/Details';
 import { Notes } from '../components/Notes';
 import { AdditionalInfo } from '../components/AdditionalInfo';
 import { request } from 'common/helpers/request';
-import { endpoint, isProduction } from 'common/helpers';
+import { endpoint } from 'common/helpers';
 import { toast } from 'common/helpers/toast/toast';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { GenericSingleResourceResponse } from 'common/interfaces/generic-api-response';
diff --git a/src/pages/recurring-invoices/create/Create.tsx b/src/pages/recurring-invoices/create/Create.tsx
index 5fda2e3289..a07131ce61 100644
--- a/src/pages/recurring-invoices/create/Create.tsx
+++ b/src/pages/recurring-invoices/create/Create.tsx
@@ -9,7 +9,6 @@
  */
 
 import { blankInvitation } from 'common/constants/blank-invitation';
-import { isProduction } from 'common/helpers';
 import { useClientResolver } from 'common/hooks/clients/useClientResolver';
 import { useCurrentCompany } from 'common/hooks/useCurrentCompany';
 import { useTitle } from 'common/hooks/useTitle';
diff --git a/src/pages/tasks/create/Create.tsx b/src/pages/tasks/create/Create.tsx
index dec163ee4d..ffb428c7cb 100644
--- a/src/pages/tasks/create/Create.tsx
+++ b/src/pages/tasks/create/Create.tsx
@@ -9,7 +9,7 @@
  */
 
 import { AxiosError } from 'axios';
-import { endpoint, isProduction } from 'common/helpers';
+import { endpoint } from 'common/helpers';
 import { request } from 'common/helpers/request';
 import { route } from 'common/helpers/route';
 import { toast } from 'common/helpers/toast/toast';