{
+ event.currentTarget.hidden = true;
+ }}
+ />
+ );
+}
diff --git a/web/src/components/devices/CandidateRow.tsx b/web/src/components/devices/CandidateRow.tsx
index 0a84c4d..0ef2599 100644
--- a/web/src/components/devices/CandidateRow.tsx
+++ b/web/src/components/devices/CandidateRow.tsx
@@ -1,7 +1,7 @@
import { Button } from "../ui";
import type { OperatorCandidate } from "./types";
import { useI18n } from "../../lib/i18n";
-import { flagEmoji } from "../../lib/carrier";
+import { CountryFlag } from "../CountryFlag";
function ratsText(c: OperatorCandidate): string {
const list = (c.rats || []).filter(Boolean) as string[];
@@ -21,7 +21,7 @@ export function CandidateRow({ candidate, onLock }: { candidate: OperatorCandida
>
- {c.countryCode ? : null}
+
);
diff --git a/web/src/components/devices/OverviewNetworkCard.tsx b/web/src/components/devices/OverviewNetworkCard.tsx
index 5be425a..441744b 100644
--- a/web/src/components/devices/OverviewNetworkCard.tsx
+++ b/web/src/components/devices/OverviewNetworkCard.tsx
@@ -5,7 +5,7 @@ import { FieldRow } from "./FieldRow";
import { isDeviceOnline, isRegistered, isRecoveringPhase, lifecycleLabel, signalLevel, signalTone } from "./shared";
import type { DeviceDetail } from "./types";
import { useI18n } from "../../lib/i18n";
-import { flagEmoji } from "../../lib/carrier";
+import { CountryFlag } from "../CountryFlag";
const BAR_HEIGHTS = ["h-[28%]", "h-[46%]", "h-[64%]", "h-[82%]", "h-full"];
const TEXT_TONE = {
@@ -81,11 +81,12 @@ export function OverviewNetworkCard({ device, onOpenOperatorSelection }: { devic
>
{vowifiRegistered ? (
<>{t("WiFi Calling 已注册")}
- ) : registered ? (
- <>
- {modem?.operatorCountryCode ? `${flagEmoji(modem.operatorCountryCode)} ` : ""}{modem?.operator || "--"}{" "}
+ ) : registered ? (
+
+ {t("数据未开启")}
) : (
diff --git a/web/src/components/devices/OverviewSimPanel.tsx b/web/src/components/devices/OverviewSimPanel.tsx
index bfec14a..2b03657 100644
--- a/web/src/components/devices/OverviewSimPanel.tsx
+++ b/web/src/components/devices/OverviewSimPanel.tsx
@@ -4,7 +4,8 @@ import { FieldRow } from "./FieldRow";
import { useShowSensitive } from "./shared";
import type { DeviceDetail } from "./types";
import { useI18n } from "../../lib/i18n";
-import { carrierBrandIso, flagEmoji } from "../../lib/carrier";
+import { carrierBrandIso } from "../../lib/carrier";
+import { CountryFlag } from "../CountryFlag";
export interface OverviewSimPanelProps {
device: DeviceDetail;
@@ -20,9 +21,7 @@ export function OverviewSimPanel({ device, simOperatorDisplay, e911Starting, onS
const sensitive = !showSensitive;
const activeEsim = (device.activeEsimProfileName || "").trim();
const flightOn = device.vowifiActive || modem?.operatingMode === 0 || modem?.operatingMode === 4;
- const carrierFlag = flagEmoji(carrierBrandIso(modem?.nativeSpn, modem?.imsi));
- const operatorValue =
- carrierFlag && simOperatorDisplay !== "--" ? `${carrierFlag} ${simOperatorDisplay}` : simOperatorDisplay;
+ const carrierCountryCode = carrierBrandIso(modem?.nativeSpn, modem?.imsi);
const backendLabel =
device.backendMode === "qmi" ? "QMI" : device.backendMode === "mbim" ? "MBIM" : device.backendMode === "at" ? "AT" : "Auto";
@@ -51,7 +50,12 @@ export function OverviewSimPanel({ device, simOperatorDisplay, e911Starting, onS
) : null}
{activeEsim ?
{t("飞行模式")}
diff --git a/web/src/lib/carrier.ts b/web/src/lib/carrier.ts
index 8701d06..ceb3e80 100644
--- a/web/src/lib/carrier.ts
+++ b/web/src/lib/carrier.ts
@@ -57,13 +57,3 @@ export function carrierBrandIso(spn?: string, imsi?: string): string {
if (brand.includes("lebara") && digits.startsWith("20404")) return "gb";
return carrierIso(imsi);
}
-
-// flagEmoji converts an alpha-2 country code to its regional-indicator flag emoji.
-export function flagEmoji(iso?: string): string {
- const s = String(iso ?? "").trim().toUpperCase();
- if (s.length !== 2) return "";
- const a = s.charCodeAt(0);
- const b = s.charCodeAt(1);
- if (a < 65 || a > 90 || b < 65 || b > 90) return "";
- return String.fromCodePoint(0x1f1e6 + (a - 65)) + String.fromCodePoint(0x1f1e6 + (b - 65));
-}