Code improvements

app/Providers/GlobalDataProvider.php

@@ -22,7 +22,7 @@ class GlobalDataProvider {
     private ?User $user;
 
     public function __invoke() {
-        $this->user = auth()->user();
+        $this->user = currentUser();
 
         $canAccessAdmin = false;
         $isMainAdmin = false;
@@ -38,7 +38,7 @@ class GlobalDataProvider {
         return response()->json([
             'user' => null !== $this->user ? new UserResource($this->user)->toArray(request()) : null,
             'navbar' => $this->generateNavbar(),
-            'tenant' => app('tenant'),
+            'tenant' => currentTenant(),
             'activeUsers' => $this->getActiveUsers(),
             'version' => config('app.version'),
             'currentEvent' => $this->getCurrentEventData(),
@@ -189,8 +189,8 @@ class GlobalDataProvider {
         $activeUsers = [];
         $conditions = ['active' => true];
 
-        if (app('tenant')->slug !== 'lv') {
-            $conditions['local_group'] = app('tenant')->slug;
+        if (currentTenant()->slug !== 'lv') {
+            $conditions['local_group'] = currentTenant()->slug;
         }
 
         foreach ($rawUsers = User::where($conditions)->get() as $user) {