Merge branch 'main' of https://github.com/DnsChanger/dnsChanger-desktop

Author: sajjadmrx

src/main/ipc/dialogs.ts

@@ -238,7 +238,7 @@ function getCurrentLng(): Locales {
 
 async function getCurrentActive(): Promise<{
 	success: boolean
-	server?: Partial<ServerStore>
+	server?: ServerStore | null
 	isDefault?: boolean
 	message?: string
 }> {
@@ -248,9 +248,9 @@ async function getCurrentActive(): Promise<{
 		if (!dns.length) return { success: false, server: null }
 
 		const servers = store.get('dnsList') || []
-		const server: ServerStore | null = servers.find(
-			(server) => server.servers.toString() === dns.toString(),
-		)
+		const server: ServerStore | null =
+			servers.find((server) => server.servers.toString() === dns.toString()) ??
+			null
 		const defaultServer = store.get('defaultServer')
 		if (defaultServer) {
 			// if default server is connected, then return it as not connected
@@ -267,9 +267,11 @@ async function getCurrentActive(): Promise<{
 				success: true,
 				server: {
 					key: 'unknown',
+					name: 'Unknown',
 					servers: dns,
-					name: 'unknown',
-					avatar: '',
+					avatar: 'def.png',
+					rate: 0,
+					tags: [],
 					isPin: false,
 				},
 			}

src/renderer/component/cards/server-info/index.tsx

@@ -117,10 +117,9 @@ export function ServerInfoCardComponent({ loadingCurrentActive }: Prop) {
 
 	const isConnected = servers.currentActive?.key === servers.selected.key
 
-	const name =
-		servers.selected.name.length > 18
-			? `${servers.selected.name.slice(0, 18)}...`
-			: servers.selected.name
+	const serverName = servers.selected.name || 'Unknown'
+
+	const name = serverName.length > 18 ? `${serverName.slice(0, 18)}...` : serverName
 
 	const network =
 		servers.network && servers.network.length > 18