Merge branch 'master' into calendar_report

actualbudget · Nov 7, 2024 · ae21d64 · ae21d64
2 parents b9ff5e5 + 2b72b2f
commit ae21d64
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/update-vrt.yml b/.github/workflows/update-vrt.yml
@@ -43,6 +43,9 @@ jobs:
           E2E_START_URL: ${{ steps.netlify.outputs.url }}
       - name: Create patch
         run: |
+          git config --system --add safe.directory "*"
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git reset
           git add "**/*.png"
           if git diff --staged --quiet; then
@@ -77,10 +80,9 @@ jobs:
           name: patch
       - name: Apply patch and push
         run: |
-          git apply Update-VRT.patch
-          git config --system --add safe.directory "*"
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git apply Update-VRT.patch
           git add "**/*.png"
           if git diff --staged --quiet; then
             echo "No changes to commit"

diff --git a/packages/desktop-client/src/components/modals/GoCardlessExternalMsgModal.tsx b/packages/desktop-client/src/components/modals/GoCardlessExternalMsgModal.tsx
@@ -42,7 +42,7 @@ function useAvailableBanks(country: string) {
 
       const { data, error } = await sendCatch('gocardless-get-banks', country);
 
-      if (error) {
+      if (error || !Array.isArray(data)) {
         setIsError(true);
         setBanks([]);
       } else {

diff --git a/upcoming-release-notes/3793.md b/upcoming-release-notes/3793.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [thraizz]
+---
+
+Handle unexpected response from GoCardless when getting banks.