refactor: Update confirmation button text for deletion actions

resources/views/livewire/destination/form.blade.php

@@ -6,18 +6,10 @@
                 Save
             </x-forms.button>
             @if ($destination->network !== 'coolify')
-                <x-modal-confirmation 
+                <x-modal-confirmation title="Confirm Destination Deletion?" buttonTitle="Delete Destination" isErrorButton
-                    title="Confirm Destination Deletion?"
+                    submitAction="delete" :actions="['This will delete the selected destination/network.']" confirmationText="{{ $destination->name }}"
-                    buttonTitle="Delete Destination"
-                    isErrorButton
-                    submitAction="delete"
-                    :actions="['This will delete the selected destination/network.']"
-                    confirmationText="{{ $destination->name }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Destination Name below"
-                    shortConfirmationLabel="Destination Name"
+                    shortConfirmationLabel="Destination Name" :confirmWithPassword="false" step2ButtonText="Permanently Delete" />
-                    :confirmWithPassword="false"
-                    step2ButtonText="Permanently Delete Destination"
-                />
             @endif
         </div>
 

resources/views/livewire/navbar-delete-team.blade.php

@@ -8,6 +8,6 @@
         confirmationText="{{ $team }}"
         confirmationLabel="Please confirm the execution of the actions by entering the Team Name below"
         shortConfirmationLabel="Team Name"
-        step3ButtonText="Permanently Delete Team"
+        step3ButtonText="Permanently Delete"
     />
 </div>

resources/views/livewire/project/database/backup-executions.blade.php

@@ -57,7 +57,7 @@
                         confirmationText="{{ data_get($execution, 'filename') }}"
                         confirmationLabel="Please confirm the execution of the actions by entering the Backup Filename below"
                         shortConfirmationLabel="Backup Filename"
-                        step3ButtonText="Permanently Delete Backup"
+                        step3ButtonText="Permanently Delete"
                         />
                     </div>
                 </div>

resources/views/livewire/project/database/init-script.blade.php

@@ -2,21 +2,13 @@
     <div class="flex items-end gap-2">
         <x-forms.input id="filename" label="Filename" />
         <x-forms.button type="submit">Save</x-forms.button>
-        <x-modal-confirmation
+        <x-modal-confirmation title="Confirm init-script deletion?" buttonTitle="Delete" isErrorButton
-        title="Confirm init-script deletion?"
+            submitAction="delete" :actions="[
-        buttonTitle="Delete"
+                'The init-script of this database will be permanently deleted.',
-        isErrorButton
+                'If you are actively using this init-script, it could cause errors on redeployment.',
-        submitAction="delete"
+            ]" confirmationText="{{ $filename }}"
-        :actions="[
+            confirmationLabel="Please confirm the execution of the actions by entering the init-script name below"
-            'The init-script of this database will be permanently deleted.',
+            shortConfirmationLabel="Init-script Name" :confirmWithPassword=false step2ButtonText="Permanently Delete" />
-            'If you are actively using this init-script, it could cause errors on redeployment.'
-        ]"
-        confirmationText="{{ $filename }}"
-        confirmationLabel="Please confirm the execution of the actions by entering the init-script name below"
-        shortConfirmationLabel="Init-script Name"
-        :confirmWithPassword=false
-        step2ButtonText="Permanently Delete Init-script"
-        />
     </div>
     <x-forms.textarea id="content" label="Content" />
 </form>

resources/views/livewire/project/delete-environment.blade.php

@@ -1,12 +1,5 @@
-<x-modal-confirmation 
+<x-modal-confirmation title="Confirm Environment Deletion?" buttonTitle="Delete Environment" isErrorButton
-    title="Confirm Environment Deletion?"
+    submitAction="delete" :actions="['This will delete the selected environment.']"
-    buttonTitle="Delete Environment"
-    isErrorButton
-    submitAction="delete"   
-    :actions="['This will delete the selected environment.']"
     confirmationLabel="Please confirm the execution of the actions by entering the Environment Name below"
-    shortConfirmationLabel="Environment Name"
+    shortConfirmationLabel="Environment Name" confirmationText="{{ $environmentName }}" :confirmWithPassword="false"
-    confirmationText="{{ $environmentName }}"
+    step2ButtonText="Permanently Delete" />
-    :confirmWithPassword="false"
-    step2ButtonText="Permanently Delete Environment"
-/>

resources/views/livewire/project/delete-project.blade.php

@@ -1,12 +1,7 @@
-<x-modal-confirmation 
+<x-modal-confirmation title="Confirm Project Deletion?" buttonTitle="Delete Project" isErrorButton submitAction="delete"
-    title="Confirm Project Deletion?"
+    :actions="[
-    buttonTitle="Delete Project"
+        'This will delete the selected project',
-    isErrorButton
+        'All Environments inside the project will be deleted as well.',
-    submitAction="delete"
+    ]" confirmationLabel="Please confirm the execution of the actions by entering the Project Name below"
-    :actions="['This will delete the selected project', 'All Environments inside the project will be deleted as well.']"
+    shortConfirmationLabel="Project Name" confirmationText="{{ $projectName }}" :confirmWithPassword="false"
-    confirmationLabel="Please confirm the execution of the actions by entering the Project Name below"
+    step2ButtonText="Permanently Delete" />
-    shortConfirmationLabel="Project Name"
-    confirmationText="{{ $projectName }}"
-    :confirmWithPassword="false"
-    step2ButtonText="Permanently Delete Project"
-/>

resources/views/livewire/project/service/file-storage.blade.php

@@ -15,56 +15,32 @@
     <form wire:submit='submit' class="flex flex-col gap-2">
         <div class="flex gap-2">
             @if ($fileStorage->is_directory)
-                <x-modal-confirmation
+                <x-modal-confirmation title="Confirm Directory Conversion to File?" buttonTitle="Convert to file"
-                title="Confirm Directory Conversion to File?"
+                    submitAction="convertToFile" :actions="[
-                buttonTitle="Convert to file"
+                        'All files in this directory will be permanently deleted and an empty file will be created in its place.',
-                submitAction="convertToFile"
+                    ]" confirmationText="{{ $fs_path }}"
-                :actions="['All files in this directory will be permanently deleted and an empty file will be created in its place.']"
+                    confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
-                confirmationText="{{ $fs_path }}"
+                    shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to file" />
-                confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
-                shortConfirmationLabel="Filepath"
-                :confirmWithPassword="false"
-                step2ButtonText="Convert to file"
-                />
             @else
-                <x-modal-confirmation 
+                <x-modal-confirmation title="Confirm File Conversion to Directory?" buttonTitle="Convert to directory"
-                title="Confirm File Conversion to Directory?"
+                    submitAction="convertToDirectory" :actions="[
-                buttonTitle="Convert to directory"
+                        'The selected file will be permanently deleted and an empty directory will be created in its place.',
-                submitAction="convertToDirectory"
+                    ]" confirmationText="{{ $fs_path }}"
-                :actions="['The selected file will be permanently deleted and an empty directory will be created in its place.']"
+                    confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
-                confirmationText="{{ $fs_path }}"
+                    shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to directory" />
-                confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
-                shortConfirmationLabel="Filepath"
-                :confirmWithPassword="false"
-                step2ButtonText="Convert to directory"
-                />
             @endif
             @if ($fileStorage->is_directory)
-                <x-modal-confirmation 
+                <x-modal-confirmation title="Confirm Directory Deletion?" buttonTitle="Delete Directory" isErrorButton
-                    title="Confirm Directory Deletion?"
+                    submitAction="delete" :checkboxes="$directoryDeletionCheckboxes" :actions="[
-                    buttonTitle="Delete Directory"
+                        'The selected directory and all its contents will be permanently deleted from the container.',
-                    isErrorButton
+                    ]" confirmationText="{{ $fs_path }}"
-                    submitAction="delete"
-                    :checkboxes="$directoryDeletionCheckboxes" 
-                    :actions="['The selected directory and all its contents will be permanently deleted from the container.']"
-                    confirmationText="{{ $fs_path }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
-                    shortConfirmationLabel="Filepath"
+                    shortConfirmationLabel="Filepath" step3ButtonText="Permanently Delete" />
-                    step3ButtonText="Permanently Delete Directory"
-                />
             @else
-                <x-modal-confirmation 
+                <x-modal-confirmation title="Confirm File Deletion?" buttonTitle="Delete File" isErrorButton
-                    title="Confirm File Deletion?"
+                    submitAction="delete" :checkboxes="$fileDeletionCheckboxes" :actions="['The selected file will be permanently deleted from the container.']" confirmationText="{{ $fs_path }}"
-                    buttonTitle="Delete File"
-                    isErrorButton
-                    submitAction="delete"
-                    :checkboxes="$fileDeletionCheckboxes" 
-                    :actions="['The selected file will be permanently deleted from the container.']"
-                    confirmationText="{{ $fs_path }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
-                    shortConfirmationLabel="Filepath"
+                    shortConfirmationLabel="Filepath" step3ButtonText="Permanently Delete" />
-                    step3ButtonText="Permanently Delete File"
-                />
             @endif
 
             @if (!$fileStorage->is_based_on_git)

resources/views/livewire/project/service/service-application-view.blade.php

@@ -7,20 +7,11 @@
                 <h2>{{ Str::headline($application->name) }}</h2>
             @endif
             <x-forms.button type="submit">Save</x-forms.button>
-            <x-modal-confirmation 
+            <x-modal-confirmation title="Confirm Service Application Deletion?" buttonTitle="Delete" isErrorButton
-                title="Confirm Service Application Deletion?"
+                submitAction="delete" {{-- :checkboxes="$checkboxes"  --}} :actions="['The selected service application container will be stopped and permanently deleted.']"
-                buttonTitle="Delete"
-                isErrorButton
-                submitAction="delete" 
-                {{-- :checkboxes="$checkboxes"  --}}
-                :actions="[
-                    'The selected service application container will be stopped and permanently deleted.'
-                ]" 
                 confirmationText="{{ Str::headline($application->name) }}"
                 confirmationLabel="Please confirm the execution of the actions by entering the Service Application Name below"
-                shortConfirmationLabel="Service Application Name"
+                shortConfirmationLabel="Service Application Name" step3ButtonText="Permanently Delete" />
-                step3ButtonText="Permanently Delete Service Application"
-                />
         </div>
         <div class="flex flex-col gap-2">
             <div class="flex gap-2">

resources/views/livewire/project/shared/environment-variable/show.blade.php

@@ -11,20 +11,11 @@
                         <path d="M11 16a1 1 0 1 0 2 0a1 1 0 0 0-2 0m-3-5V7a4 4 0 1 1 8 0v4" />
                     </g>
                 </svg>
-                <x-modal-confirmation
+                <x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton buttonTitle="Delete"
-                    title="Confirm Environment Variable Deletion?"
+                    submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']" confirmationText="{{ $env->key }}"
-                    isErrorButton
-                    buttonTitle="Delete"
-                    submitAction="delete"
-                    :actions="[
-                        'The selected environment variable will be permanently deleted.'
-                    ]"
-                    confirmationText="{{ $env->key }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
-                    shortConfirmationLabel="Environment Variable Name"
+                    shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
-                    :confirmWithPassword="false"
+                    step2ButtonText="Permanently Delete" />
-                    step2ButtonText="Permanently Delete Environment Variable"
-                />
             </div>
         @else
             @if ($isDisabled)
@@ -80,20 +71,12 @@
                     <x-forms.button wire:click='lock'>
                         Lock
                     </x-forms.button>
-                    <x-modal-confirmation 
+                    <x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton
-                        title="Confirm Environment Variable Deletion?"
+                        buttonTitle="Delete" submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']"
-                        isErrorButton
-                        buttonTitle="Delete"
-                        submitAction="delete"
-                        :actions="[
-                            'The selected environment variable will be permanently deleted.'
-                        ]"
                         confirmationText="{{ $env->key }}"
                         confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
-                        shortConfirmationLabel="Environment Variable Name"
+                        shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
-                        :confirmWithPassword="false"
+                        step2ButtonText="Permanently Delete" />
-                        step2ButtonText="Permanently Delete Environment Variable"
-                    />
                 @else
                     <x-forms.button type="submit">
                         Update
@@ -101,20 +84,12 @@
                     <x-forms.button wire:click='lock'>
                         Lock
                     </x-forms.button>
-                    <x-modal-confirmation 
+                    <x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton
-                        title="Confirm Environment Variable Deletion?"
+                        buttonTitle="Delete" submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']"
-                        isErrorButton
-                        buttonTitle="Delete"
-                        submitAction="delete"
-                        :actions="[
-                            'The selected environment variable will be permanently deleted.'
-                        ]"
                         confirmationText="{{ $env->key }}"
                         confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
-                        shortConfirmationLabel="Environment Variable Name"
+                        shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
-                        :confirmWithPassword="false"
+                        step2ButtonText="Permanently Delete" />
-                        step2ButtonText="Permanently Delete Environment Variable"
-                    />
                 @endif
             </div>
         @endif

resources/views/livewire/project/shared/scheduled-task/show.blade.php

@@ -1,13 +1,13 @@
 <div>
     <x-slot:title>
         {{ data_get_str($resource, 'name')->limit(10) }} > Scheduled Tasks | Coolify
-        </x-slot>
+    </x-slot>
-        @if ($type === 'application')
+    @if ($type === 'application')
         <h1>Scheduled Task</h1>
         <livewire:project.application.heading :application="$resource" />
-        @elseif ($type === 'service')
+    @elseif ($type === 'service')
         <livewire:project.service.navbar :service="$resource" :parameters="$parameters" />
-        @endif
+    @endif
 
     <form wire:submit="submit" class="w-full">
         <div class="flex flex-col gap-2 pb-2">
@@ -16,18 +16,11 @@
                 <x-forms.button type="submit">
                     Save
                 </x-forms.button>
-                <x-modal-confirmation 
+                <x-modal-confirmation title="Confirm Scheduled Task Deletion?" isErrorButton buttonTitle="Delete"
-                    title="Confirm Scheduled Task Deletion?"
+                    submitAction="delete({{ $task->id }})" :actions="['The selected scheduled task will be permanently deleted.']" confirmationText="{{ $task->name }}"
-                    isErrorButton
-                    buttonTitle="Delete"
-                    submitAction="delete({{ $task->id }})"
-                    :actions="['The selected scheduled task will be permanently deleted.']"
-                    confirmationText="{{ $task->name }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Scheduled Task Name below"
-                    shortConfirmationLabel="Scheduled Task Name"
+                    shortConfirmationLabel="Scheduled Task Name" :confirmWithPassword="false"
-                    :confirmWithPassword="false"
+                    step2ButtonText="Permanently Delete" />
-                    step2ButtonText="Permanently Delete Scheduled Task"
-                />
 
             </div>
             <div class="flex w-full gap-2">
@@ -35,19 +28,20 @@
                 <x-forms.input placeholder="php artisan schedule:run" id="task.command" label="Command" required />
                 <x-forms.input placeholder="0 0 * * * or daily" id="task.frequency" label="Frequency" required />
                 @if ($type === 'application')
-                <x-forms.input placeholder="php"
+                    <x-forms.input placeholder="php"
-                    helper="You can leave this empty if your resource only has one container." id="task.container"
+                        helper="You can leave this empty if your resource only has one container." id="task.container"
-                    label="Container name" />
+                        label="Container name" />
                 @elseif ($type === 'service')
-                <x-forms.input placeholder="php"
+                    <x-forms.input placeholder="php"
-                    helper="You can leave this empty if your resource only has one service in your stack. Otherwise use the stack name, without the random generated ID. So if you have a mysql service in your stack, use mysql."
+                        helper="You can leave this empty if your resource only has one service in your stack. Otherwise use the stack name, without the random generated ID. So if you have a mysql service in your stack, use mysql."
-                    id="task.container" label="Service name" />
+                        id="task.container" label="Service name" />
                 @endif
             </div>
-        </form>
+    </form>
 
-        <div class="pt-4">
+    <div class="pt-4">
-            <h3 class="py-4">Recent executions <span class="text-xs text-neutral-500">(click to check output)</span></h3>
+        <h3 class="py-4">Recent executions <span class="text-xs text-neutral-500">(click to check output)</span></h3>
-            <livewire:project.shared.scheduled-task.executions :task="$task" key="{{ $task->id }}" selectedKey="" :executions="$task->executions->take(20)" />
+        <livewire:project.shared.scheduled-task.executions :task="$task" key="{{ $task->id }}" selectedKey=""
-        </div>
+            :executions="$task->executions->take(20)" />
+    </div>
 </div>

resources/views/livewire/project/shared/storages/show.blade.php

@@ -46,17 +46,13 @@
                 <x-forms.button type="submit">
                     Update
                 </x-forms.button>
-                <x-modal-confirmation 
+                <x-modal-confirmation title="Confirm persistent storage deletion?" isErrorButton buttonTitle="Delete"
-                    title="Confirm persistent storage deletion?"
+                    submitAction="delete" :actions="[
-                    isErrorButton
+                        'The selected persistent storage/volume will be permanently deleted.',
-                    buttonTitle="Delete"
+                        'If the persistent storage/volume is actvily used by a resource data will be lost.',
-                    submitAction="delete"
+                    ]" confirmationText="{{ $storage->name }}"
-                    :actions="['The selected persistent storage/volume will be permanently deleted.', 'If the persistent storage/volume is actvily used by a resource data will be lost.']"
-                    confirmationText="{{ $storage->name }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Storage Name below"
-                    shortConfirmationLabel="Storage Name"
+                    shortConfirmationLabel="Storage Name" step3ButtonText="Permanently Delete" />
-                    step3ButtonText="Permanently Delete Persistent Storage/Volume"
-                />
             </div>
         @endif
     </form>

resources/views/livewire/server/delete.blade.php

@@ -8,29 +8,15 @@
         </div>
         @if ($server->definedResources()->count() > 0)
             <div class="pb-2 text-red-500">You need to delete all resources before deleting this server.</div>
-            <x-modal-confirmation 
+            <x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete" submitAction="delete"
-                title="Confirm Server Deletion?"
+                :actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
-                isErrorButton
-                buttonTitle="Delete"
-                submitAction="delete"
-                :actions="['This server will be permanently deleted.']"
-                confirmationText="{{ $server->name }}"
                 confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
-                shortConfirmationLabel="Server Name"
+                shortConfirmationLabel="Server Name" step3ButtonText="Permanently Delete" />
-                step3ButtonText="Permanently Delete Server"
-            />
         @else
-            <x-modal-confirmation 
+            <x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete"
-                title="Confirm Server Deletion?"
+                submitAction="delete" :actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
-                isErrorButton
-                buttonTitle="Delete"
-                submitAction="delete"
-                :actions="['This server will be permanently deleted.']"
-                confirmationText="{{ $server->name }}"
                 confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
-                shortConfirmationLabel="Server Name"
+                shortConfirmationLabel="Server Name" step2ButtonText="Permanently Delete" />
-                step2ButtonText="Permanently Delete Server"
-            />
         @endif
     @endif
 </div>

resources/views/livewire/source/github/change.blade.php

@@ -24,7 +24,7 @@
                         confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
                         shortConfirmationLabel="GitHub App Name"
                         :confirmWithPassword="false"
-                        step2ButtonText="Permanently Delete GitHub App"
+                        step2ButtonText="Permanently Delete"
                         />
                     @else
                         <x-modal-confirmation
@@ -37,7 +37,7 @@
                         shortConfirmationLabel="GitHub App Name"
                         confirmationText="{{ data_get($github_app, 'name') }}"
                         :confirmWithPassword="false"
-                        step2ButtonText="Permanently Delete GitHub App"
+                        step2ButtonText="Permanently Delete"
                         />
                     @endif
                 </div>
@@ -188,7 +188,7 @@
                 confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
                 shortConfirmationLabel="GitHub App Name"
                 :confirmWithPassword="false"
-                step2ButtonText="Permanently Delete GitHub App"
+                step2ButtonText="Permanently Delete"
                 />
             </div>
         </div>

resources/views/livewire/storage/form.blade.php

@@ -16,18 +16,13 @@
             <x-forms.button wire:click="test_s3_connection">
                 Validate Connection
             </x-forms.button>
-            <x-modal-confirmation 
+            <x-modal-confirmation title="Confirm Storage Deletion?" isErrorButton buttonTitle="Delete"
-                title="Confirm Storage Deletion?"
+                submitAction="delete({{ $storage->id }})" :actions="[
-                isErrorButton
+                    'The selected storage location will be permanently deleted from Coolify.',
-                buttonTitle="Delete"
+                    'If the storage location is in use by any backup jobs those backup jobs will only store the backup locally on the server.',
-                submitAction="delete({{ $storage->id }})"
+                ]" confirmationText="{{ $storage->name }}"
-                :actions="['The selected storage location will be permanently deleted from Coolify.', 'If the storage location is in use by any backup jobs those backup jobs will only store the backup locally on the server.']"
-                confirmationText="{{ $storage->name }}"
                 confirmationLabel="Please confirm the execution of the actions by entering the Storage Name below"
-                shortConfirmationLabel="Storage Name"
+                shortConfirmationLabel="Storage Name" :confirmWithPassword="false" step2ButtonText="Permanently Delet" />
-                :confirmWithPassword="false"
-                step2ButtonText="Permanently Delete Storage"
-            />
         </div>
         <div class="flex gap-2">
             <x-forms.input label="Name" id="storage.name" />

resources/views/livewire/team/admin-view.blade.php

@@ -15,17 +15,14 @@
                 <div>{{ $user->email }}</div>
                 <div class="flex-1"></div>
                 <div class="flex items-center justify-center gap-2 mx-4 text-xs font-bold ">
-                    <x-modal-confirmation 
+                    <x-modal-confirmation title="Confirm User Deletion?" buttonTitle="Delete" isErrorButton
-                        title="Confirm User Deletion?"
+                        submitAction="delete({{ $user->id }})" :actions="[
-                        buttonTitle="Delete"
+                            'The selected user will be permanently deleted from Coolify and the database.',
-                        isErrorButton
+                            'All resources (application, databases, services, configurations, servers, private keys, tags, etc.) related to this user will be deleted from Coolify and from the server (if the server is reachable).',
-                        submitAction="delete({{ $user->id }})"
+                        ]"
-                        :actions="['The selected user will be permanently deleted from Coolify and the database.', 'All resources (application, databases, services, configurations, servers, private keys, tags, etc.) related to this user will be deleted from Coolify and from the server (if the server is reachable).']"
                         confirmationText="{{ $user->name }}"
                         confirmationLabel="Please confirm the execution of the actions by entering the User Name below"
-                        shortConfirmationLabel="User Name"
+                        shortConfirmationLabel="User Name" step3ButtonText="Permanently Delete" />
-                        step3ButtonText="Permanently Delete User"
-                    />
                 </div>
             </div>
         @empty

resources/views/livewire/team/index.blade.php

@@ -31,18 +31,11 @@
         @else
             @if (currentTeam()->isEmpty())
                 <div class="pb-4">This will delete your team. Beware! There is no coming back!</div>
-                <x-modal-confirmation 
+                <x-modal-confirmation title="Confirm Team Deletion?" buttonTitle="Delete" isErrorButton
-                    title="Confirm Team Deletion?"
+                    submitAction="delete({{ currentTeam()->id }})" :actions="['The current team will be permanently deleted from Coolify and the database.']"
-                    buttonTitle="Delete"
-                    isErrorButton
-                    submitAction="delete({{ currentTeam()->id }})"
-                    :actions="['The current team will be permanently deleted from Coolify and the database.']" 
                     confirmationText="{{ currentTeam()->name }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Team Name below"
-                    shortConfirmationLabel="Team Name"
+                    shortConfirmationLabel="Team Name" :confirmWithPassword="false" step2ButtonText="Permanently Delete" />
-                    :confirmWithPassword="false"
-                    step2ButtonText="Permanently Delete Team"
-                />
             @else
                 <div>
                     <div class="pb-4">You need to delete the following resources to be able to delete the team:</div>