diff --git a/packages/integrations/src/adguard-home/adguard-home-integration.ts b/packages/integrations/src/adguard-home/adguard-home-integration.ts index 37643ae1a..2e41bd916 100644 --- a/packages/integrations/src/adguard-home/adguard-home-integration.ts +++ b/packages/integrations/src/adguard-home/adguard-home-integration.ts @@ -123,8 +123,7 @@ export class AdGuardHomeIntegration extends Integration implements DnsHoleSummar } } - public async disableAsync(duration?: number): Promise { - duration = duration ? duration * 1000 : 0; + public async disableAsync(duration = 0): Promise { const response = await fetch(`${this.integration.url}/control/protection`, { method: "POST", headers: { @@ -133,7 +132,7 @@ export class AdGuardHomeIntegration extends Integration implements DnsHoleSummar }, body: JSON.stringify({ enabled: false, - duration: duration, + duration: duration * 1000, }), }); if (!response.ok) { diff --git a/packages/widgets/src/dns-hole/controls/component.tsx b/packages/widgets/src/dns-hole/controls/component.tsx index 40f3fc20e..4f2db7bc8 100644 --- a/packages/widgets/src/dns-hole/controls/component.tsx +++ b/packages/widgets/src/dns-hole/controls/component.tsx @@ -68,8 +68,10 @@ export default function DnsHoleControlsWidget({ options, integrationIds }: Widge } }; - const allEnabled = status.every((item) => item.enabled); - const allDisabled = status.every((item) => !item.enabled); + const enabledIntegrations = integrationIds.filter((id) => status.find((item) => item.integrationId === id)?.enabled); + const disabledIntegrations = integrationIds.filter( + (id) => !status.find((item) => item.integrationId === id)?.enabled, + ); return ( @@ -77,10 +79,8 @@ export default function DnsHoleControlsWidget({ options, integrationIds }: Widge