From e3f2c82a381824e73777cbbf6355d737bdc26e7c Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Fri, 18 Feb 2022 19:29:12 +0200
Subject: [PATCH 1/4] fix: try to comment `FinancialSkeletonTable` component.

---
 .../FinancialSheet/FinancialSheetSkeleton.js         | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/components/FinancialSheet/FinancialSheetSkeleton.js b/src/components/FinancialSheet/FinancialSheetSkeleton.js
index 8feb034b5..b6d6aac1e 100644
--- a/src/components/FinancialSheet/FinancialSheetSkeleton.js
+++ b/src/components/FinancialSheet/FinancialSheetSkeleton.js
@@ -42,7 +42,7 @@ export function FinancialSheetSkeleton({
       </FinancialSheetDate>
 
       <FinancialSheetTable>
-        <FinancialSkeletonTable
+        <DataTable
           columns={skeletonTableColumns}
           data={[]}
           noInitialFetch={true}
@@ -73,12 +73,4 @@ FinancialSheetSkeleton.defaultProps = {
       align: Align.Right,
     },
   ],
-};
-
-const FinancialSkeletonTable = styled(DataTable)`
-  .table .th .skeleton,
-  .table .td .skeleton {
-    margin-top: 4px;
-    margin-bottom: 4px;
-  }
-`;
+};
\ No newline at end of file

From 8ae39bf04caa9960995e563a61f8e5152e98fd1e Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Fri, 18 Feb 2022 19:52:37 +0200
Subject: [PATCH 2/4] fix: styled-components components.

---
 src/components/Button/index.js                   | 2 --
 src/components/Customers/CustomerDrawerLink.js   | 2 +-
 src/components/FinancialSheet/FinancialSheet.js  | 3 ++-
 src/components/FinancialSheet/ReportDataTable.js | 2 +-
 src/components/Vendors/VendorDrawerLink.js       | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/Button/index.js b/src/components/Button/index.js
index f7960939a..28fb263e6 100644
--- a/src/components/Button/index.js
+++ b/src/components/Button/index.js
@@ -1,3 +1 @@
-
-
 export * from './ButtonLink';
\ No newline at end of file
diff --git a/src/components/Customers/CustomerDrawerLink.js b/src/components/Customers/CustomerDrawerLink.js
index e99c20244..a5b075fa9 100644
--- a/src/components/Customers/CustomerDrawerLink.js
+++ b/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({
diff --git a/src/components/FinancialSheet/FinancialSheet.js b/src/components/FinancialSheet/FinancialSheet.js
index f7eb905ec..951e06a85 100644
--- a/src/components/FinancialSheet/FinancialSheet.js
+++ b/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,
diff --git a/src/components/FinancialSheet/ReportDataTable.js b/src/components/FinancialSheet/ReportDataTable.js
index b242ae8e7..2d8677cf4 100644
--- a/src/components/FinancialSheet/ReportDataTable.js
+++ b/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 {
diff --git a/src/components/Vendors/VendorDrawerLink.js b/src/components/Vendors/VendorDrawerLink.js
index 91b528e6f..de5dbcf50 100644
--- a/src/components/Vendors/VendorDrawerLink.js
+++ b/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({

From 60d37e3424d9867f8d43880262ce683cb08a5131 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Fri, 18 Feb 2022 20:10:53 +0200
Subject: [PATCH 3/4] Revert "fix: try to comment `FinancialSkeletonTable`
 component."

This reverts commit e3f2c82a381824e73777cbbf6355d737bdc26e7c.
---
 .../FinancialSheet/FinancialSheetSkeleton.js         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/FinancialSheet/FinancialSheetSkeleton.js b/src/components/FinancialSheet/FinancialSheetSkeleton.js
index b6d6aac1e..8feb034b5 100644
--- a/src/components/FinancialSheet/FinancialSheetSkeleton.js
+++ b/src/components/FinancialSheet/FinancialSheetSkeleton.js
@@ -42,7 +42,7 @@ export function FinancialSheetSkeleton({
       </FinancialSheetDate>
 
       <FinancialSheetTable>
-        <DataTable
+        <FinancialSkeletonTable
           columns={skeletonTableColumns}
           data={[]}
           noInitialFetch={true}
@@ -73,4 +73,12 @@ FinancialSheetSkeleton.defaultProps = {
       align: Align.Right,
     },
   ],
-};
\ No newline at end of file
+};
+
+const FinancialSkeletonTable = styled(DataTable)`
+  .table .th .skeleton,
+  .table .td .skeleton {
+    margin-top: 4px;
+    margin-bottom: 4px;
+  }
+`;

From e874b89d2dc74e10985e0a9e2a6350cad29907a6 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Fri, 18 Feb 2022 20:32:21 +0200
Subject: [PATCH 4/4] fix: try to fix `styled-components`.

---
 src/components/FinancialSheet/FinancialSheetSkeleton.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/FinancialSheet/FinancialSheetSkeleton.js b/src/components/FinancialSheet/FinancialSheetSkeleton.js
index 8feb034b5..d542ceb73 100644
--- a/src/components/FinancialSheet/FinancialSheetSkeleton.js
+++ b/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';