From 8eafa1e741bc8c6d3bc3daaad0811ad0ed992ddb Mon Sep 17 00:00:00 2001 From: "A. Schueler" Date: Thu, 7 Nov 2024 16:01:37 +0100 Subject: [PATCH 1/4] fix: check gocardless bank data before setting state (#3793) --- .../src/components/modals/GoCardlessExternalMsgModal.tsx | 2 +- upcoming-release-notes/3793.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 upcoming-release-notes/3793.md diff --git a/packages/desktop-client/src/components/modals/GoCardlessExternalMsgModal.tsx b/packages/desktop-client/src/components/modals/GoCardlessExternalMsgModal.tsx index 37d4913f224..d2b3730d5a9 100644 --- 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 new file mode 100644 index 00000000000..ee9ad3ea9d0 --- /dev/null +++ b/upcoming-release-notes/3793.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [thraizz] +--- + +Handle unexpected response from GoCardless when getting banks. From f14b160e5c43cb64e09cfb3948f8ae774c806103 Mon Sep 17 00:00:00 2001 From: Koen van Staveren Date: Thu, 7 Nov 2024 16:29:31 +0100 Subject: [PATCH 2/4] [WIP] Update update-vrt.yml (#3798) --- .github/workflows/update-vrt.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-vrt.yml b/.github/workflows/update-vrt.yml index 8d46128758e..8598e0f42f0 100644 --- a/.github/workflows/update-vrt.yml +++ b/.github/workflows/update-vrt.yml @@ -43,6 +43,7 @@ jobs: E2E_START_URL: ${{ steps.netlify.outputs.url }} - name: Create patch run: | + git config --system --add safe.directory "*" git reset git add "**/*.png" if git diff --staged --quiet; then @@ -77,8 +78,8 @@ jobs: name: patch - name: Apply patch and push run: | - git apply Update-VRT.patch git config --system --add safe.directory "*" + git apply Update-VRT.patch git config --global user.name "github-actions[bot]" git config --global user.email "github-actions[bot]@users.noreply.github.com" git add "**/*.png" From 985b653a87616246342c7f4bc32d8e32a2f79663 Mon Sep 17 00:00:00 2001 From: Koen van Staveren Date: Thu, 7 Nov 2024 16:44:19 +0100 Subject: [PATCH 3/4] Update update-vrt.yml (#3799) --- .github/workflows/update-vrt.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-vrt.yml b/.github/workflows/update-vrt.yml index 8598e0f42f0..0b33d056e7c 100644 --- a/.github/workflows/update-vrt.yml +++ b/.github/workflows/update-vrt.yml @@ -44,6 +44,8 @@ jobs: - 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 @@ -79,9 +81,9 @@ jobs: - name: Apply patch and push run: | git config --system --add safe.directory "*" - git apply Update-VRT.patch 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" From 2b72b2f2f2f983025a44775bdf43ed1dced03715 Mon Sep 17 00:00:00 2001 From: Koen van Staveren Date: Thu, 7 Nov 2024 17:03:15 +0100 Subject: [PATCH 4/4] Update update-vrt.yml (#3800) --- .github/workflows/update-vrt.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update-vrt.yml b/.github/workflows/update-vrt.yml index 0b33d056e7c..7fc6e8260a8 100644 --- a/.github/workflows/update-vrt.yml +++ b/.github/workflows/update-vrt.yml @@ -80,7 +80,6 @@ jobs: name: patch - name: Apply patch and push 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 apply Update-VRT.patch