From f1903b26a57cb30c4ec59e17751a09e19c3c5c8d Mon Sep 17 00:00:00 2001
From: Srgr0 <66754887+Srgr0@users.noreply.github.com>
Date: Thu, 2 Nov 2023 20:02:00 +0900
Subject: [PATCH] =?UTF-8?q?fix=20=E7=B5=B5=E6=96=87=E5=AD=97=E3=83=94?=
 =?UTF-8?q?=E3=83=83=E3=82=AB=E3=83=BC=E3=81=A7=E3=83=90=E3=83=83=E3=83=86?=
 =?UTF-8?q?=E3=83=AA=E3=83=BC=E3=81=AE=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=8C?=
 =?UTF-8?q?=E8=A4=87=E6=95=B0=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#12212)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update emojilist.json

* Update CHANGELOG.md
---
 CHANGELOG.md                         | 1 +
 packages/frontend/src/emojilist.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38ef92e95..42b132089 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 - Fix: チャンネルの作成・更新時に失敗した場合何も表示されない問題を修正 #11983
 - Fix: 個人カードのemojiがバッテリーになっている問題を修正
 - Fix: 標準テーマと同じIDを使用してインストールできてしまう問題を修正
+- Fix: 絵文字ピッカーでバッテリーの絵文字が複数表示される問題を修正 #12197
 
 ### Server
 - Enhance: RedisへのTLのキャッシュ(FTT)をオフにできるように
diff --git a/packages/frontend/src/emojilist.json b/packages/frontend/src/emojilist.json
index eae822e65..fe1d884eb 100644
--- a/packages/frontend/src/emojilist.json
+++ b/packages/frontend/src/emojilist.json
@@ -1045,7 +1045,7 @@
 	["⌛", "hourglass", 6],
 	["📡", "satellite", 6],
 	["🔋", "battery", 6],
-	["🪫", "battery", 6],
+	["🪫", "low_battery", 6],
 	["🔌", "electric_plug", 6],
 	["💡", "bulb", 6],
 	["🔦", "flashlight", 6],