Merge branch 'actualbudget:master' into master

packages/desktop-client/e2e/mobile.test.js

@@ -108,7 +108,7 @@ test.describe('Mobile', () => {
 
   test('creates a transaction from `/accounts/:id` page', async () => {
     const accountsPage = await navigation.goToAccountsPage();
-    const accountPage = await accountsPage.openNthAccount(1);
+    const accountPage = await accountsPage.openNthAccount(2);
     const transactionEntryPage = await accountPage.clickCreateTransaction();
 
     await expect(transactionEntryPage.header).toHaveText('New Transaction');

packages/desktop-client/e2e/page-models/rules-page.js

@@ -1,6 +1,7 @@
 export class RulesPage {
   constructor(page) {
     this.page = page;
+    this.searchBox = page.getByPlaceholder('Filter rules...');
   }
 
   /**
@@ -22,19 +23,19 @@ export class RulesPage {
    * Retrieve the data for the nth-rule.
    * 0-based index
    */
-  async getNthRule(index) {
+  getNthRule(index) {
     const row = this.page.getByTestId('table').getByTestId('row').nth(index);
 
     return {
-      conditions: await row
-        .getByTestId('conditions')
-        .evaluate(el => [...el.children].map(c => c.textContent)),
-      actions: await row
-        .getByTestId('actions')
-        .evaluate(el => [...el.children].map(c => c.textContent)),
+      conditions: row.getByTestId('conditions').locator(':scope > div'),
+      actions: row.getByTestId('actions').locator(':scope > div'),
     };
   }
 
+  async searchFor(text) {
+    await this.searchBox.fill(text);
+  }
+
   async _fillRuleFields(data) {
     if (data.conditionsOp) {
       await this.page

packages/desktop-client/e2e/page-models/schedules-page.js

@@ -31,15 +31,15 @@ export class SchedulesPage {
    * Retrieve the data for the nth-schedule.
    * 0-based index
    */
-  async getNthSchedule(index) {
+  getNthSchedule(index) {
     const row = this.getNthScheduleRow(index);
 
     return {
-      payee: await row.getByTestId('payee').textContent(),
-      account: await row.getByTestId('account').textContent(),
-      date: await row.getByTestId('date').textContent(),
-      status: await row.getByTestId('status').textContent(),
-      amount: await row.getByTestId('amount').textContent(),
+      payee: row.getByTestId('payee'),
+      account: row.getByTestId('account'),
+      date: row.getByTestId('date'),
+      status: row.getByTestId('status'),
+      amount: row.getByTestId('amount'),
     };
   }
 

packages/desktop-client/e2e/rules.test.js

@@ -28,6 +28,7 @@ test.describe('Rules', () => {
   });
 
   test('checks the page visuals', async () => {
+    await rulesPage.searchFor('Dominion');
     await expect(page).toHaveScreenshot(screenshotConfig(page));
   });
 
@@ -48,13 +49,13 @@ test.describe('Rules', () => {
       ],
     });
 
-    expect(await rulesPage.getNthRule(0)).toMatchObject({
-      conditions: ['payee is Fast Internet'],
-      actions: ['set category to General'],
-    });
+    await rulesPage.searchFor('Fast Internet');
+    const rule = rulesPage.getNthRule(0);
+    await expect(rule.conditions).toHaveText(['payee is Fast Internet']);
+    await expect(rule.actions).toHaveText(['set category to General']);
     await expect(page).toHaveScreenshot(screenshotConfig(page));
 
-    const accountPage = await navigation.goToAccountPage('Bank of America');
+    const accountPage = await navigation.goToAccountPage('HSBC');
 
     await accountPage.createSingleTransaction({
       payee: 'Fast Internet',

packages/desktop-client/e2e/schedules.test.js

@@ -38,18 +38,15 @@ test.describe('Schedules', () => {
       amount: 25,
     });
 
-    expect(await schedulesPage.getNthSchedule(0)).toMatchObject({
-      payee: 'Home Depot',
-      account: 'HSBC',
-      amount: '~25.00',
-      status: 'Due',
-    });
+    const schedule = schedulesPage.getNthSchedule(2);
+    await expect(schedule.payee).toHaveText('Home Depot');
+    await expect(schedule.account).toHaveText('HSBC');
+    await expect(schedule.amount).toHaveText('~25.00');
+    await expect(schedule.status).toHaveText('Due');
     await expect(page).toHaveScreenshot(screenshotConfig(page));
 
-    await schedulesPage.postNthSchedule(0);
-    expect(await schedulesPage.getNthSchedule(0)).toMatchObject({
-      status: 'Paid',
-    });
+    await schedulesPage.postNthSchedule(2);
+    await expect(schedulesPage.getNthSchedule(2).status).toHaveText('Paid');
     await expect(page).toHaveScreenshot(screenshotConfig(page));
 
     // Go to transactions page
@@ -62,26 +59,24 @@ test.describe('Schedules', () => {
 
     // go to rules page
     const rulesPage = await navigation.goToRulesPage();
-    expect(await rulesPage.getNthRule(0)).toMatchObject({
-      // actions: ['link schedule Home Depot (2023-02-28)'],
-      actions: [
-        expect.stringMatching(
-          /^link schedule Home Depot \(\d{4}-\d{2}-\d{2}\)$/,
-        ),
-      ],
-      conditions: [
-        'payee is Home Depot',
-        'and account is HSBC',
-        expect.stringMatching(/^and date is approx Every month on the/),
-        'and amount is approx -25.00',
-      ],
-    });
+    await rulesPage.searchFor('Home Depot');
+    const rule = rulesPage.getNthRule(0);
+    await expect(rule.actions).toHaveText([
+      'link schedule Home Depot (2017-01-01)',
+    ]);
+    await expect(rule.conditions).toHaveText([
+      'payee is Home Depot',
+      'and account is HSBC',
+      'and date is approx Every month on the 1st',
+      'and amount is approx -25.00',
+    ]);
 
     // Go back to schedules page
     await navigation.goToSchedulesPage();
-    await schedulesPage.completeNthSchedule(0);
-    expect(await schedulesPage.getNthScheduleRow(0)).toHaveText(
+    await schedulesPage.completeNthSchedule(2);
+    await expect(schedulesPage.getNthScheduleRow(4)).toHaveText(
       'Show completed schedules',
     );
+    await expect(page).toHaveScreenshot(screenshotConfig(page));
   });
 });

packages/desktop-client/src/components/ManageRules.js

@@ -1,10 +1,4 @@
-import React, {
-  useState,
-  useEffect,
-  useRef,
-  useCallback,
-  useMemo,
-} from 'react';
+import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { pushModal } from 'loot-core/src/client/actions/modals';
@@ -116,7 +110,6 @@ function ManageRulesContent({ isModal, payeeId, setLoading }) {
   );
   let selectedInst = useSelected('manage-rules', allRules, []);
   let [hoveredRule, setHoveredRule] = useState(null);
-  let tableRef = useRef(null);
 
   async function loadRules() {
     setLoading(true);
@@ -283,7 +276,6 @@ function ManageRulesContent({ isModal, payeeId, setLoading }) {
         <View style={{ flex: 1 }}>
           <RulesHeader />
           <SimpleTable
-            ref={tableRef}
             data={filteredRules}
             loadMore={loadMore}
             // Hide the last border of the item in the table

packages/desktop-client/src/components/budget/MobileBudgetTable.js

@@ -707,7 +707,7 @@ class IncomeBudgetGroup extends Component {
 
         <Card style={{ marginTop: 0 }}>
           <IncomeCategory
-            name="Income"
+            name={group.name}
             budget={
               type === 'report' ? reportBudget.groupBudgeted(group.id) : null
             }

packages/desktop-client/src/components/transactions/MobileTransaction.js

@@ -28,6 +28,7 @@ import { send } from 'loot-core/src/platform/client/fetch';
 import * as monthUtils from 'loot-core/src/shared/months';
 import { getScheduledAmount } from 'loot-core/src/shared/schedules';
 import {
+  isPreviewId,
   ungroupTransactions,
   updateTransaction,
   realizeTempTransactions,
@@ -70,10 +71,6 @@ const zIndices = { SECTION_HEADING: 10 };
 let getPayeesById = memoizeOne(payees => groupById(payees));
 let getAccountsById = memoizeOne(accounts => groupById(accounts));
 
-function isPreviewId(id) {
-  return id.indexOf('preview/') !== -1;
-}
-
 function getDescriptionPretty(transaction, payee, transferAcct) {
   let { amount } = transaction;
 
@@ -1043,7 +1040,9 @@ export class TransactionList extends Component {
         }
 
         sections.push({
-          id: transaction.date,
+          id: `${isPreviewId(transaction.id) ? 'preview/' : ''}${
+            transaction.date
+          }`,
           date: transaction.date,
           data: [],
         });

packages/desktop-client/src/util/versions.ts

@@ -1,3 +1,5 @@
+import * as Platform from 'loot-core/src/client/platform';
+
 function parseSemanticVersion(versionString): [number, number, number] {
   return versionString
     .replace('v', '')
@@ -15,18 +17,32 @@ function cmpSemanticVersion(
   return x[0] - y[0] || x[1] - y[1] || x[2] - y[2];
 }
 
-export async function getLatestVersion(): Promise<string> {
-  let response = await fetch(
-    'https://api.github.com/repos/actualbudget/actual/tags',
-  );
-  let json = await response.json();
-  let tags = json.map(t => t.name).concat([`v${window.Actual.ACTUAL_VERSION}`]);
-  tags.sort(cmpSemanticVersion);
+export async function getLatestVersion(): Promise<string | 'unknown'> {
+  if (Platform.isPlaywright) {
+    return Promise.resolve('v99.9.9');
+  }
+
+  try {
+    let response = await fetch(
+      'https://api.github.com/repos/actualbudget/actual/tags',
+    );
+    let json = await response.json();
+    let tags = json
+      .map(t => t.name)
+      .concat([`v${window.Actual.ACTUAL_VERSION}`]);
+    tags.sort(cmpSemanticVersion);
 
-  return tags[tags.length - 1];
+    return tags[tags.length - 1];
+  } catch {
+    // Rate limit exceeded? Or perhaps Github is down?
+    return 'unknown';
+  }
 }
 
 export async function getIsOutdated(latestVersion: string): Promise<boolean> {
   let clientVersion = window.Actual.ACTUAL_VERSION;
+  if (latestVersion === 'unknown') {
+    return Promise.resolve(false);
+  }
   return cmpSemanticVersion(clientVersion, latestVersion) < 0;
 }

packages/desktop-electron/package.json

@@ -44,19 +44,19 @@
   },
   "dependencies": {
     "electron-is-dev": "2.0.0",
-    "electron-log": "4.3.2",
-    "electron-updater": "4.3.8",
+    "electron-log": "4.4.8",
+    "electron-updater": "6.1.4",
     "get-port-please": "3.0.1",
     "loot-core": "*",
     "node-fetch": "^2.6.9",
     "promise-retry": "^2.0.1",
     "ws": "8.13.0"
   },
   "devDependencies": {
-    "@electron/notarize": "1.2.3",
-    "@electron/rebuild": "3.2.13",
+    "@electron/notarize": "2.1.0",
+    "@electron/rebuild": "3.3.0",
     "cross-env": "^7.0.3",
-    "electron": "24.1.3",
-    "electron-builder": "23.6.0"
+    "electron": "26.2.0",
+    "electron-builder": "24.6.4"
   }
 }