Add option to unmark imported transactions

actualbudget · Nov 10, 2024 · d8a459b · d8a459b
1 parent 2b72b2f
commit d8a459b
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 0 deletions.
diff --git a/packages/desktop-client/src/components/accounts/Account.tsx b/packages/desktop-client/src/components/accounts/Account.tsx
@@ -1140,6 +1140,31 @@ class AccountInternal extends PureComponent<
     });
   };
 
+  onUnmarkTransactionsAsImported = async (ids: string[]) => {
+    this.setState({ workingHard: true });
+
+    const { data } = await runQuery(
+      q('transactions')
+        .filter({ id: { $oneof: ids } })
+        .select('*')
+        .options({ splits: 'grouped' }),
+    );
+
+    const transactions: TransactionEntity[] = data;
+
+    if (!transactions || transactions.length === 0) {
+      return;
+    }
+
+    const importedTransactionIds = transactions
+      .filter(t => t.imported_payee)
+      .map(t => t.id);
+
+    this.onBatchEdit('imported_payee', importedTransactionIds);
+
+    this.refetchTransactions();
+  };
+
   checkForReconciledTransactions = async (
     ids: string[],
     confirmReason: string,
@@ -1750,6 +1775,9 @@ class AccountInternal extends PureComponent<
                 onSetTransfer={this.onSetTransfer}
                 onMakeAsSplitTransaction={this.onMakeAsSplitTransaction}
                 onMakeAsNonSplitTransactions={this.onMakeAsNonSplitTransactions}
+                onUnmarkTransactionsAsImported={
+                  this.onUnmarkTransactionsAsImported
+                }
               />
 
               <View style={{ flex: 1 }}>

diff --git a/packages/desktop-client/src/components/accounts/Header.tsx b/packages/desktop-client/src/components/accounts/Header.tsx
@@ -113,6 +113,7 @@ type AccountHeaderProps = {
   | 'onSetTransfer'
   | 'onMakeAsSplitTransaction'
   | 'onMakeAsNonSplitTransactions'
+  | 'onUnmarkTransactionsAsImported'
 > &
   Pick<
     ComponentProps<typeof FiltersStack>,
@@ -179,6 +180,7 @@ export function AccountHeader({
   onSetTransfer,
   onMakeAsSplitTransaction,
   onMakeAsNonSplitTransactions,
+  onUnmarkTransactionsAsImported,
 }: AccountHeaderProps) {
   const { t } = useTranslation();
   const [menuOpen, setMenuOpen] = useState(false);
@@ -367,6 +369,7 @@ export function AccountHeader({
               showMakeTransfer={showMakeTransfer}
               onMakeAsSplitTransaction={onMakeAsSplitTransaction}
               onMakeAsNonSplitTransactions={onMakeAsNonSplitTransactions}
+              onUnmarkTransactionsAsImported={onUnmarkTransactionsAsImported}
             />
           )}
           <View>

diff --git a/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx b/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
@@ -39,6 +39,7 @@ type SelectedTransactionsButtonProps = {
   showMakeTransfer: boolean;
   onMakeAsSplitTransaction: (selectedIds: string[]) => void;
   onMakeAsNonSplitTransactions: (selectedIds: string[]) => void;
+  onUnmarkTransactionsAsImported: (selectedIds: string[]) => void;
 };
 
 export function SelectedTransactionsButton({
@@ -55,6 +56,7 @@ export function SelectedTransactionsButton({
   showMakeTransfer,
   onMakeAsSplitTransaction,
   onMakeAsNonSplitTransactions,
+  onUnmarkTransactionsAsImported,
 }: SelectedTransactionsButtonProps) {
   const { t } = useTranslation();
   const dispatch = useDispatch();
@@ -145,6 +147,19 @@ export function SelectedTransactionsButton({
     return areNoReconciledTransactions && areAllSplitTransactions;
   }, [selectedIds, types, getTransaction]);
 
+  const canUnmarkTransactionsAsImported = useMemo(() => {
+    if (selectedIds.length === 0 || types.preview) {
+      return false;
+    }
+
+    const transactions = selectedIds.map(id => getTransaction(id));
+
+    const areSomeImportedTransactions = transactions.some(
+      tx => tx && tx.imported_payee,
+    );
+    return areSomeImportedTransactions;
+  }, [selectedIds, types, getTransaction]);
+
   function onViewSchedule() {
     const firstId = selectedIds[0];
     let scheduleId;
@@ -281,6 +296,14 @@ export function SelectedTransactionsButton({
                     } as const,
                   ]
                 : []),
+              ...(canUnmarkTransactionsAsImported
+                ? [
+                    {
+                      name: 'unmark-transactions-as-imported',
+                      text: t('Unmark as imported'),
+                    } as const,
+                  ]
+                : []),
               Menu.line,
               { type: Menu.label, name: t('Edit field'), text: '' } as const,
               { name: 'date', text: t('Date') } as const,
@@ -309,6 +332,9 @@ export function SelectedTransactionsButton({
           case 'unsplit-transactions':
             onMakeAsNonSplitTransactions(selectedIds);
             break;
+          case 'unmark-transactions-as-imported':
+            onUnmarkTransactionsAsImported(selectedIds);
+            break;
           case 'post-transaction':
           case 'skip':
             onScheduleAction(name, selectedIds);

diff --git a/packages/desktop-client/src/hooks/useTransactionBatchActions.ts b/packages/desktop-client/src/hooks/useTransactionBatchActions.ts
@@ -227,6 +227,9 @@ export function useTransactionBatchActions() {
       // Cleared just toggles it on/off and it depends on the data
       // loaded. Need to clean this up in the future.
       onChange('cleared', null);
+    } else if (name === 'imported_payee') {
+      // Unmark as imported transaction by setting imported payee to empty string.
+      onChange('imported_payee', '');
     } else if (name === 'category') {
       pushCategoryAutocompleteModal();
     } else if (name === 'payee') {

diff --git a/upcoming-release-notes/3810.md b/upcoming-release-notes/3810.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [csenel]
+---
+
+Add option to unmark imported transactions.