Rebuild new layout.

app/Support/Binder/EitherConfigKey.php

@@ -38,7 +38,8 @@ class EitherConfigKey
         'firefly.accountRoles',
         'firefly.valid_liabilities',
         'firefly.interest_periods',
-        'firefly.enable_external_map'
+        'firefly.enable_external_map',
+        'firefly.expected_source_types'
     ];
     /**
      * @param string $value

app/Support/Http/Controllers/RenderPartialViews.php

@@ -72,9 +72,6 @@ trait RenderPartialViews
             Log::error(sprintf('Could not render: %s', $e->getMessage()));
             $view = 'Firefly III could not render the view. Please see the log files.';
         }
-
-
-
         return $view;
     }
 
@@ -95,9 +92,6 @@ trait RenderPartialViews
             Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
             $result = 'Could not render view.';
         }
-
-
-
         return $result;
     }
 
@@ -128,9 +122,6 @@ trait RenderPartialViews
             Log::error(sprintf('Could not render: %s', $e->getMessage()));
             $view = 'Firefly III could not render the view. Please see the log files.';
         }
-
-
-
         return $view;
     }
 
@@ -178,9 +169,6 @@ trait RenderPartialViews
             Log::error(sprintf('Cannot render reports.options.category: %s', $e->getMessage()));
             $result = 'Could not render view.';
         }
-
-
-
         return $result;
     }
 
@@ -221,9 +209,6 @@ trait RenderPartialViews
             Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
             $result = 'Could not render view.';
         }
-
-
-
         return $result;
     }
 
@@ -256,9 +241,6 @@ trait RenderPartialViews
             Log::error(sprintf('Could not render: %s', $e->getMessage()));
             $view = 'Firefly III could not render the view. Please see the log files.';
         }
-
-
-
         return $view;
     }
 
@@ -380,9 +362,6 @@ trait RenderPartialViews
             Log::error(sprintf('Could not render: %s', $e->getMessage()));
             $view = 'Firefly III could not render the view. Please see the log files.';
         }
-
-
-
         return $view;
     }
 
@@ -400,9 +379,6 @@ trait RenderPartialViews
             Log::error(sprintf('Cannot render reports.options.no-options: %s', $e->getMessage()));
             $result = 'Could not render view.';
         }
-
-
-
         return $result;
     }
 
@@ -424,9 +400,6 @@ trait RenderPartialViews
             Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
             $result = 'Could not render view.';
         }
-
-
-
         return $result;
     }
 }

app/Support/Request/ConvertsDataTypes.php

@@ -34,15 +34,16 @@ use Log;
 trait ConvertsDataTypes
 {
     /**
-     * Remove weird chars from strings.
+     * @param string|null $string
+     * @param bool        $keepNewlines
      *
-     * @param string $string
-     * @param bool   $keepNewlines
-     *
-     * @return string
+     * @return string|null
      */
-    public function clearString(string $string, bool $keepNewlines = true): string
+    public function clearString(?string $string, bool $keepNewlines = true): ?string
     {
+        if(null === $string) {
+            return null;
+        }
         $search       = [
             "\u{0001}", // start of heading
             "\u{0002}", // start of text