From 602f5b6646cb97f61cbf5cef745fc9f5a47e6993 Mon Sep 17 00:00:00 2001
From: Florian Dupret <florian.dupret@gmail.com>
Date: Thu, 24 Sep 2020 19:42:12 +0200
Subject: [PATCH] Fix #3853

---
 app/Validation/FireflyValidator.php  |  4 ++--
 public/v1/js/ff/rules/create-edit.js | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index 03f5776832..ac23d6c935 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -328,8 +328,8 @@ class FireflyValidator extends Validator
         }
 
         // these trigger types need a simple strlen check:
-        $length = ['from_account_starts', 'from_account_ends', 'from_account_is', 'from_account_contains', 'to_account_starts', 'to_account_ends',
-                   'to_account_is', 'to_account_contains', 'description_starts', 'description_ends', 'description_contains', 'description_is', 'category_is',
+        $length = ['source_account_starts', 'source_account_ends', 'source_account_is', 'source_account_contains', 'destination_account_starts', 'destination_account_ends',
+                   'destination_account_is', 'destination_account_contains', 'description_starts', 'description_ends', 'description_contains', 'description_is', 'category_is',
                    'budget_is', 'tag_is', 'currency_is', 'notes_contain', 'notes_start', 'notes_end', 'notes_are',];
         if (in_array($triggerType, $length, true)) {
             return '' !== $value;
diff --git a/public/v1/js/ff/rules/create-edit.js b/public/v1/js/ff/rules/create-edit.js
index 89d590b68a..033307577e 100644
--- a/public/v1/js/ff/rules/create-edit.js
+++ b/public/v1/js/ff/rules/create-edit.js
@@ -303,14 +303,14 @@ function updateTriggerInput(selectList) {
     inputResult.prop('disabled', false);
     inputResult.prop('type', 'text');
     switch (selectList.val()) {
-        case 'from_account_starts':
-        case 'from_account_ends':
-        case 'from_account_is':
-        case 'from_account_contains':
-        case 'to_account_starts':
-        case 'to_account_ends':
-        case 'to_account_is':
-        case 'to_account_contains':
+        case 'source_account_starts':
+        case 'source_account_ends':
+        case 'source_account_is':
+        case 'source_account_contains':
+        case 'destination_account_starts':
+        case 'destination_account_ends':
+        case 'destination_account_is':
+        case 'destination_account_contains':
             console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
             createAutoComplete(inputResult, 'api/v1/autocomplete/accounts');
             break;