From 68c2c7fb81b80a9c69bbac29039f4b1e796fadcf Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Sat, 5 Apr 2025 14:41:34 +0200
Subject: [PATCH] fix(Status): conditionally check proxy status and refresh
 button based on force_stop state

---
 app/Livewire/Server/Proxy/Status.php                   | 3 ---
 resources/views/livewire/server/proxy/status.blade.php | 6 ++++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Livewire/Server/Proxy/Status.php b/app/Livewire/Server/Proxy/Status.php
index 869f92308..f4f18381f 100644
--- a/app/Livewire/Server/Proxy/Status.php
+++ b/app/Livewire/Server/Proxy/Status.php
@@ -34,9 +34,6 @@ public function proxyStatusUpdated()
     public function checkProxy(bool $notification = false)
     {
         try {
-            if ($this->server->proxy->force_stop) {
-                return;
-            }
             if ($this->polling) {
                 if ($this->numberOfPolls >= 10) {
                     $this->polling = false;
diff --git a/resources/views/livewire/server/proxy/status.blade.php b/resources/views/livewire/server/proxy/status.blade.php
index 5aa3ca765..472625dd6 100644
--- a/resources/views/livewire/server/proxy/status.blade.php
+++ b/resources/views/livewire/server/proxy/status.blade.php
@@ -1,5 +1,7 @@
-<div x-init="$wire.checkProxy()" class="flex gap-2">
-    <x-forms.button wire:click='checkProxy(true)' :showLoadingIndicator="false">Refresh</x-forms.button>
+<div @if (data_get($server, 'proxy.force_stop', false) === false) x-init="$wire.checkProxy()" @endif class="flex gap-2">
+    @if (data_get($server, 'proxy.force_stop', false) === false)
+        <x-forms.button wire:click='checkProxy(true)' :showLoadingIndicator="false">Refresh</x-forms.button>
+    @endif
     @if (data_get($server, 'proxy.status') === 'running')
         <x-status.running status="Proxy Running" />
     @elseif (data_get($server, 'proxy.status') === 'restarting')