fix: resolve issues brought on by merge conflict

Fix conflict merge issue

fix: missing bracket

stylesheets/_modules.scss

@@ -835,10 +835,10 @@
   color: var(--white-color);
 
   font-size: 20px;
-	font-weight: normal;
+  font-weight: normal;
-	letter-spacing: 0;
+  letter-spacing: 0;
-	text-align: center;
+  text-align: center;
-	background-color: rgba(0, 0, 0, 0.7);
+  background-color: rgba(0, 0, 0, 0.7);
 }
 
 .module-image__close-button {

ts/state/ducks/settings.tsx

@@ -66,11 +66,12 @@ const settingsSlice = createSlice({
 
       state.settingsBools.hasFollowSystemThemeEnabled = isBoolean(hasFollowSystemThemeEnabled)
         ? hasFollowSystemThemeEnabled
+        : false;
 
       state.settingsBools.hasShiftSendEnabled = isBoolean(hasShiftSendEnabled)
         ? hasShiftSendEnabled
-
         : false;
+
       return state;
     },
     updateSettingsBoolValue(state, action: PayloadAction<{ id: string; value: boolean }>) {

ts/state/selectors/settings.ts

@@ -11,14 +11,12 @@ const getHasDeviceOutdatedSyncing = (state: StateType) =>
 const getHasBlindedMsgRequestsEnabled = (state: StateType) =>
   state.settings.settingsBools[SettingsKey.hasBlindedMsgRequestsEnabled];
 
-
 const getHasFollowSystemThemeEnabled = (state: StateType) =>
   state.settings.settingsBools[SettingsKey.hasFollowSystemThemeEnabled];
 
 const getHasShiftSendEnabled = (state: StateType) =>
   state.settings.settingsBools[SettingsKey.hasShiftSendEnabled];
 
-
 export const useHasLinkPreviewEnabled = () => {
   const value = useSelector(getLinkPreviewEnabled);
   return Boolean(value);
@@ -34,9 +32,10 @@ export const useHasBlindedMsgRequestsEnabled = () => {
   return Boolean(value);
 };
 
-
 export const useHasFollowSystemThemeEnabled = () => {
   const value = useSelector(getHasFollowSystemThemeEnabled);
+  return Boolean(value);
+};
 
 export const useHasEnterSendEnabled = () => {
   const value = useSelector(getHasShiftSendEnabled);