Merge branch '3.x' into bump-dependencies

app/Filament/Company/Clusters/Settings/Pages/Localization.php

@@ -215,13 +215,15 @@ class Localization extends Page
             'time_format',
         ];
 
-        if ($record->isDirty($keysToWatch)) {
+        $isDirty = $record->isDirty($keysToWatch);
+
+        $record->save();
+
+        if ($isDirty) {
             CompanySettingsService::invalidateSettings($record->company_id);
             $this->dispatch('localizationUpdated');
         }
 
-        $record->save();
-
         return $record;
     }
 

app/Listeners/ConfigureCompanyDefault.php

@@ -27,8 +27,6 @@ class ConfigureCompanyDefault
 
         app()->setLocale($settings['default_language']);
         locale_set_default($settings['default_language']);
-        config(['app.timezone' => $settings['default_timezone']]);
-        date_default_timezone_set($settings['default_timezone']);
 
         Filament::getPanel('company')
             ->brandName($company->name);