From 97eb51d6f82c88955e2c94cdcd2511b3e0f8aa0c Mon Sep 17 00:00:00 2001
From: lukaw3d <lukajeran@oasislabs.com>
Date: Sat, 27 Jul 2024 02:14:34 +0200
Subject: [PATCH 1/2] Fix ThemeSwitcher icon size

Previously d373356df291f500ad808c30eaefd49a2fa5c698 resized both ThemeSelect and
ThemeSwitcher.
---
 .changelog/2019.trivial.md                 |  1 +
 src/app/components/ThemeSwitcher/index.tsx | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 .changelog/2019.trivial.md

diff --git a/.changelog/2019.trivial.md b/.changelog/2019.trivial.md
new file mode 100644
index 0000000000..91a2861253
--- /dev/null
+++ b/.changelog/2019.trivial.md
@@ -0,0 +1 @@
+Fix theme switcher icon size
diff --git a/src/app/components/ThemeSwitcher/index.tsx b/src/app/components/ThemeSwitcher/index.tsx
index 586ed22b07..0671fff0cb 100644
--- a/src/app/components/ThemeSwitcher/index.tsx
+++ b/src/app/components/ThemeSwitcher/index.tsx
@@ -18,10 +18,10 @@ import { getTargetTheme } from 'styles/theme/utils'
 
 interface Props {}
 
-const getThemesIcons = (t: TFunction) => ({
-  light: <Sun aria-label={t('theme.lightMode', 'Light mode')} size="24px" />,
-  dark: <Moon aria-label={t('theme.darkMode', 'Dark mode')} size="24px" />,
-  system: <System aria-label={t('theme.system', 'System')} size="24px" />,
+const getThemesIcons = (t: TFunction, size?: string) => ({
+  light: <Sun aria-label={t('theme.lightMode', 'Light mode')} size={size} />,
+  dark: <Moon aria-label={t('theme.darkMode', 'Dark mode')} size={size} />,
+  system: <System aria-label={t('theme.system', 'System')} size={size} />,
 })
 
 export const ThemeSwitcher = memo((props: Props) => {
@@ -52,7 +52,7 @@ export const ThemeSelect = () => {
   const { t } = useTranslation()
   const theme = useSelector(selectTheme)
   const dispatch = useDispatch()
-  const icons = getThemesIcons(t)
+  const icons = getThemesIcons(t, '24px')
   const themeOptions: { value: 'dark' | 'light' | 'system'; label: string }[] = [
     {
       value: 'light',

From 3ab4c238a5a82459967d1c9ec1737849c0974e65 Mon Sep 17 00:00:00 2001
From: lukaw3d <lukajeran@oasislabs.com>
Date: Mon, 29 Jul 2024 18:45:56 +0200
Subject: [PATCH 2/2] Reword empty delegations text to be consistent with
 debonding

---
 src/app/pages/StakingPage/Features/DelegationList/index.tsx | 5 ++++-
 src/locales/en/translation.json                             | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/StakingPage/Features/DelegationList/index.tsx b/src/app/pages/StakingPage/Features/DelegationList/index.tsx
index 2dcbddda7f..1484ff6c53 100644
--- a/src/app/pages/StakingPage/Features/DelegationList/index.tsx
+++ b/src/app/pages/StakingPage/Features/DelegationList/index.tsx
@@ -154,7 +154,10 @@ export const DelegationList = memo((props: Props) => {
       noHeader={true}
       noDataComponent={
         type === 'active'
-          ? t('account.emptyActiveDelegationsList', 'There are currently no active delegations.')
+          ? t(
+              'account.emptyActiveDelegationsList',
+              'There are currently no active delegations for this account.',
+            )
           : t('account.emptyDebondingDelegationsList', 'There are no debonding delegations for this account.')
       }
       columns={columns}
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 77e9f9e22a..33d3bce11f 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -13,7 +13,7 @@
       "delegate": "Delegate"
     },
     "addressCopied": "Address copied.",
-    "emptyActiveDelegationsList": "There are currently no active delegations.",
+    "emptyActiveDelegationsList": "There are currently no active delegations for this account.",
     "emptyDebondingDelegationsList": "There are no debonding delegations for this account.",
     "loading": "Loading account",
     "loadingError": "Couldn't load account.",