♻️ (typescript) convert Balance.jsx to .tsx

packages/desktop-client/src/components/accounts/Balance.jsx → packages/desktop-client/src/components/accounts/Balance.tsx

@@ -1,12 +1,13 @@
-import React, { useRef } from 'react';
+import React, { useRef, type ComponentProps } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useHover } from 'usehooks-ts';
 
 import { isPreviewId } from 'loot-core/shared/transactions';
 import { useCachedSchedules } from 'loot-core/src/client/data-hooks/schedules';
-import { q } from 'loot-core/src/shared/query';
+import { q, type Query } from 'loot-core/src/shared/query';
 import { getScheduledAmount } from 'loot-core/src/shared/schedules';
+import { type AccountEntity } from 'loot-core/types/models';
 
 import { useSelectedItems } from '../../hooks/useSelected';
 import { SvgArrowButtonRight1 } from '../../icons/v2';
@@ -16,10 +17,23 @@ import { Text } from '../common/Text';
 import { View } from '../common/View';
 import { PrivacyFilter } from '../PrivacyFilter';
 import { CellValue, CellValueText } from '../spreadsheet/CellValue';
+import { type SheetFields, type SheetNames } from '../spreadsheet/index';
 import { useFormat } from '../spreadsheet/useFormat';
 import { useSheetValue } from '../spreadsheet/useSheetValue';
 
-function DetailedBalance({ name, balance, isExactBalance = true }) {
+import { type ReconcilingMessage } from './Reconcile';
+
+type DetailedBalanceProps = {
+  name: string;
+  balance: number;
+  isExactBalance: boolean;
+};
+
+function DetailedBalance({
+  name,
+  balance,
+  isExactBalance = true,
+}: DetailedBalanceProps) {
   const format = useFormat();
   return (
     <Text
@@ -42,32 +56,37 @@ function DetailedBalance({ name, balance, isExactBalance = true }) {
   );
 }
 
-function SelectedBalance({ selectedItems, account }) {
+type SelectedBalanceProps = {
+  selectedItems: Set<string>;
+  account: AccountEntity;
+};
+
+function SelectedBalance({ selectedItems, account }: SelectedBalanceProps) {
   const { t } = useTranslation();
 
   const name = `selected-balance-${[...selectedItems].join('-')}`;
 
-  const rows = useSheetValue({
-    name,
+  const rows = useSheetValue<'balance', `selected-balance-${string}`>({
+    name: name as `selected-balance-${string}`,
     query: q('transactions')
       .filter({
         id: { $oneof: [...selectedItems] },
         parent_id: { $oneof: [...selectedItems] },
       })
       .select('id'),
   });
-  const ids = new Set((rows || []).map(r => r.id));
+  const ids = new Set(Array.isArray(rows) ? rows.map(r => r.id) : []);
 
   const finalIds = [...selectedItems].filter(id => !ids.has(id));
-  let balance = useSheetValue({
-    name: name + '-sum',
+  let balance = useSheetValue<'balance', `selected-balance-${string}`>({
+    name: (name + '-sum') as `selected-balance-${string}`,
     query: q('transactions')
       .filter({ id: { $oneof: finalIds } })
       .options({ splits: 'all' })
       .calculate({ $sum: '$amount' }),
   });
 
-  let scheduleBalance = null;
+  let scheduleBalance = 0;
 
   const { isLoading, schedules = [] } = useCachedSchedules();
 
@@ -114,7 +133,11 @@ function SelectedBalance({ selectedItems, account }) {
   );
 }
 
-function FilteredBalance({ filteredAmount }) {
+type FilteredBalanceProps = {
+  filteredAmount: number;
+};
+
+function FilteredBalance({ filteredAmount }: FilteredBalanceProps) {
   const { t } = useTranslation();
 
   return (
@@ -126,34 +149,59 @@ function FilteredBalance({ filteredAmount }) {
   );
 }
 
-function MoreBalances({ balanceQuery }) {
+type MoreBalancesProps = {
+  balanceQuery: {
+    name: `balance-query-${string}`;
+    query: Query;
+  };
+};
+
+function MoreBalances({ balanceQuery }: MoreBalancesProps) {
   const { t } = useTranslation();
 
-  const cleared = useSheetValue({
-    name: balanceQuery.name + '-cleared',
+  const cleared = useSheetValue<'balance', `balance-query-${string}`>({
+    name: (balanceQuery.name + '-cleared') as `balance-query-${string}`,
     query: balanceQuery.query.filter({ cleared: true }),
   });
-  const uncleared = useSheetValue({
-    name: balanceQuery.name + '-uncleared',
+
+  const uncleared = useSheetValue<'balance', `balance-query-${string}`>({
+    name: (balanceQuery.name + '-uncleared') as `balance-query-${string}`,
     query: balanceQuery.query.filter({ cleared: false }),
   });
 
   return (
     <View style={{ flexDirection: 'row' }}>
-      <DetailedBalance name={t('Cleared total:')} balance={cleared} />
-      <DetailedBalance name={t('Uncleared total:')} balance={uncleared} />
+      <DetailedBalance
+        name={t('Cleared total:')}
+        balance={cleared ?? 0}
+        isExactBalance
+      />
+      <DetailedBalance
+        name={t('Uncleared total:')}
+        balance={uncleared ?? 0}
+        isExactBalance
+      />
     </View>
   );
 }
 
+type BalancesProps = {
+  balanceQuery: ComponentProps<typeof ReconcilingMessage>['balanceQuery'];
+  showExtraBalances: boolean;
+  onToggleExtraBalances: () => void;
+  account: AccountEntity;
+  isFiltered: boolean;
+  filteredAmount: number;
+};
+
 export function Balances({
   balanceQuery,
   showExtraBalances,
   onToggleExtraBalances,
   account,
   isFiltered,
   filteredAmount,
-}) {
+}: BalancesProps) {
   const selectedItems = useSelectedItems();
   const buttonRef = useRef(null);
   const isButtonHovered = useHover(buttonRef);
@@ -177,7 +225,14 @@ export function Balances({
           paddingBottom: 1,
         }}
       >
-        <CellValue binding={{ ...balanceQuery, value: 0 }} type="financial">
+        <CellValue
+          binding={{
+            name: balanceQuery.name as SheetFields<SheetNames>,
+            query: balanceQuery.query,
+            value: 0,
+          }}
+          type="financial"
+        >
           {props => (
             <CellValueText
               {...props}

packages/desktop-client/src/components/spreadsheet/index.ts

@@ -69,7 +69,8 @@ export type Spreadsheets = {
     'uncategorized-balance': number;
 
     // Balance fields
-    [key: `balance-query-${string}-cleared`]: number;
+    [key: `balance-query-${string}`]: number;
+    [key: `selected-balance-${string}`]: number;
   };
 };
 

upcoming-release-notes/3874.md

@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [cindywu]
+---
+
+Convert Balance.jsx to tsx