Clean up for locked transactions PR.

actualbudget · Oct 12, 2023 · da7af9d · da7af9d
1 parent 44590f7
commit da7af9d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/packages/desktop-client/src/components/accounts/Account.js b/packages/desktop-client/src/components/accounts/Account.js
@@ -757,7 +757,7 @@ class AccountInternal extends PureComponent {
     this.setState({ reconcileAmount: balance });
   };
 
-  onDoneReconciling = async () => {
+  onDoneReconciling = () => {
     this.setState({ reconcileAmount: null });
   };
 
@@ -794,7 +794,7 @@ class AccountInternal extends PureComponent {
     });
   };
 
-  onBatchEdit = async (name, ids) => {    
+  onBatchEdit = async (name, ids) => {
     let onChange = async (name, value) => {
       this.setState({ workingHard: true });
 
@@ -818,6 +818,8 @@ class AccountInternal extends PureComponent {
 
       transactions.forEach(trans => {
         if (name === 'cleared' && trans.reconciled === true) {
+          // Skip transactions that are reconciled. Don't want to set them as
+          // uncleared.
           return;
         }
 
@@ -914,7 +916,7 @@ class AccountInternal extends PureComponent {
 
     let { data } = await runQuery(
       q('transactions')
-        .filter({ id: { $oneof: ids }, reconciled: true }) // scope it to account, and others
+        .filter({ id: { $oneof: ids }, reconciled: true })
         .select('*')
         .options({ splits: 'grouped' }),
     );

diff --git a/packages/desktop-client/src/components/schedules/StatusBadge.tsx b/packages/desktop-client/src/components/schedules/StatusBadge.tsx
@@ -82,22 +82,6 @@ export function getStatusProps(status: StatusTypes) {
   }
 }
 
-type Status =
-  | 'missed'
-  | 'due'
-  | 'upcoming'
-  | 'paid'
-  | 'completed'
-  | 'pending'
-  | 'scheduled'
-  | 'cleared'
-  | 'reconciled';
-
-type StatusBadgeProps = {
-  status: Status;
-  style?: CSSProperties;
-};
-
 export function StatusBadge({ status, style }: StatusBadgeProps) {
   let { color, backgroundColor, Icon } = getStatusProps(status);
   return (

diff --git a/packages/desktop-client/src/components/transactions/MobileTransaction.js b/packages/desktop-client/src/components/transactions/MobileTransaction.js
@@ -604,7 +604,7 @@ class TransactionEditInner extends PureComponent {
               </View>
               {transaction.reconciled ? (
                 <View style={{ marginLeft: 35, marginRight: 35 }}>
-                  <FieldLabel title="reconciled" />
+                  <FieldLabel title="Reconciled" />
                   <BooleanField
                     checked="true"
                     style={{ marginTop: 4 }}