From 9578468f10c7b2ac38f39da386306a9d33fc5716 Mon Sep 17 00:00:00 2001
From: rhahao <26148770+rhahao@users.noreply.github.com>
Date: Sun, 1 Dec 2024 23:30:58 +0300
Subject: [PATCH] fix(app): add missing color for dark theme

---
 .../app_access/user_add/person_select/index.tsx             | 4 ++--
 .../congregation_privacy/access_code_change/index.tsx       | 6 +++---
 .../congregation_privacy/access_code_view/index.tsx         | 2 +-
 .../congregation_privacy/master_key_change/index.tsx        | 6 +++---
 .../settings/congregation_privacy/master_key_view/index.tsx | 2 +-
 src/states/settings.ts                                      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/features/congregation/app_access/user_add/person_select/index.tsx b/src/features/congregation/app_access/user_add/person_select/index.tsx
index c7bafafc1a..db1dcde588 100644
--- a/src/features/congregation/app_access/user_add/person_select/index.tsx
+++ b/src/features/congregation/app_access/user_add/person_select/index.tsx
@@ -53,12 +53,12 @@ const PersonSelect = (props: PersonSelectType) => {
         <FormControlLabel
           value="baptized"
           control={<Radio />}
-          label={t('tr_accountBaptizedBrother')}
+          label={<Typography>{t('tr_accountBaptizedBrother')}</Typography>}
         />
         <FormControlLabel
           value="publisher"
           control={<Radio />}
-          label={t('tr_accountPublisherStudent')}
+          label={<Typography>{t('tr_accountPublisherStudent')}</Typography>}
         />
       </RadioGroup>
 
diff --git a/src/features/congregation/settings/congregation_privacy/access_code_change/index.tsx b/src/features/congregation/settings/congregation_privacy/access_code_change/index.tsx
index 58e830eb82..7e87abe3e9 100644
--- a/src/features/congregation/settings/congregation_privacy/access_code_change/index.tsx
+++ b/src/features/congregation/settings/congregation_privacy/access_code_change/index.tsx
@@ -40,7 +40,7 @@ const AccessCodeChange = ({ open, onClose }: AccessCodeChangeType) => {
         autoComplete="off"
         value={currentAccessCode}
         onChange={(e) => handleCurrentAccessCodeChange(e.target.value)}
-        startIcon={<IconEncryptionKey />}
+        startIcon={<IconEncryptionKey color="var(--black)" />}
         resetHelperPadding={true}
       />
 
@@ -52,7 +52,7 @@ const AccessCodeChange = ({ open, onClose }: AccessCodeChangeType) => {
         autoComplete="off"
         value={newAccessCode}
         onChange={(e) => handleNewAccessCodeChange(e.target.value)}
-        startIcon={<IconEncryptionKey />}
+        startIcon={<IconEncryptionKey color="var(--black)" />}
         resetHelperPadding={true}
       />
 
@@ -64,7 +64,7 @@ const AccessCodeChange = ({ open, onClose }: AccessCodeChangeType) => {
         autoComplete="off"
         value={confirmAccessCode}
         onChange={(e) => handleConfirmAccessCodeChange(e.target.value)}
-        startIcon={<IconEncryptionKey />}
+        startIcon={<IconEncryptionKey color="var(--black)" />}
         resetHelperPadding={true}
       />
 
diff --git a/src/features/congregation/settings/congregation_privacy/access_code_view/index.tsx b/src/features/congregation/settings/congregation_privacy/access_code_view/index.tsx
index 1a0504b690..53c460217d 100644
--- a/src/features/congregation/settings/congregation_privacy/access_code_view/index.tsx
+++ b/src/features/congregation/settings/congregation_privacy/access_code_view/index.tsx
@@ -25,7 +25,7 @@ const AccessCodeView = () => {
         variant="outlined"
         autoComplete="off"
         value={accessCode}
-        startIcon={<IconEncryptionKey />}
+        startIcon={<IconEncryptionKey color="var(--black)" />}
         resetHelperPadding={true}
         slotProps={{ input: { readOnly: true } }}
       />
diff --git a/src/features/congregation/settings/congregation_privacy/master_key_change/index.tsx b/src/features/congregation/settings/congregation_privacy/master_key_change/index.tsx
index a208dc5793..b0b658696a 100644
--- a/src/features/congregation/settings/congregation_privacy/master_key_change/index.tsx
+++ b/src/features/congregation/settings/congregation_privacy/master_key_change/index.tsx
@@ -40,7 +40,7 @@ const MasterKeyChange = ({ open, onClose }: MasterKeyChangeType) => {
         autoComplete="off"
         value={currentMasterKey}
         onChange={(e) => handleCurrentMasterKeyChange(e.target.value)}
-        startIcon={<IconEncryptionKey />}
+        startIcon={<IconEncryptionKey color="var(--black)" />}
         resetHelperPadding={true}
       />
 
@@ -52,7 +52,7 @@ const MasterKeyChange = ({ open, onClose }: MasterKeyChangeType) => {
         autoComplete="off"
         value={newMasterKey}
         onChange={(e) => handleNewMasterKeyChange(e.target.value)}
-        startIcon={<IconEncryptionKey />}
+        startIcon={<IconEncryptionKey color="var(--black)" />}
         resetHelperPadding={true}
       />
 
@@ -64,7 +64,7 @@ const MasterKeyChange = ({ open, onClose }: MasterKeyChangeType) => {
         autoComplete="off"
         value={confirmMasterKey}
         onChange={(e) => handleConfirmMasterKeyChange(e.target.value)}
-        startIcon={<IconEncryptionKey />}
+        startIcon={<IconEncryptionKey color="var(--black)" />}
         resetHelperPadding={true}
       />
 
diff --git a/src/features/congregation/settings/congregation_privacy/master_key_view/index.tsx b/src/features/congregation/settings/congregation_privacy/master_key_view/index.tsx
index d789706774..aab20637bd 100644
--- a/src/features/congregation/settings/congregation_privacy/master_key_view/index.tsx
+++ b/src/features/congregation/settings/congregation_privacy/master_key_view/index.tsx
@@ -25,7 +25,7 @@ const MasterKeyView = () => {
         variant="outlined"
         autoComplete="off"
         value={masterKey}
-        startIcon={<IconEncryptionKey />}
+        startIcon={<IconEncryptionKey color="var(--black)" />}
         resetHelperPadding={true}
         slotProps={{ input: { readOnly: true } }}
       />
diff --git a/src/states/settings.ts b/src/states/settings.ts
index cba6c4afe8..7085d06d0a 100644
--- a/src/states/settings.ts
+++ b/src/states/settings.ts
@@ -588,7 +588,7 @@ export const userMembersDelegateState = selector({
   get: ({ get }) => {
     const settings = get(settingsState);
 
-    return settings.user_settings.user_members_delegate;
+    return settings.user_settings.user_members_delegate || [];
   },
 });