Coderabbit

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
actualbudget · Jan 28, 2025 · 3dc37f1 · 3dc37f1
1 parent a4d6565
commit 3dc37f1
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 15 deletions.
diff --git a/packages/desktop-client/src/components/banksync/AccountRow.tsx b/packages/desktop-client/src/components/banksync/AccountRow.tsx
@@ -13,10 +13,8 @@ import { Row, Cell } from '../table';
 const tsToString = (ts, dateFormat) => {
   if (!ts) return 'Unknown';
 
-  const tsObj = new Date(parseInt(ts, 10));
-  const date = format(tsObj, dateFormat);
-
-  return `${date} ${tsObj.toLocaleTimeString()}`;
+  const parsed = new Date(parseInt(ts, 10));
+  return `${format(parsed, dateFormat)} ${format(parsed, 'HH:mm:ss')}`;
 };
 
 type AccountRowProps = {
@@ -48,7 +46,7 @@ export const AccountRow = memo(
         onMouseLeave={() => onHover && onHover(null)}
       >
         <Cell
-          name="stage"
+          name="accountName"
           width={250}
           plain
           style={{ color: theme.tableText, padding: '10px' }}
@@ -57,7 +55,7 @@ export const AccountRow = memo(
         </Cell>
 
         <Cell
-          name="stage"
+          name="bankName"
           width="flex"
           plain
           style={{ color: theme.tableText, padding: '10px' }}
@@ -66,7 +64,7 @@ export const AccountRow = memo(
         </Cell>
 
         <Cell
-          name="stage"
+          name="lastSync"
           width={200}
           plain
           style={{ color: theme.tableText, padding: '10px' }}

diff --git a/packages/desktop-client/src/components/banksync/EditSyncAccount.tsx b/packages/desktop-client/src/components/banksync/EditSyncAccount.tsx
@@ -123,7 +123,13 @@ export function EditSyncAccount({ account }: EditSyncAccountProps) {
 
   const exampleTransaction = useMemo(() => {
     const data = transactions?.[0]?.raw_synced_data;
-    return data ? JSON.parse(data) : undefined;
+    if (!data) return undefined;
+    try {
+      return JSON.parse(data);
+    } catch (error) {
+      console.error('Failed to parse transaction data:', error);
+      return undefined;
+    }
   }, [transactions]);
 
   const onSave = async (close: () => void) => {

diff --git a/packages/desktop-client/src/components/banksync/FieldMapping.tsx b/packages/desktop-client/src/components/banksync/FieldMapping.tsx
@@ -52,6 +52,7 @@ export function FieldMapping({
   return (
     <>
       <Select
+        aria-label={t('Transaction direction')}
         options={transactionDirectionOptions.map(x => [x.value, x.label])}
         value={transactionDirection}
         onChange={newValue =>
@@ -113,6 +114,9 @@ export function FieldMapping({
             </Text>
 
             <Select
+              aria-label={t('Synced field to map to {{field}}', {
+                field: field.actualField,
+              })}
               options={field.syncFields.map(({ field }) => [field, field])}
               value={mapping.get(field.actualField)}
               style={{

diff --git a/packages/loot-core/src/server/util/custom-sync-mapping.ts b/packages/loot-core/src/server/util/custom-sync-mapping.ts
@@ -10,13 +10,23 @@ export const mappingsToString = (mapping: Mappings): string =>
     ),
   );
 
-export const mappingsFromString = (str: string): Mappings =>
-  new Map(
-    Object.entries(JSON.parse(str)).map(([key, value]) => [
-      key,
-      new Map(Object.entries(value as object)),
-    ]),
-  );
+export const mappingsFromString = (str: string): Mappings => {
+  try {
+    const parsed = JSON.parse(str);
+    if (typeof parsed !== 'object' || parsed === null) {
+      throw new Error('Invalid mapping format');
+    }
+    return new Map(
+      Object.entries(parsed).map(([key, value]) => [
+        key,
+        new Map(Object.entries(value as object)),
+      ]),
+    );
+  } catch (e) {
+    const message = e instanceof Error ? e.message : e;
+    throw new Error(`Failed to parse mapping: ${message}`);
+  }
+};
 
 export const defaultMappings: Mappings = new Map([
   [