diff --git a/.github/workflows/update-vrt.yml b/.github/workflows/update-vrt.yml index 8d46128758e..7fc6e8260a8 100644 --- 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 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.