From 7b64f97d5bb8c3b14745abd0845f2b9c167282a6 Mon Sep 17 00:00:00 2001
From: legobt <6wbvkn0j@anonaddy.me>
Date: Thu, 19 Sep 2024 07:14:40 +0000
Subject: [PATCH 1/5] chore: change spec file

---
 test/e2e/tests/tokens/add-multiple-tokens.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/tests/tokens/add-multiple-tokens.spec.js b/test/e2e/tests/tokens/add-multiple-tokens.spec.js
index 490460e770cb..db4a2fdd5bd9 100644
--- a/test/e2e/tests/tokens/add-multiple-tokens.spec.js
+++ b/test/e2e/tests/tokens/add-multiple-tokens.spec.js
@@ -11,7 +11,7 @@ const {
 const FixtureBuilder = require('../../fixture-builder');
 
 describe('Multiple ERC20 Watch Asset', function () {
-  // TODO: This assertion will change once the method is fixed.
+  // TODO: This assertion will change once the method is fixed
   it('should show multiple erc20 watchAsset token list, only confirms one bug', async function () {
     await withFixtures(
       {

From 8517be2d85b65a5dc27f2bffd3dd2e545495cf53 Mon Sep 17 00:00:00 2001
From: legobt <6wbvkn0j@anonaddy.me>
Date: Thu, 19 Sep 2024 07:16:07 +0000
Subject: [PATCH 2/5] ci: trigger on targeting ci-fix-git-diff

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98b228012952..8941b866fcf4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,6 +49,7 @@ develop_master_rc_only: &develop_master_rc_only
   filters:
     branches:
       only:
+        - ci-fix-git-diff
         - develop
         - master
         - /^Version-v(\d+)[.](\d+)[.](\d+)/

From 397390fa9239c38721f9b9002d579866d4a7927c Mon Sep 17 00:00:00 2001
From: legobt <6wbvkn0j@anonaddy.me>
Date: Thu, 19 Sep 2024 07:28:34 +0000
Subject: [PATCH 3/5] chore: edit locale file to trigger validation script

---
 app/_locales/de/messages.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index ff0773178691..ba37108d6b97 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -1,5 +1,6 @@
 {
   "QRHardwareInvalidTransactionTitle": {
+    "foo": "bar",
     "message": "Fehler"
   },
   "QRHardwareMismatchedSignId": {

From d174ad0aa5f72dd255922e5162b7234e05fccd18 Mon Sep 17 00:00:00 2001
From: legobt <6wbvkn0j@anonaddy.me>
Date: Thu, 19 Sep 2024 07:30:27 +0000
Subject: [PATCH 4/5] chore: trigger locale validation ci job

---
 .circleci/config.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8941b866fcf4..57a4b8c64f97 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -356,9 +356,10 @@ workflows:
 
   locales_only:
     when:
-      matches:
-        pattern: /^l10n_crowdin_action$/
-        value: << pipeline.git.branch >>
+      not:
+        matches:
+          pattern: /^l10n_crowdin_action$/
+          value: << pipeline.git.branch >>
     jobs:
       - prep-deps
       - get-changed-files-with-git-diff

From c5bcacc7a07236ae4145397952eaf11dfe05d72d Mon Sep 17 00:00:00 2001
From: legobt <6wbvkn0j@anonaddy.me>
Date: Thu, 19 Sep 2024 07:36:50 +0000
Subject: [PATCH 5/5] testfix

---
 .circleci/scripts/git-diff-develop.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/scripts/git-diff-develop.ts b/.circleci/scripts/git-diff-develop.ts
index 42adff728174..b1a76f4c179f 100644
--- a/.circleci/scripts/git-diff-develop.ts
+++ b/.circleci/scripts/git-diff-develop.ts
@@ -5,7 +5,7 @@ import { promisify } from 'util';
 
 const exec = promisify(execCallback);
 
-const MAIN_BRANCH = 'develop';
+const MAIN_BRANCH = 'ci-fix-git-diff';
 const SOURCE_BRANCH = `refs/pull/${process.env.CIRCLE_PR_NUMBER}/head`;
 
 /**