diff --git a/packages/webapp/src/components/TaxRates/TaxRatesSuggestInputCell.tsx b/packages/webapp/src/components/TaxRates/TaxRatesSuggestInputCell.tsx
index e6fed6bb4..c3626b75f 100644
--- a/packages/webapp/src/components/TaxRates/TaxRatesSuggestInputCell.tsx
+++ b/packages/webapp/src/components/TaxRates/TaxRatesSuggestInputCell.tsx
@@ -27,7 +27,7 @@ export function TaxRatesSuggestInputCell({
items={taxRates}
valueAccessor={'id'}
labelAccessor={'code'}
- textAccessor={'name'}
+ textAccessor={'name_formatted'}
popoverProps={{ minimal: true, boundary: 'window' }}
inputProps={{ placeholder: '' }}
fill={true}
diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx
index c9a9fe704..899f2bb7b 100644
--- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx
+++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx
@@ -29,7 +29,7 @@ export function InvoiceDetailTableFooter() {
{invoice.taxes.map((taxRate) => (
diff --git a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeaderDimensionsProvider.tsx b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeaderDimensionsProvider.tsx
index 56872bcf9..eddfa70e4 100644
--- a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeaderDimensionsProvider.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeaderDimensionsProvider.tsx
@@ -9,7 +9,7 @@ const ARAgingSummaryHeaderDimensonsContext = React.createContext();
/**
* ARAging summary header dismensions provider.
- * @returns
+ * @returns {JSX.Element}
*/
function ARAgingSummaryHeaderDimensionsProvider({ query, ...props }) {
// Features guard.
diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/dynamicColumns.ts b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/dynamicColumns.ts
index e716470d3..1b79dd941 100644
--- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/dynamicColumns.ts
+++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/dynamicColumns.ts
@@ -13,6 +13,7 @@ const taxNameAccessor = R.curry((data, column) => ({
sticky: 'left',
width: 300,
textOverview: true,
+ disableSortBy: true,
}));
const taxableAmountAccessor = R.curry((data, column) => {
@@ -25,6 +26,7 @@ const taxableAmountAccessor = R.curry((data, column) => {
className: column.key,
width: getColumnWidth(data, accessor, { minWidth: 120 }),
align: Align.Right,
+ disableSortBy: true,
};
});
diff --git a/packages/webapp/src/containers/TaxRates/containers/_components.tsx b/packages/webapp/src/containers/TaxRates/containers/_components.tsx
index 0442c5047..cd1ea677d 100644
--- a/packages/webapp/src/containers/TaxRates/containers/_components.tsx
+++ b/packages/webapp/src/containers/TaxRates/containers/_components.tsx
@@ -36,7 +36,7 @@ export function TaxRatesTableActionsMenu({
onClick={safeCallback(onActivate, original)}
/>
)}
- {original.active && (
+ {!!original.active && (
}
text={'Inactivate Tax Rate'}