From 939f8cac437a9f637cb0aa301cc38e177ad9c296 Mon Sep 17 00:00:00 2001
From: Kee Jefferys <kee@loki.network>
Date: Tue, 14 Nov 2023 11:19:35 +1100
Subject: [PATCH] fix: resolve issues brought on by merge conflict
Fix conflict merge issue
fix: missing bracket
---
stylesheets/_modules.scss | 10 +++++-----
ts/state/ducks/settings.tsx | 5 +++--
ts/state/selectors/settings.ts | 5 ++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 14f5d5aef..bea921155 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -834,11 +834,11 @@
color: var(--white-color);
- font-size: 20px;
- font-weight: normal;
- letter-spacing: 0;
- text-align: center;
- background-color: rgba(0, 0, 0, 0.7);
+ font-size: 20px;
+ font-weight: normal;
+ letter-spacing: 0;
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.7);
}
.module-image__close-button {
diff --git a/ts/state/ducks/settings.tsx b/ts/state/ducks/settings.tsx
index 80647f610..74b7c86c2 100644
--- a/ts/state/ducks/settings.tsx
+++ b/ts/state/ducks/settings.tsx
@@ -50,7 +50,7 @@ const settingsSlice = createSlice({
const hasBlindedMsgRequestsEnabled = Storage.get(
SettingsKey.hasBlindedMsgRequestsEnabled,
false
- );
+ );
const hasFollowSystemThemeEnabled = Storage.get(
SettingsKey.hasFollowSystemThemeEnabled,
false
@@ -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 }>) {
diff --git a/ts/state/selectors/settings.ts b/ts/state/selectors/settings.ts
index 39e4a9f49..ff0ccb3ec 100644
--- a/ts/state/selectors/settings.ts
+++ b/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);