From 2fd51e57a99946d9ae8b2e85df8f4a8b08cd0943 Mon Sep 17 00:00:00 2001
From: QLHazyCoder <qlhazycoder@users.noreply.github.com>
Date: Mon, 4 May 2026 13:39:17 +0800
Subject: [PATCH] feat: add removeHeroSmsCountryFromOrder function and related
 tests

---
 sidepanel/sidepanel.js                        | 33 +++++++-
 ...epanel-phone-verification-settings.test.js | 82 +++++++++++++++++++
 2 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/sidepanel/sidepanel.js b/sidepanel/sidepanel.js
index 4f4203f..1426bbe 100644
--- a/sidepanel/sidepanel.js
+++ b/sidepanel/sidepanel.js
@@ -4622,6 +4622,7 @@ function renderHeroSmsCountryFallbackOrder(countries = []) {
   if (!displayHeroSmsCountryFallbackOrder) {
     return;
   }
+  displayHeroSmsCountryFallbackOrder.textContent = '';
   const normalized = isFiveSimProviderSelected() ? normalizeFiveSimCountryFallbackList(countries) : normalizeHeroSmsCountryFallbackList(countries);
   if (!normalized.length) {
     displayHeroSmsCountryFallbackOrder.textContent = '未设置';
@@ -4714,8 +4715,7 @@ function updateHeroSmsCountryMenuSummary(selectedCountries = []) {
   }
   const normalized = isFiveSimProviderSelected() ? normalizeFiveSimCountryFallbackList(selectedCountries) : normalizeHeroSmsCountryFallbackList(selectedCountries);
   if (!normalized.length) {
-    const defaultLabel = isFiveSimProviderSelected() ? DEFAULT_FIVE_SIM_COUNTRY_LABEL : DEFAULT_HERO_SMS_COUNTRY_LABEL;
-    btnHeroSmsCountryMenu.textContent = `${defaultLabel} (1/${HERO_SMS_COUNTRY_SELECTION_MAX})`;
+    btnHeroSmsCountryMenu.textContent = `\u672a\u9009\u62e9 (0/${HERO_SMS_COUNTRY_SELECTION_MAX})`;
     return;
   }
   const labels = normalized.map((country) => country.label);
@@ -4898,6 +4898,35 @@ function applyHeroSmsFallbackSelection(countries = [], options = {}) {
   });
 }
 
+function removeHeroSmsCountryFromOrder(id) {
+  const provider = getSelectedPhoneSmsProvider();
+  const normalizedId = normalizePhoneSmsCountryId(id, provider);
+  if (!normalizedId) {
+    return [];
+  }
+  heroSmsCountrySelectionOrder = heroSmsCountrySelectionOrder
+    .filter((entry) => String(entry) !== String(normalizedId));
+  [selectHeroSmsCountry, selectHeroSmsCountryFallback].forEach((selectEl) => {
+    if (!selectEl) {
+      return;
+    }
+    Array.from(selectEl.options || []).forEach((option) => {
+      if (String(normalizePhoneSmsCountryId(option.value, provider)) === String(normalizedId)) {
+        option.selected = false;
+      }
+    });
+  });
+  const nextOrder = syncHeroSmsFallbackSelectionOrderFromSelect({
+    enforceMax: true,
+    ensureDefault: false,
+    showLimitToast: false,
+  });
+  updateHeroSmsPlatformDisplay();
+  markSettingsDirty(true);
+  saveSettings({ silent: true }).catch(() => { });
+  return nextOrder;
+}
+
 function normalizePhoneActivationState(record = {}) {
   if (!record || typeof record !== 'object' || Array.isArray(record)) {
     return null;
diff --git a/tests/sidepanel-phone-verification-settings.test.js b/tests/sidepanel-phone-verification-settings.test.js
index 6054679..c24f1e3 100644
--- a/tests/sidepanel-phone-verification-settings.test.js
+++ b/tests/sidepanel-phone-verification-settings.test.js
@@ -120,6 +120,88 @@ test('sidepanel html exposes phone verification toggle and multi-provider SMS ro
   assert.doesNotMatch(html, /id="input-account-run-history-text-enabled"/);
 });
 
+test('hero sms country helpers keep empty summary state and expose removable order handling', () => {
+  assert.match(
+    sidepanelSource,
+    /function removeHeroSmsCountryFromOrder\(id\)/
+  );
+  assert.match(
+    sidepanelSource,
+    /displayHeroSmsCountryFallbackOrder\.textContent = '';/
+  );
+
+  const api = new Function(`
+const HERO_SMS_COUNTRY_SELECTION_MAX = 3;
+const btnHeroSmsCountryMenu = { textContent: '' };
+function isFiveSimProviderSelected() { return false; }
+function normalizeFiveSimCountryFallbackList(value = []) { return Array.isArray(value) ? value : []; }
+function normalizeHeroSmsCountryFallbackList(value = []) { return Array.isArray(value) ? value : []; }
+${extractFunction('updateHeroSmsCountryMenuSummary')}
+return { btnHeroSmsCountryMenu, updateHeroSmsCountryMenuSummary };
+`)();
+
+  api.updateHeroSmsCountryMenuSummary([]);
+  assert.equal(api.btnHeroSmsCountryMenu.textContent, '\u672a\u9009\u62e9 (0/3)');
+});
+
+test('removeHeroSmsCountryFromOrder clears the selected country and triggers a silent save', async () => {
+  const api = new Function(`
+let heroSmsCountrySelectionOrder = [52, 6];
+const selectHeroSmsCountry = {
+  options: [
+    { value: '52', selected: true },
+    { value: '6', selected: true },
+  ],
+};
+const selectHeroSmsCountryFallback = {
+  options: [
+    { value: '52', selected: true },
+    { value: '6', selected: true },
+  ],
+};
+let dirtyValue = null;
+let saveCount = 0;
+let platformRefreshCount = 0;
+function getSelectedPhoneSmsProvider() { return 'hero-sms'; }
+function normalizePhoneSmsCountryId(value) {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : 0;
+}
+function syncHeroSmsFallbackSelectionOrderFromSelect() {
+  heroSmsCountrySelectionOrder = Array.from(selectHeroSmsCountry.options || [])
+    .filter((option) => option.selected)
+    .map((option) => Number(option.value));
+  return heroSmsCountrySelectionOrder.map((id) => ({ id, label: 'Country #' + id }));
+}
+function updateHeroSmsPlatformDisplay() { platformRefreshCount += 1; }
+function markSettingsDirty(value) { dirtyValue = value; }
+function saveSettings() { saveCount += 1; return Promise.resolve(); }
+${extractFunction('removeHeroSmsCountryFromOrder')}
+return {
+  removeHeroSmsCountryFromOrder,
+  selectHeroSmsCountry,
+  selectHeroSmsCountryFallback,
+  getHeroSmsCountrySelectionOrder: () => [...heroSmsCountrySelectionOrder],
+  getDirtyValue: () => dirtyValue,
+  getSaveCount: () => saveCount,
+  getPlatformRefreshCount: () => platformRefreshCount,
+};
+`)();
+
+  const nextOrder = api.removeHeroSmsCountryFromOrder(52);
+  await Promise.resolve();
+
+  assert.deepStrictEqual(nextOrder, [{ id: 6, label: 'Country #6' }]);
+  assert.deepStrictEqual(api.getHeroSmsCountrySelectionOrder(), [6]);
+  assert.equal(api.selectHeroSmsCountry.options[0].selected, false);
+  assert.equal(api.selectHeroSmsCountry.options[1].selected, true);
+  assert.equal(api.selectHeroSmsCountryFallback.options[0].selected, false);
+  assert.equal(api.selectHeroSmsCountryFallback.options[1].selected, true);
+  assert.equal(api.getDirtyValue(), true);
+  assert.equal(api.getSaveCount(), 1);
+  assert.equal(api.getPlatformRefreshCount(), 1);
+});
+
 test('updatePhoneVerificationSettingsUI toggles SMS rows from the sms switch and provider selection', () => {
   const api = new Function(`
 const phoneVerificationSectionExpanded = true;