refactor: Improve handling of transfers in Transactions component

decentdao · Aug 12, 2024 · e7ee544 · e7ee544
1 parent 2e1a548
commit e7ee544
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/src/components/pages/DAOTreasury/components/Transactions.tsx b/src/components/pages/DAOTreasury/components/Transactions.tsx
@@ -111,11 +111,13 @@ function EmptyTransactions() {
 
 export function Transactions({ shownTransactions }: { shownTransactions: number }) {
   const {
-    treasury: { transfers, transfersLoaded, transfersLoading },
+    treasury: { transfers, transfersLoaded },
   } = useFractal();
 
-  if (!transfers || (transfers.length === 0 && transfersLoaded)) return <EmptyTransactions />;
-
+  if (!transfers) {
+    return null;
+  }
+  if (transfers.length === 0 && transfersLoaded) return <EmptyTransactions />;
   return (
     <Box
       overflowX="auto"
@@ -127,7 +129,7 @@ export function Transactions({ shownTransactions }: { shownTransactions: number
           displayData={transfer}
         />
       ))}
-      {(transfersLoading || !transfersLoaded) && <Box>{/* @todo add Wave Loader */}</Box>}
+      {(transfers === null || !transfersLoaded) && <Box>{/* @todo add Wave Loader */}</Box>}
     </Box>
   );
 }

diff --git a/src/hooks/DAO/loaders/useDecentTreasury.ts b/src/hooks/DAO/loaders/useDecentTreasury.ts
@@ -63,7 +63,6 @@ export const useDecentTreasury = () => {
     if (!daoAddress || !safeAPI) {
       return;
     }
-    action.dispatch({ type: TreasuryAction.SET_TRANSFERS_LOADING, payload: true });
     const [
       transfers,
       { data: tokenBalances, error: tokenBalancesError },
@@ -147,8 +146,6 @@ export const useDecentTreasury = () => {
           action.dispatch({ type: TreasuryAction.SET_TRANSFERS_LOADED, payload: true });
         }
       });
-
-    action.dispatch({ type: TreasuryAction.SET_TRANSFERS_LOADING, payload: false });
   }, [
     daoAddress,
     safeAPI,

diff --git a/src/providers/App/treasury/action.ts b/src/providers/App/treasury/action.ts
@@ -17,10 +17,6 @@ export type TreasuryActions =
       type: TreasuryAction.ADD_TRANSFER;
       payload: TransferDisplayData;
     }
-  | {
-      type: TreasuryAction.SET_TRANSFERS_LOADING;
-      payload: boolean;
-    }
   | {
       type: TreasuryAction.SET_TRANSFERS_LOADED;
       payload: boolean;

diff --git a/src/providers/App/treasury/reducer.ts b/src/providers/App/treasury/reducer.ts
@@ -4,9 +4,8 @@ import { TreasuryActions, TreasuryAction } from './action';
 export const initialTreasuryState: DecentTreasury = {
   assetsFungible: [],
   assetsNonFungible: [],
-  transfers: undefined,
+  transfers: null,
   totalUsdValue: 0,
-  transfersLoading: true,
   transfersLoaded: false,
 };
 
@@ -17,10 +16,6 @@ export const treasuryReducer = (state: DecentTreasury, action: TreasuryActions):
     case TreasuryAction.ADD_TRANSFER:
       const transfers = state.transfers ?? [];
       return { ...state, transfers: [...transfers, action.payload] };
-    case TreasuryAction.SET_TRANSFERS_LOADING:
-      return { ...state, transfersLoading: action.payload };
-    case TreasuryAction.SET_TRANSFERS_LOADED:
-      return { ...state, transfersLoaded: true };
     case TreasuryAction.RESET:
       return initialTreasuryState;
     default:

diff --git a/src/types/fractal.ts b/src/types/fractal.ts
@@ -267,8 +267,7 @@ export interface DecentTreasury {
   totalUsdValue: number;
   assetsFungible: TokenBalance[];
   assetsNonFungible: NFTBalance[];
-  transfers?: TransferDisplayData[];
-  transfersLoading?: boolean;
+  transfers?: TransferDisplayData[] | null;
   transfersLoaded?: boolean;
 }