Skip to content

Commit 77ecf93

Browse files
authored
Merge branch 'master' into jfdoming/fix-send-types
2 parents 224063c + a974715 commit 77ecf93

File tree

254 files changed

+3356
-1865
lines changed

Some content is hidden

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

254 files changed

+3356
-1865
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
id: intro-md
1313
attributes:
1414
value: |
15-
**IMPORTANT:** we use Github Issues only for BUG REPORTS and FEATURE REQUESTS. If you are looking for help/support - please reach out to the [community on Discord](https://discord.gg/pRYNYr4W5A). All non-bug and non-feature-request issues will be closed.
15+
**IMPORTANT:** we use GitHub Issues only for BUG REPORTS and FEATURE REQUESTS. If you are looking for help/support - please reach out to the [community on Discord](https://discord.gg/pRYNYr4W5A). All non-bug and non-feature-request issues will be closed.
1616
1717
**Bank-sync problems (SimpleFin / GoCardless)?** Reach out via the [community Discord](https://discord.gg/pRYNYr4W5A) first and open an issue only if the community deems the issue to be a legitimate bug in Actual.
1818
- type: checkboxes

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ contact_links:
66
- name: Support
77
url: https://discord.gg/pRYNYr4W5A
88
about: Need help with something? Having troubles setting up? Or perhaps issues using the API? Reach out to the community on Discord.
9+
- name: Translations
10+
url: https://hosted.weblate.org/projects/actualbudget/actual/
11+
about: Found a string that needs a better translation? Add your suggestion or upvote an existing one in Weblate.

.github/actions/setup/action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ runs:
3838
repository: actualbudget/translations
3939
path: ${{ inputs.working-directory }}/packages/desktop-client/locale
4040
if: ${{ inputs.download-translations == 'true' }}
41+
- name: Remove untranslated languages
42+
run: packages/desktop-client/bin/remove-untranslated-languages
43+
shell: bash
44+
if: ${{ inputs.download-translations == 'true' }}

.github/workflows/i18n-string-extract-master.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
wlc \
4242
--url https://hosted.weblate.org/api/ \
4343
--key "${{ secrets.WEBLATE_API_KEY_CI_STRINGS }}" \
44-
pull \
44+
push \
4545
actualbudget/actual
4646
- name: Check out updated translations
4747
uses: actions/checkout@v4
@@ -69,6 +69,13 @@ jobs:
6969
else
7070
echo "No changes to commit"
7171
fi
72+
- name: Update Weblate with latest translations
73+
run: |
74+
wlc \
75+
--url https://hosted.weblate.org/api/ \
76+
--key "${{ secrets.WEBLATE_API_KEY_CI_STRINGS }}" \
77+
pull \
78+
actualbudget/actual
7279
7380
- name: Unlock translations
7481
if: always() # Clean up even on failure

.github/workflows/update-vrt.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ jobs:
7979
with:
8080
name: patch
8181
- name: Apply patch and push
82+
env:
83+
BRANCH_NAME: ${{ steps.comment-branch.outputs.head_ref }}
8284
run: |
8385
git config --global user.name "github-actions[bot]"
8486
git config --global user.email "github-actions[bot]@users.noreply.github.com"
@@ -89,7 +91,7 @@ jobs:
8991
exit 0
9092
fi
9193
git commit -m "Update VRT"
92-
git push origin HEAD:${{ steps.comment-branch.outputs.head_ref }}
94+
git push origin HEAD:${BRANCH_NAME}
9395
- name: Add finished reaction
9496
uses: dkershner6/reaction-action@v2
9597
with:

.yarnrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ compressionLevel: mixed
22

33
enableGlobalCache: false
44

5+
enableTransparentWorkspaces: false
6+
57
nodeLinker: node-modules
68

79
yarnPath: .yarn/releases/yarn-4.3.1.cjs

bin/package-browser

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ fi
1111
pushd packages/desktop-client/locale > /dev/null
1212
git pull
1313
popd > /dev/null
14+
packages/desktop-client/bin/remove-untranslated-languages
1415

1516
yarn workspace loot-core build:browser
1617
yarn workspace @actual-app/web build:browser

eslint.config.mjs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ export default [
113113
'packages/loot-core/**/node_modules/*',
114114
'packages/loot-core/**/lib-dist/*',
115115
'packages/loot-core/**/proto/*',
116+
'packages/sync-server',
116117
'.yarn/*',
117118
'.github/*',
118119
],
@@ -735,14 +736,19 @@ export default [
735736
'import/no-default-export': 'off',
736737
},
737738
},
739+
{
740+
files: ['packages/api/index.ts'],
741+
rules: {
742+
'import/no-unresolved': 'off',
743+
},
744+
},
738745
{},
739746
{
740747
// TODO: fix the issues in these files
741748
files: [
742749
'packages/desktop-client/src/components/accounts/Account.jsx',
743750
'packages/desktop-client/src/components/accounts/MobileAccount.jsx',
744751
'packages/desktop-client/src/components/accounts/MobileAccounts.jsx',
745-
'packages/desktop-client/src/components/App.tsx',
746752
'packages/desktop-client/src/components/budget/BudgetCategories.jsx',
747753
'packages/desktop-client/src/components/budget/BudgetSummaries.tsx',
748754
'packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx',

packages/api/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type {
88
import type { InitConfig } from 'loot-core/server/main';
99

1010
// @ts-ignore: bundle not available until we build it
11-
// eslint-disable-next-line import/extensions, import/no-unresolved
11+
// eslint-disable-next-line import/extensions
1212
import * as bundle from './app/bundle.api.js';
1313
import * as injected from './injected';
1414
import { validateNodeVersion } from './validateNodeVersion';

packages/api/methods.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,21 @@ export function addTransactions(
8585
});
8686
}
8787

88-
export function importTransactions(accountId, transactions) {
88+
export interface ImportTransactionsOpts {
89+
defaultCleared?: boolean;
90+
}
91+
92+
export function importTransactions(
93+
accountId,
94+
transactions,
95+
opts: ImportTransactionsOpts = {
96+
defaultCleared: true,
97+
},
98+
) {
8999
return send('api/transactions-import', {
90100
accountId,
91101
transactions,
102+
opts,
92103
});
93104
}
94105

0 commit comments

Comments
 (0)