Merge branch 'develop' into main

This reverts commit e3f2c82a38.

src/components/Button/index.js

@@ -1,3 +1 @@
-
-
 export * from './ButtonLink';

src/components/Customers/CustomerDrawerLink.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import * as R from 'ramda';
 
-import { ButtonLink } from 'components';
+import { ButtonLink } from '../Button';
 import withDrawerActions from 'containers/Drawer/withDrawerActions';
 
 function CustomerDrawerLinkComponent({

src/components/FinancialSheet/FinancialSheet.js

@@ -2,7 +2,8 @@ import React, { useMemo, useCallback } from 'react';
 import moment from 'moment';
 import intl from 'react-intl-universal';
 
-import { If, FormattedMessage as T } from 'components';
+import If from '../Utils/If';
+import { FormattedMessage as T } from '../FormattedMessage';
 import {
   FinancialSheetRoot,
   FinancialSheetFooterCurrentTime,

src/components/FinancialSheet/FinancialSheetSkeleton.js

@@ -2,7 +2,8 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { Align } from 'common';
-import { SkeletonText, DataTable } from 'components';
+import { SkeletonText } from 'components';
+import DataTable from '../../components/DataTable'
 
 import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
 import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton';

src/components/FinancialSheet/ReportDataTable.js

@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import { DataTable } from 'components';
+import DataTable from '../DataTable';
 
 export const ReportDataTable = styled(DataTable)`
   .table .tbody .tr.no-results:last-of-type .td {

src/components/Vendors/VendorDrawerLink.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import * as R from 'ramda';
 
-import { ButtonLink } from 'components';
+import { ButtonLink } from '../Button';
 import withDrawerActions from 'containers/Drawer/withDrawerActions';
 
 function VendorDrawerLinkComponent({