From df823c0bfe72fec5964038f0a4e526d6838ffbfd Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 18 Sep 2023 18:57:24 +0200 Subject: [PATCH] feat(webapp): tax rates empty state --- .../containers/TaxRatesLandingActionsBar.tsx | 4 ---- .../containers/TaxRatesLandingEmptyState.tsx | 24 ++++++++++++------- packages/webapp/src/hooks/query/taxRates.ts | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingActionsBar.tsx b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingActionsBar.tsx index 2f370e0ce..9631ae97c 100644 --- a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingActionsBar.tsx +++ b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingActionsBar.tsx @@ -8,7 +8,6 @@ import { Icon, } from '@/components'; import { AbilitySubject, TaxRateAction } from '@/constants/abilityOption'; -import { useTaxRatesLandingContext } from './TaxRatesLandingProvider'; import withDialogActions from '@/containers/Dialog/withDialogActions'; @@ -22,9 +21,6 @@ function TaxRatesActionsBar({ // #withDialogActions openDialog, }) { - // Items list context. - const {} = useTaxRatesLandingContext(); - // Handle `new item` button click. const onClickNewItem = () => { openDialog(DialogsName.TaxRateForm); diff --git a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingEmptyState.tsx b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingEmptyState.tsx index 6bcd1a7ea..26352e35b 100644 --- a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingEmptyState.tsx +++ b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingEmptyState.tsx @@ -1,19 +1,23 @@ // @ts-nocheck import React from 'react'; import { Button, Intent } from '@blueprintjs/core'; -import { useHistory } from 'react-router-dom'; +import * as R from 'ramda'; import { EmptyStatus, Can, FormattedMessage as T } from '@/components'; import { SaleInvoiceAction, AbilitySubject } from '@/constants/abilityOption'; +import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { DialogsName } from '@/constants/dialogs'; -export function TaxRatesLandingEmptyState() { - const history = useHistory(); - +function TaxRatesLandingEmptyStateRoot({ + // #withDialogAction + openDialog, +}) { return ( } + title={"The organization doesn't have taxes, yet!"} description={

- + Setup the organization taxes to start tracking taxes on sales + transactions.

} action={ @@ -23,10 +27,10 @@ export function TaxRatesLandingEmptyState() { intent={Intent.PRIMARY} large={true} onClick={() => { - history.push('/invoices/new'); + openDialog(DialogsName.TaxRateForm); }} > - + New tax rate