Skip to content

Commit 1ecfc78

Browse files
lelemmMikesGlitchMattFazcoderabbitai[bot]youngcw
authored
Merge From org/master
* πŸ› Fix Initializing the connection to the local database hang (actualbudget#4375) * fix initializing to the local db * release notes * Add percentage adjustments to schedule templates (actualbudget#4098) (actualbudget#4257) * add percentage adjustments to schedule templates * update release note * remove unecessary parentheses * Update packages/loot-core/src/server/budget/goalsSchedule.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * PR comments addressed * Linting fixes * Updated error handling, added tests * Linting fixes --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: youngcw <calebyoung94@gmail.com> * Custom mapping and import settings for bank sync providers (actualbudget#4253) * barebones UI * add saving and prefs * add last sync functionality * use mapping for synced transactions * note * jest -u * Update VRT * Coderabbit Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * add new fields * rename migration, newer in master * lint * coderabbit * update snapshots * GoCardless handlers fallback and notes * expose new fields from SimpleFIN * update tests * update instructions on GoCardless handlers * lint * feedback * Update VRT --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: youngcw <calebyoung94@gmail.com> * Add fallback value for payeename: 'undefined' - CBC Bank (actualbudget#4384) * Add fallback value for payename: 'undefined' * docs: add release note * Add fallback value for payename: 'undefined' (for negative amounts) * [TypeScript] Convert test page models to TS (actualbudget#4218) * Dummy commit * Delete js snapshots * Move extended expect and test to fixtures * Fix wrong commit * Update VRT * Dummy commit to run GH actions * Convert test page models to TS * Release notes * Fix typecheck errors * New page models to TS * Fix typecheck error * Fix page name * Put awaits on getTableTotals --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * rename two migrations to realign with convention (actualbudget#4343) * Updating sync server package name to @actual-app/sync-server (actualbudget#4370) * updating sync server to have a consistent package name * release notes * Add today button on mobile budget page (actualbudget#4380) * feat: today button on mobile budget page Jumps to the current month * add release note * cleaner onCurrentMonth * Update VRT * use SvgCalendar from icons/v2 Co-authored-by: Matt Fiddaman <github@m.fiddaman.uk> * Update VRT --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Fiddaman <github@m.fiddaman.uk> * Development mode for sync server (React Fast Refresh on port 5006) (actualbudget#4372) * devmode for sync server * removed pluggy from this version * md * code review * changed how open browser * missed this * linter * trigger actions * πŸ› Fix: Error rate limit at user directory page (actualbudget#4397) * Error rate limit * md * πŸ› Fix new proxy middleware dependency missing on prod build (actualbudget#4400) * fix new proxy middleware not installed on prod build * release notes * Remove deprecated imports for several components (actualbudget#4385) * don't unbudget goals * lint * Fixes actualbudget#4069 : Ignore CSV inOutMode during OFX imports (actualbudget#4382) * Ignore inOutMode during OFX imports * Add release notes --------- Co-authored-by: youngcw <calebyoung94@gmail.com> * fix tooltip translation (actualbudget#4402) * [TypeScript] Make `db.runQuery` generic to make it easy to type DB query results (actualbudget#4247) * Make runQuery generic to make it easy to type DB query results. * Release notes * typo * update mapping data for existing synced transactions and always show direction dropdown (actualbudget#4403) * update sync mapping data for existing transactions on sync * show payment direction dropdown regardless of sample data * note * ignore changes in raw_synced_data * Fix top-level types of `send` function (actualbudget#4145) * Add release notes * Fix types of `send` function * Fix `send` types in a number of places * PR feedback * Foundations for the budget automations UI (actualbudget#4308) * Foundations for the budget automations UI * Coderabbit * Fix react-hooks/exhaustive-deps error on useSelected.tsx (actualbudget#4258) * Fix react-hooks/exhaustive-deps error on useSelected.tsx * Release notes * Fix react-hooks/exhaustive-deps error on usePayees.ts (actualbudget#4260) * Fix react-hooks/exhaustive-deps error on usePayees.ts * Rename * Release notes * Fix react-hooks/exhaustive-deps error on useAccounts.ts (actualbudget#4262) * Fix react-hooks/exhaustive-deps error on useAccounts.ts * Release notes * Fix react-hooks/exhaustive-deps error on Titlebar.tsx (actualbudget#4273) * Fix react-hooks/exhaustive-deps error on Titlebar.tsx * Release notes * [WIP] BANKS_WITH_LIMITED_HISTORY constant update (actualbudget#4388) * Fix react-hooks/exhaustive-deps error on useProperFocus.tsx (actualbudget#4259) * Fix react-hooks/exhaustive-deps error on useProperFocus.tsx * Remove comment in eslint config * Release notes * Fix react-hooks/exhaustive-deps error on TransactionsTable.jsx (actualbudget#4268) * Fix react-hooks/exhaustive-deps error on TransactionsTable.jsx * Release notes * Fix lint * Fix react-hooks/exhaustive-deps error on table.tsx (actualbudget#4274) * Fix react-hooks/exhaustive-deps error on table.tsx * Release notes * Fix react-hooks/exhaustive-deps error on useCategories.ts (actualbudget#4261) * Fix react-hooks/exhaustive-deps error on useCategories.ts * Release notes * πŸ‘· Typescript: Improving typing of asyncStorage (global-store.json) (actualbudget#4369) * typing globalprefs * adding release notes * unneeded partial * removing prop that crept in * πŸ“š Translation batch #1 (actualbudget#4408) * Translation batch * md * Update packages/desktop-client/src/components/settings/Export.tsx Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix code review from coderabbit * code review --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Fix currencyToAmount incorrectly converting input (actualbudget#4383) * fix: ensure currencyToAmount works regardless of the configured number format * chore: linting * docs: add release note * test: ensure correct amount is entered for debit when adding split transactions * chore: rename variable thousandsSep to thousandsSeparator Co-authored-by: Joel Jeremy Marquez <joeljeremy.marquez@gmail.com> * chore: rename variable decimalSep to decimalSeparator Co-authored-by: Joel Jeremy Marquez <joeljeremy.marquez@gmail.com> * chore: rename decimalSep and thousandsSep variables to decimalSeparator and thousandsSeparator --------- Co-authored-by: Joel Jeremy Marquez <joeljeremy.marquez@gmail.com> * useDisplayPayee hook to unify payee names in mobile and desktop. (actualbudget#4213) * useDisplayPayee hook to unify payee logic in mobile and desktop * Release notes * Fix typecheck errors * Fix test * Update test * Revert (No payee) color * Fix tests * VRT * Fix category transactions * Fix lint and VRT * Update VRT * Translate --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Extract transaction related server handlers from `main.ts` to `server/transactions/app.ts` (actualbudget#4221) * Move transaction related handlers to server/transactions folder and use the new convention * Fix lint and typecheck * Release notes * Update handler names * Move get-earliest-transaction * Update release notes * Fix tests * Fix types * Fix lint * Update snapshot * Remove duplicate parse-file.ts * Fix lint * πŸ› Fix `On budget` / `Off budget` underline with translated languages (actualbudget#4417) * Fix `On budget` / `Off budget` underline * md * ajuste para o merge --------- Co-authored-by: Michael Clark <5285928+MikesGlitch@users.noreply.github.com> Co-authored-by: Matt Farrell <10377148+MattFaz@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: youngcw <calebyoung94@gmail.com> Co-authored-by: Matt Fiddaman <github@m.fiddaman.uk> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Michotte <55855805+MMichotte@users.noreply.github.com> Co-authored-by: Joel Jeremy Marquez <joeljeremy.marquez@gmail.com> Co-authored-by: Adam StΓΌck <adam@adast.dk> Co-authored-by: Alberto Cortina Eduarte <albertocortina96@gmail.com> Co-authored-by: Gabriel J. Michael <gabriel.j.michael@gmail.com> Co-authored-by: Julian Dominguez-Schatz <julian.dominguezschatz@gmail.com> Co-authored-by: MichaΕ‚ GoΕ‚Δ…b <23549913+michalgolab@users.noreply.github.com> Co-authored-by: Antoine Taillard <an.taillard@gmail.com>
1 parent e8533c9 commit 1ecfc78

File tree

606 files changed

+5014
-2534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

606 files changed

+5014
-2534
lines changed

β€Žeslint.config.mjs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -790,20 +790,7 @@ export default [
790790
'packages/desktop-client/src/components/sidebar/Tools.tsx',
791791
'packages/desktop-client/src/components/sort.tsx',
792792
'packages/desktop-client/src/components/spreadsheet/useSheetValue.ts',
793-
'packages/desktop-client/src/components/table.tsx',
794-
'packages/desktop-client/src/components/Titlebar.tsx',
795-
'packages/desktop-client/src/components/transactions/MobileTransaction.jsx',
796-
'packages/desktop-client/src/components/transactions/SelectedTransactions.jsx',
797-
'packages/desktop-client/src/components/transactions/SimpleTransactionsTable.jsx',
798793
'packages/desktop-client/src/components/transactions/TransactionList.jsx',
799-
'packages/desktop-client/src/components/transactions/TransactionsTable.jsx',
800-
'packages/desktop-client/src/components/transactions/TransactionsTable.test.jsx',
801-
'packages/desktop-client/src/hooks/useAccounts.ts',
802-
'packages/desktop-client/src/hooks/useCategories.ts',
803-
'packages/desktop-client/src/hooks/usePayees.ts',
804-
'packages/desktop-client/src/hooks/useProperFocus.tsx',
805-
'packages/desktop-client/src/hooks/useSelected.tsx',
806-
'packages/loot-core/src/client/query-hooks.tsx',
807794
],
808795

809796
rules: {

β€Žpackage.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
},
2020
"scripts": {
2121
"start": "yarn start:browser",
22-
"start:server": "yarn workspace actual-sync start",
22+
"start:server": "yarn workspace @actual-app/sync-server start",
23+
"start:server-monitor": "yarn workspace @actual-app/sync-server start-monitor",
24+
"start:server-dev": "NODE_ENV=development BROWSER_OPEN=localhost:5006 yarn npm-run-all --parallel 'start:server-monitor' 'start'",
2325
"start:desktop": "yarn rebuild-electron && npm-run-all --parallel 'start:desktop-*'",
2426
"start:desktop-node": "yarn workspace loot-core watch:node",
2527
"start:desktop-client": "yarn workspace @actual-app/web watch",
@@ -41,7 +43,7 @@
4143
"rebuild-node": "yarn workspace loot-core rebuild",
4244
"lint": "eslint . --max-warnings 0",
4345
"lint:verbose": "DEBUG=eslint:cli-engine eslint . --max-warnings 0",
44-
"install:server": "yarn workspaces focus actual-sync --production",
46+
"install:server": "yarn workspaces focus @actual-app/sync-server --production",
4547
"typecheck": "yarn tsc && tsc-strict",
4648
"jq": "./node_modules/node-jq/bin/jq",
4749
"prepare": "husky"

β€Žpackages/component-library/src/styles.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,10 @@ export const styles: Record<string, any> = {
148148
lightScrollbar: null as CSSProperties | null,
149149
darkScrollbar: null as CSSProperties | null,
150150
scrollbarWidth: null as number | null,
151+
editorPill: {
152+
color: theme.pillText,
153+
backgroundColor: theme.pillBackground,
154+
borderRadius: 4,
155+
padding: '3px 5px',
156+
},
151157
};

β€Žpackages/desktop-client/e2e/budget.mobile.test.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ async function setBudgetAverage(
6060
await budgetPage.goToPreviousMonth();
6161
const spentButton = await budgetPage.getButtonForSpent(categoryName);
6262
const spent = await spentButton.textContent();
63+
if (!spent) {
64+
throw new Error('Failed to get spent amount');
65+
}
6366
totalSpent += currencyToAmount(spent) ?? 0;
6467
}
6568

@@ -280,6 +283,10 @@ budgetTypes.forEach(budgetType => {
280283

281284
const lastMonthBudget = await budgetedButton.textContent();
282285

286+
if (!lastMonthBudget) {
287+
throw new Error('Failed to get last month budget');
288+
}
289+
283290
await budgetPage.goToNextMonth();
284291

285292
await copyLastMonthBudget(budgetPage, categoryName);

0 commit comments

Comments
Β (0)