Merge branch 'patricio-wip-11' into patricio-wip-11-merger

# Conflicts:
#	app/Http/Livewire/DeployApplication.php
#	app/Jobs/ContainerStatusJob.php
#	bootstrap/helpers.php

app/Http/Controllers/ProjectController.php

@@ -93,7 +93,10 @@ class ProjectController extends Controller
         if (!$application) {
             return redirect()->route('dashboard');
         }
-        $activity = Activity::where('properties->deployment_uuid', '=', $deployment_uuid)->first();
+        $activity = Activity::query()
+            ->where('properties->type', '=', 'deployment')
+            ->where('properties->uuid', '=', $deployment_uuid)
+            ->first();
 
         return view('project.application.deployment', [
             'application' => $application,