diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml
index 36d510215f4..717d197c79f 100644
--- a/.github/workflows/electron.yml
+++ b/.github/workflows/electron.yml
@@ -36,6 +36,11 @@ jobs:
uses: ./.github/actions/setup
- name: Build Electron
run: ./bin/package-electron
+ env:
+ CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+ CSC_LINK: ${{ secrets.CSC_LINK }}
+ APPLE_ID: ${{ secrets.APPLE_ID }}
+ APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
- name: Upload Build
uses: actions/upload-artifact@v3
with:
diff --git a/.secret-tokens.example b/.secret-tokens.example
new file mode 100644
index 00000000000..1675ffbfd99
--- /dev/null
+++ b/.secret-tokens.example
@@ -0,0 +1,2 @@
+export APPLE_ID=example@email.com
+export APPLE_APP_SPECIFIC_PASSWORD=password
diff --git a/bin/package-electron b/bin/package-electron
index 0caece7e196..801a6c5e2fe 100755
--- a/bin/package-electron
+++ b/bin/package-electron
@@ -3,7 +3,6 @@
ROOT=`dirname $0`
RELEASE=""
-RELEASE_NOTES="" # TODO: figure out automation for release notes when we start publishing electron versions
CI=${CI:-false}
cd "$ROOT/.."
@@ -47,15 +46,13 @@ yarn workspace desktop-electron update-client
cd packages/desktop-electron;
yarn clean;
- export npm_config_better_sqlite3_binary_host="https://static.actualbudget.com/prebuild/better-sqlite3"
-
if [ "$RELEASE" == "production" ]; then
if [ -f ../../.secret-tokens ]; then
source ../../.secret-tokens
fi
- yarn build --publish always -c.releaseInfo.releaseNotes="$RELEASE_NOTES" --arm64 --x64
+ yarn build --publish never --arm64 --x64
- echo "\nCreated release with release notes \"$RELEASE_NOTES\""
+ echo "\nCreated release"
else
SKIP_NOTARIZATION=true yarn build --publish never --x64
fi
diff --git a/packages/api/package.json b/packages/api/package.json
index 0f4c7c5d413..7c2d9a01e5b 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -20,7 +20,7 @@
"test": "yarn run build:app && jest -c jest.config.js"
},
"dependencies": {
- "better-sqlite3": "^9.1.1",
+ "better-sqlite3": "^9.2.2",
"compare-versions": "^6.1.0",
"node-fetch": "^3.3.2",
"uuid": "^9.0.0"
diff --git a/packages/desktop-client/README.md b/packages/desktop-client/README.md
index 834b79b486a..2c6572f9fed 100644
--- a/packages/desktop-client/README.md
+++ b/packages/desktop-client/README.md
@@ -37,14 +37,15 @@ First start the dev server:
```sh
HTTPS=true yarn start
```
+
Next, navigate to the root of your project folder, run the standartised docker container, and launch the visual regression tests from within it.
```sh
# Run docker container
-docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.37.0-jammy /bin/bash
+docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.37.1-jammy /bin/bash
- # If you recieve an error such as "docker: invalid reference format", please instead use the following command:
- docker run --rm --network host -v ${pwd}:/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.37.0-jammy /bin/bash
+ # If you receive an error such as "docker: invalid reference format", please instead use the following command:
+ docker run --rm --network host -v ${pwd}:/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.37.1-jammy /bin/bash
# Run the VRT tests: important - they MUST be ran against a HTTPS server
E2E_START_URL=https://192.168.0.178:3001 yarn vrt
diff --git a/packages/desktop-client/e2e/onboarding.test.js-snapshots/Onboarding-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/onboarding.test.js-snapshots/Onboarding-checks-the-page-visuals-3-chromium-linux.png
index ed62336bdf9..32f89ebccab 100644
Binary files a/packages/desktop-client/e2e/onboarding.test.js-snapshots/Onboarding-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/onboarding.test.js-snapshots/Onboarding-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/onboarding.test.js-snapshots/Onboarding-checks-the-page-visuals-4-chromium-linux.png b/packages/desktop-client/e2e/onboarding.test.js-snapshots/Onboarding-checks-the-page-visuals-4-chromium-linux.png
index b3cea84a41e..0f71093688d 100644
Binary files a/packages/desktop-client/e2e/onboarding.test.js-snapshots/Onboarding-checks-the-page-visuals-4-chromium-linux.png and b/packages/desktop-client/e2e/onboarding.test.js-snapshots/Onboarding-checks-the-page-visuals-4-chromium-linux.png differ
diff --git a/packages/desktop-client/src/components/manager/WelcomeScreen.tsx b/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
index 564fc586717..9d13d9dd242 100644
--- a/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
+++ b/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
@@ -50,8 +50,8 @@ export function WelcomeScreen() {
Get started by importing an existing budget file from Actual or
- another budgeting app, or start fresh with an empty budget. You can
- always create or import another budget later.
+ another budgeting app, create a demo budget file, or start fresh with
+ an empty budget. You can always create or import another budget later.
-
+
+
+
+
);
diff --git a/packages/desktop-electron/about/index.js b/packages/desktop-electron/about/index.js
index 0286f1c41fc..06678cbbf30 100644
--- a/packages/desktop-electron/about/index.js
+++ b/packages/desktop-electron/about/index.js
@@ -20,7 +20,6 @@ root.innerHTML = `