diff --git a/app/Livewire/Project/Shared/Danger.php b/app/Livewire/Project/Shared/Danger.php
index 1fe7ec21a..85eeb8249 100644
--- a/app/Livewire/Project/Shared/Danger.php
+++ b/app/Livewire/Project/Shared/Danger.php
@@ -3,6 +3,9 @@
 namespace App\Livewire\Project\Shared;
 
 use App\Jobs\DeleteResourceJob;
+use App\Models\Service;
+use App\Models\ServiceDatabase;
+use App\Models\ServiceApplication;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 use Illuminate\Support\Facades\Hash;
@@ -11,36 +14,48 @@ use Illuminate\Support\Facades\Auth;
 class Danger extends Component
 {
     public $resource;
-
+    public $service;
+    public $resourceName;
     public $projectUuid;
-
     public $environmentName;
-
     public bool $delete_configurations = true;
-
     public bool $delete_volumes = true;
-
     public bool $docker_cleanup = true;
-
     public bool $delete_connected_networks = true;
-
     public ?string $modalId = null;
+    public string $resourceDomain = '';
 
     public function mount()
     {
-        $this->modalId = new Cuid2;
         $parameters = get_route_parameters();
+        $this->modalId = new Cuid2;
         $this->projectUuid = data_get($parameters, 'project_uuid');
         $this->environmentName = data_get($parameters, 'environment_name');
+        
+        // Determine the resource name based on the available properties
+        if ($this->resource) {
+            $this->resourceName = $this->resource->name ?? 'Resource';
+        } elseif ($this->service) {
+            $this->resourceName = $this->service->name ?? 'Service'; //this does not get the name of the service
+        } else {
+            $this->resourceName = 'Unknown Resource'; //service is here?
+        }
+
+        ray($this->resourceName);
     }
 
-    public function delete($selectedActions, $password)
+    public function delete($password)
     {
         if (!Hash::check($password, Auth::user()->password)) {
             $this->addError('password', 'The provided password is incorrect.');
             return;
         }
 
+        if (!$this->resource) {
+            $this->addError('resource', 'Resource not found.');
+            return;
+        }
+
         try {
             // $this->authorize('delete', $this->resource);
             $this->resource->delete();
@@ -60,4 +75,9 @@ class Danger extends Component
             return handleError($e, $this);
         }
     }
+
+    public function render()
+    {
+        return view('livewire.project.shared.danger');
+    }
 }
diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index 44a1d5d93..1a20b72d8 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -11,7 +11,7 @@
 'checkboxActions' => [],
 'actions' => [],
 'confirmWithText' => true,
-'confirmText' => 'DELETE',
+'confirmText' => 'Confirm Deletion',
 'confirmWithPassword' => true,
 'step1ButtonText' => 'Continue Deletion',
 'step2ButtonText' => 'Delete Permanently',
@@ -49,9 +49,9 @@
     step3ButtonText: @js($step3ButtonText),
     executeAction() {
         if (this.confirmWithPassword) {
-            $wire.call(this.action, this.selectedActions, this.password);
+            $wire.call(this.action, this.password);
         } else {
-            $wire.call(this.action, this.selectedActions);
+            $wire.call(this.action);
         }
         this.modalOpen = false;
         this.resetModal();