diff --git a/app/View/Components/Layout/Flash.php b/app/View/Components/Layout/Flash.php
new file mode 100644
index 0000000000..30825a3e8c
--- /dev/null
+++ b/app/View/Components/Layout/Flash.php
@@ -0,0 +1,32 @@
+invalidMonetaryLocale = $invalidMonetaryLocale;
+ $this->upgradeSecurityMessage = $upgradeSecurityMessage;
+ $this->upgradeSecurityLevel = $upgradeSecurityLevel;
+ }
+
+ /**
+ * Get the view / contents that represent the component.
+ */
+ public function render(): View | Closure | string
+ {
+ return view('components.layout.flash');
+ }
+}
diff --git a/app/View/Components/Layout/Tracking.php b/app/View/Components/Layout/Tracking.php
new file mode 100644
index 0000000000..bbe1706917
--- /dev/null
+++ b/app/View/Components/Layout/Tracking.php
@@ -0,0 +1,26 @@
+
+ {{ __('firefly.invalid_server_configuration') }}: {!! __('firefly.invalid_locale_settings') !!}
+
+
+@endif
+
+{{-- MANDATORY UPDATE MESSAGE --}}
+@if('' !== $upgradeSecurityLevel && '' !== $upgradeSecurityMessage)
+
+ {{ __('firefly.flash_' . $upgradeSecurityLevel) }} {{ $upgradeSecurityMessage }}
+
+@endif
+
+{{-- SUCCESS MESSAGE (ALWAYS SINGULAR) --}}
+@if(\Illuminate\Support\Facades\Session::has('success'))
+
+@endif
+
+{{-- INFO MESSAGE (CAN BE MULTIPLE) --}}
+@if(\Illuminate\Support\Facades\Session::has('info'))
+
+ {{-- MULTIPLE INFO MESSAGE --}}
+ @if(!is_string(session('info')) && is_iterable(session('info') && count(session('info')) > 1))
+
+ {{ \Illuminate\Support\Facades\Lang::choice('firefly.flash_info_multiple', count(session('info')), ['count' => count(session('info'))]) }}
+ :
+
+ @foreach(session('info') as $item)
+ - {{ $item }}
+ @endforeach
+
+ @endif
+ {{-- SET OF MULTIPLE INFO MESSAGES, BUT THERE IS JUST ONE --}}
+ @if(!is_string(session('info')) && is_iterable(session('info') && 1 === count(session('info'))))
+
{{ __('firefly.flash_info') }}: {{ session('info')[0] }}
+ @endif
+ {{-- SINGLE INFO MESSAGE --}}
+ @if(is_string(session('info')) && !is_iterable(session('info')))
+ @if(\Illuminate\Support\Facades\Session::has('info_url'))
+
+ @endif
+ {{ __('firefly.flash_info') }}: {{ session('info') }}
+ @if(\Illuminate\Support\Facades\Session::has('info'))
+
+ @endif
+ @endif
+
+
+
+@endif
+
+{{-- WARNING MESSAGE (ALWAYS SINGULAR) --}}
+@if(\Illuminate\Support\Facades\Session::has('warning'))
+
+ {{ __('firefly.flash_warning') }} {{ session('warning') }}
+
+
+@endif
+
+{{-- ERROR MESSAGE (CAN BE MULTIPLE) --}}
+@if(\Illuminate\Support\Facades\Session::has('error'))
+
+ {{-- MULTIPLE ERRORS (BAD) --}}
+ @if(!is_string(session('error')) && is_iterable(session('error') && count(session('error')) > 1))
+
+ {{ \Illuminate\Support\Facades\Lang::choice('firefly.flash_error_multiple', count(session('error')), ['count' => session('error')]) }}:
+
+
+ @foreach(session('error') as $item)
+ - {{ $item }}
+ @endforeach
+
+ @endif
+
+ {{-- SET OF MULTIPLE ERRORS, BUT THERE IS JUST ONE --}}
+ @if(!is_string(session('error')) && is_iterable(session('error') && 1 === count(session('error'))))
+
{{ __('firefly.flash_error') }}
+ {{ session('error')[0] }}
+ @endif
+
+ {{-- SINGLE ERROR --}}
+ @if(is_string(session('error')) && !is_iterable(session('error')))
+
{{ __('firefly.flash_error') }} {{ session('error') }}
+ @endif
+
+
+@endif
+
diff --git a/resources/views/components/layout/sidebar.blade.php b/resources/views/components/layout/sidebar.blade.php
index dfcb2f13b9..48ba71200d 100644
--- a/resources/views/components/layout/sidebar.blade.php
+++ b/resources/views/components/layout/sidebar.blade.php
@@ -7,23 +7,20 @@
id="navigation"
x-data="sidebar"
>
-
-
- TODO SEARCH
-
- {{--
-