diff --git a/crates/defguard_proxy_manager/src/servers/enrollment.rs b/crates/defguard_proxy_manager/src/servers/enrollment.rs index 6adb0af5df..a57a1bb17e 100644 --- a/crates/defguard_proxy_manager/src/servers/enrollment.rs +++ b/crates/defguard_proxy_manager/src/servers/enrollment.rs @@ -727,7 +727,7 @@ impl EnrollmentServer { if let Some(location) = WireguardNetwork::find_by_id(&mut *transaction, location_id) .await .map_err(|err| { - error!("Failed to fetch WireguardNetwork with ID {location_id}: {err}",); + error!("Failed to fetch WireguardNetwork with ID {location_id}: {err}"); Status::internal("unexpected error") })? { @@ -735,12 +735,13 @@ impl EnrollmentServer { try_get_location_firewall_config(&location, &mut transaction) .await .map_err(|err| { - error!("Failed to get firewall config for location {location}: {err}",); + error!("Failed to get firewall config for location {location}: {err}"); Status::internal("unexpected error") })? { debug!( - "Sending firewall config update for location {location} affected by adding new device {}, user {}({})", + "Sending firewall config update for location {location} affected by \ + adding new device {}, user {}({})", device.wireguard_pubkey, user.username, user.id ); self.send_wireguard_event(GatewayEvent::FirewallConfigChanged( diff --git a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/modals/SettingsLicenseModal/SettingsLicenseModal.tsx b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/modals/SettingsLicenseModal/SettingsLicenseModal.tsx index 389c38725c..4d44ce0cd5 100644 --- a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/modals/SettingsLicenseModal/SettingsLicenseModal.tsx +++ b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/modals/SettingsLicenseModal/SettingsLicenseModal.tsx @@ -104,26 +104,6 @@ const getLicenseLimitConflicts = ({ }); } - const currentDevices = counts.user_device + counts.network_device; - if (currentDevices > limits.devices) { - conflicts.push({ - label: 'Devices', - current: currentDevices, - limit: limits.devices, - }); - } - - if ( - isPresent(limits.network_devices) && - counts.network_device > limits.network_devices - ) { - conflicts.push({ - label: 'Network devices', - current: counts.network_device, - limit: limits.network_devices, - }); - } - return conflicts; }; diff --git a/web/src/shared/components/modals/license/LicenseLimitConflictModal/LicenseLimitConflictModal.tsx b/web/src/shared/components/modals/license/LicenseLimitConflictModal/LicenseLimitConflictModal.tsx index c91ed71d7e..733a232d58 100644 --- a/web/src/shared/components/modals/license/LicenseLimitConflictModal/LicenseLimitConflictModal.tsx +++ b/web/src/shared/components/modals/license/LicenseLimitConflictModal/LicenseLimitConflictModal.tsx @@ -70,17 +70,6 @@ const ModalContent = ({ conflicts }: OpenLicenseLimitConflictModal) => { {`To apply this license, first reduce your usage so it fits within the license limits.`} - - {`You can also upgrade your plan to the one with higher limits such as:`} -
- {`• 30 users or more`} -
- {`• 5 locations or more`} -
- - - {`No changes were made to your current configuration.`} - {conflicts.length > 0 && (
{conflicts.map((conflict) => ( @@ -92,6 +81,10 @@ const ModalContent = ({ conflicts }: OpenLicenseLimitConflictModal) => { ))}
)} + + + {`No changes were made to your current configuration.`} + );