fix: financial statements.

client/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js

@@ -11,9 +11,9 @@ import BalanceSheetTable from './BalanceSheetTable';
 import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
 import DashboardInsider from 'components/Dashboard/DashboardInsider';
 import BalanceSheetActionsBar from './BalanceSheetActionsBar';
-import SettingsConnect from 'connectors/Settings.connect';
 
 import withDashboard from 'containers/Dashboard/withDashboard';
+import withSettings from 'containers/Settings/withSettings';
 import withBalanceSheetActions from './withBalanceSheetActions';
 import withBalanceSheetDetail from './withBalanceSheetDetail';
 
@@ -40,14 +40,16 @@ function BalanceSheet({
     display_columns_by: '',
     none_zero: false,
   });
+  const [refetch, setRefetch] = useState(false);
  
   const fetchHook = useQuery(['balance-sheet', filter],
-    (key, query) => { fetchBalanceSheet({ ...query }); });
+    (key, query) => fetchBalanceSheet({ ...query }),
+    { manual: true });
 
   // Handle fetch the data of balance sheet.
   const handleFetchData = useCallback(() => {
-    fetchHook.refetch();
-  }, [fetchHook]);
+    setRefetch(true);
+  }, []);
 
   useEffect(() => {
     changePageTitle('Balance Sheet');
@@ -61,8 +63,17 @@ function BalanceSheet({
       to_date: moment(filter.to_date).format('YYYY-MM-DD'),
     };
     setFilter({ ..._filter });
+    setRefetch(true);
   }, [setFilter]);
 
+  // Refetch sheet effect.
+  useEffect(() => {
+    if (refetch) {
+      fetchHook.refetch({ force: true });
+      setRefetch(false);
+    }    
+  }, [refetch])
+
   return (
     <DashboardInsider>
       <BalanceSheetActionsBar />
@@ -92,6 +103,5 @@ export default compose(
   withBalanceSheetDetail(({ balanceSheetLoading }) => ({
     balanceSheetLoading,
   })),
-  // BalanceSheetConnect,
-  SettingsConnect,
+  withSettings,
 )(BalanceSheet);

client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.js

@@ -13,6 +13,7 @@ import {
 import Icon from 'components/Icon';
 import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'
 import classNames from 'classnames';
+
 import FilterDropdown from 'components/FilterDropdown';
 
 

client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js

@@ -16,6 +16,7 @@ import FinancialStatementDateRange from 'containers/FinancialStatements/Financia
 import SelectDisplayColumnsBy from '../SelectDisplayColumnsBy';
 import RadiosAccountingBasis from '../RadiosAccountingBasis';
 
+
 export default function BalanceSheetHeader({
   onSubmitFilter,
   pageFilter,

client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js

@@ -131,8 +131,7 @@ function BalanceSheetTable({
         data={balanceSheetAccounts}
         onFetchData={handleFetchData}
         expanded={expandedRows}
-        expandSubRows={true}
-        noInitialFetch={true} />
+        expandSubRows={true} />
     </FinancialSheet>
   );
 }

client/src/containers/FinancialStatements/BalanceSheet/withBalanceSheetActions.js

@@ -3,7 +3,7 @@ import {
   fetchBalanceSheet,
 } from 'store/financialStatement/financialStatements.actions';
 
-export const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch) => ({
   fetchBalanceSheet: (query = {}) => dispatch(fetchBalanceSheet({ query })),  
 });