diff --git a/app/Providers/JetstreamServiceProvider.php b/app/Providers/JetstreamServiceProvider.php index fd30cc9..befc775 100644 --- a/app/Providers/JetstreamServiceProvider.php +++ b/app/Providers/JetstreamServiceProvider.php @@ -5,10 +5,7 @@ declare(strict_types=1); namespace App\Providers; use App\Actions\Jetstream\DeleteUser; -use Illuminate\Support\Arr; -use Illuminate\Support\Facades\Config; use Illuminate\Support\ServiceProvider; -use Laravel\Jetstream\Features; use Laravel\Jetstream\Jetstream; class JetstreamServiceProvider extends ServiceProvider @@ -30,14 +27,6 @@ class JetstreamServiceProvider extends ServiceProvider $this->configurePermissions(); Jetstream::deleteUsersUsing(DeleteUser::class); - - if (config('investbrain.self_hosted', false)) { - - Config::set( - 'jetstream.features', - array_keys(Arr::except(array_values(config('jetstream.features')), Features::termsAndPrivacyPolicy())) - ); - } } /** diff --git a/config/jetstream.php b/config/jetstream.php index ed11e49..8eee1d6 100644 --- a/config/jetstream.php +++ b/config/jetstream.php @@ -60,10 +60,9 @@ return [ */ 'features' => [ - Features::termsAndPrivacyPolicy(), + ! env('SELF_HOSTED', true) ? Features::termsAndPrivacyPolicy() : null, Features::profilePhotos(), Features::api(), - // Features::teams(['invitations' => true]), Features::accountDeletion(), ], diff --git a/resources/views/profile/update-profile-information-form.blade.php b/resources/views/profile/update-profile-information-form.blade.php index 5bc2028..a98ee87 100644 --- a/resources/views/profile/update-profile-information-form.blade.php +++ b/resources/views/profile/update-profile-information-form.blade.php @@ -67,7 +67,11 @@
- @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::emailVerification()) && ! $this->user->hasVerifiedEmail()) + @if ( + ! config('investbrain.self_hosted') + && Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::emailVerification()) + && ! $this->user->hasVerifiedEmail() + )

{{ __('Your email address is unverified.') }}