fix(webapp): code cleanup

packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceItemsEntriesEditorField.tsx

@@ -4,6 +4,7 @@ import { FastField } from 'formik';
 import ItemsEntriesTable from '@/containers/Entries/ItemsEntriesTable';
 import { useInvoiceFormContext } from './InvoiceFormProvider';
 import { entriesFieldShouldUpdate } from './utils';
+import { TaxType } from '@/interfaces/TaxRates';
 
 /**
  * Invoice items entries editor field.
@@ -33,7 +34,7 @@ export default function InvoiceItemsEntriesEditorField() {
           errors={error}
           linesNumber={4}
           currencyCode={values.currency_code}
-          isInclusiveTax={values.inclusive_exclusive_tax === 'inclusive'}
+          isInclusiveTax={values.inclusive_exclusive_tax === TaxType.Inclusive}
         />
       )}
     </FastField>

packages/webapp/src/containers/Sales/Invoices/InvoiceForm/constants.ts

@@ -1,6 +1,6 @@
-
+import { TaxType } from '@/interfaces/TaxRates';
 
 export const InclusiveButtonOptions = [
-  { key: 'inclusive', label: 'Inclusive of Tax' },
-  { key: 'exclusive', label: 'Exclusive of Tax' },
+  { key: TaxType.Inclusive, label: 'Inclusive of Tax' },
+  { key: TaxType.Exclusive, label: 'Exclusive of Tax' },
 ];

packages/webapp/src/containers/Sales/Invoices/InvoiceForm/utils.tsx

@@ -46,7 +46,7 @@ export const defaultInvoice = {
   due_date: moment().format('YYYY-MM-DD'),
   delivered: '',
   invoice_no: '',
-  inclusive_exclusive_tax: 'inclusive',
+  inclusive_exclusive_tax: TaxType.Inclusive,
   // Holds the invoice number that entered manually only.
   invoice_no_manually: '',
   reference_no: '',
@@ -172,8 +172,10 @@ export function transformValueToRequest(values) {
     ...(values.invoice_no_manually && {
       invoice_no: values.invoice_no,
     }),
-    is_inclusive_tax: values.inclusive_exclusive_tax === 'inclusive',
-    entries: entries.map((entry) => ({ ...omit(entry, ['amount']) })),
+    is_inclusive_tax: values.inclusive_exclusive_tax === TaxType.Inclusive,
+    entries: entries.map((entry) => ({
+      ...omit(entry, ['amount', 'tax_amount', 'tax_rate']),
+    })),
     delivered: false,
   };
 }

packages/webapp/src/containers/TaxRates/alerts/TaxRateDeleteAlert.tsx

@@ -7,7 +7,6 @@ import { useDeleteTaxRate } from '@/hooks/query/taxRates';
 
 import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect';
 import withAlertActions from '@/containers/Alert/withAlertActions';
-import withItemsActions from '@/containers/Items/withItemsActions';
 import withDrawerActions from '@/containers/Drawer/withDrawerActions';
 
 import { compose } from '@/utils';
@@ -51,7 +50,10 @@ function TaxRateDeleteAlert({
             data: { errors },
           },
         }) => {
-          // handleDeleteErrors(errors);
+          AppToaster.show({
+            message: 'Something went wrong.',
+            intent: Intent.DANGER,
+          });
         },
       )
       .finally(() => {
@@ -86,6 +88,5 @@ function TaxRateDeleteAlert({
 export default compose(
   withAlertStoreConnect(),
   withAlertActions,
-  withItemsActions,
   withDrawerActions,
 )(TaxRateDeleteAlert);

packages/webapp/src/containers/TaxRates/alerts/index.ts

@@ -4,8 +4,6 @@ import React from 'react';
 const TaxRateDeleteAlert = React.lazy(() => import('./TaxRateDeleteAlert'));
 
 /**
- * Project alerts.
+ * Tax rates alerts.
  */
-export default [
-  { name: 'tax-rate-delete', component: TaxRateDeleteAlert },
-];
+export default [{ name: 'tax-rate-delete', component: TaxRateDeleteAlert }];

packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingProvider.tsx

@@ -29,7 +29,7 @@ function TaxRatesLandingProvider({ tableState, ...props }) {
   };
 
   return (
-    <DashboardInsider name={'cashflow-accounts'}>
+    <DashboardInsider name={'tax-rate-form'}>
       <TaxRatesLandingContext.Provider value={provider} {...props} />
     </DashboardInsider>
   );

packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialog.tsx

@@ -9,12 +9,8 @@ const TaxRateFormDialogContent = lazy(
   () => import('./TaxRateFormDialogContent'),
 );
 
-const TaxRateDialog = styled(Dialog)`
-  max-width: 450px;
-`;
-
 /**
- * Account form dialog.
+ * Tax rate form dialog.
  */
 function TaxRateFormDialog({
   dialogName,
@@ -39,4 +35,8 @@ function TaxRateFormDialog({
   );
 }
 
+const TaxRateDialog = styled(Dialog)`
+  max-width: 450px;
+`;
+
 export default compose(withDialogRedux())(TaxRateFormDialog);

packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialogContent.tsx

@@ -9,7 +9,7 @@ interface TaxRateFormDialogContentProps {
 }
 
 /**
- * Account dialog content.
+ * Tax rate form dialog content.
  */
 export default function TaxRateFormDialogContent({
   dialogName,