A local-first personal finance app
:bug: Mobile: fix Accounts page theme color (#1604)
Trevor Farlowcdff98b109e1
diff --git a/packages/desktop-client/src/components/accounts/MobileAccount.js b/packages/desktop-client/src/components/accounts/MobileAccount.jsindex 875c74a4a9..b7d05dc842 100644--- a/packages/desktop-client/src/components/accounts/MobileAccount.js+++ b/packages/desktop-client/src/components/accounts/MobileAccount.js@@ -167,7 +167,7 @@ export default function Account(props) {useEffect(updateSearchQuery, [searchText, currentQuery, state.dateFormat]);- useSetThemeColor(theme.altMenuItemTextHover);+ useSetThemeColor(theme.mobileAccountViewTheme);if (!accounts || !accounts.length) {return null;diff --git a/packages/desktop-client/src/components/accounts/MobileAccounts.js b/packages/desktop-client/src/components/accounts/MobileAccounts.jsindex 83770cfc9f..73be0521f3 100644--- a/packages/desktop-client/src/components/accounts/MobileAccounts.js+++ b/packages/desktop-client/src/components/accounts/MobileAccounts.js@@ -275,7 +275,7 @@ export default function Accounts() {navigate(`/transaction/${transaction}`);};- useSetThemeColor(theme.altMenuBackground);+ useSetThemeColor(theme.mobileAccountsViewTheme);return (<View style={{ flex: 1 }}>diff --git a/packages/desktop-client/src/components/budget/MobileBudget.js b/packages/desktop-client/src/components/budget/MobileBudget.jsindex 52b2912bef..0486a5b329 100644--- a/packages/desktop-client/src/components/budget/MobileBudget.js+++ b/packages/desktop-client/src/components/budget/MobileBudget.js@@ -13,7 +13,7 @@ import * as monthUtils from 'loot-core/src/shared/months';import { useActions } from '../../hooks/useActions';import { useSetThemeColor } from '../../hooks/useSetThemeColor';import AnimatedLoading from '../../icons/AnimatedLoading';-import { colors } from '../../style';+import { theme } from '../../style';import View from '../common/View';import SyncRefresh from '../SyncRefresh';@@ -303,7 +303,7 @@ export default function BudgetWrapper() {let actions = useActions();let spreadsheet = useSpreadsheet();- useSetThemeColor(colors.p5);+ useSetThemeColor(theme.mobileBudgetViewTheme);return (<BudgetcategoryGroups={categoryGroups}diff --git a/packages/desktop-client/src/components/manager/ConfigServer.tsx b/packages/desktop-client/src/components/manager/ConfigServer.tsxindex 7dbda77584..8934024d20 100644--- a/packages/desktop-client/src/components/manager/ConfigServer.tsx+++ b/packages/desktop-client/src/components/manager/ConfigServer.tsx@@ -8,7 +8,7 @@ import {import { useActions } from '../../hooks/useActions';import { useSetThemeColor } from '../../hooks/useSetThemeColor';-import { colors } from '../../style';+import { colors, theme } from '../../style';import Button, { ButtonWithLoading } from '../common/Button';import { BigInput } from '../common/Input';import Text from '../common/Text';@@ -18,7 +18,7 @@ import { useServerURL, useSetServerURL } from '../ServerContext';import { Title } from './subscribe/common';export default function ConfigServer() {- useSetThemeColor(colors.p5);+ useSetThemeColor(theme.mobileConfigServerViewTheme);let { createBudget, signOut, loggedIn } = useActions();let navigate = useNavigate();let [url, setUrl] = useState('');diff --git a/packages/desktop-client/src/components/settings/index.tsx b/packages/desktop-client/src/components/settings/index.tsxindex cfd38ca00f..5771954a50 100644--- a/packages/desktop-client/src/components/settings/index.tsx+++ b/packages/desktop-client/src/components/settings/index.tsx@@ -11,7 +11,7 @@ import useFeatureFlag from '../../hooks/useFeatureFlag';import useLatestVersion, { useIsOutdated } from '../../hooks/useLatestVersion';import { useSetThemeColor } from '../../hooks/useSetThemeColor';import { useResponsive } from '../../ResponsiveProvider';-import { colors } from '../../style';+import { colors, theme } from '../../style';import tokens from '../../tokens';import Button from '../common/Button';import ExternalLink from '../common/ExternalLink';@@ -133,7 +133,7 @@ export default function Settings() {const { isNarrowWidth } = useResponsive();const themesFlag = useFeatureFlag('themes');- useSetThemeColor(colors.n11);+ useSetThemeColor(theme.mobileSettingsViewTheme);return (<Viewstyle={{diff --git a/packages/desktop-client/src/components/transactions/MobileTransaction.js b/packages/desktop-client/src/components/transactions/MobileTransaction.jsindex 7dcf4007aa..d1eefb3485 100644--- a/packages/desktop-client/src/components/transactions/MobileTransaction.js+++ b/packages/desktop-client/src/components/transactions/MobileTransaction.js@@ -698,7 +698,7 @@ function TransactionEditUnconnected(props) {let adding = false;let deleted = false;- useSetThemeColor(colors.p5);+ useSetThemeColor(theme.mobileTransactionViewTheme);useEffect(() => {// May as well update categories / accounts when transaction ID changesdiff --git a/packages/desktop-client/src/hooks/useSetThemeColor.ts b/packages/desktop-client/src/hooks/useSetThemeColor.tsindex 15509fa7a7..117181ddcb 100644--- a/packages/desktop-client/src/hooks/useSetThemeColor.ts+++ b/packages/desktop-client/src/hooks/useSetThemeColor.ts@@ -1,8 +1,10 @@import { useEffect } from 'react';+const VAR_STRING_REGEX = /^var\((--.*)\)$/;+export function useSetThemeColor(color: string) {useEffect(() => {- setThemeColor(color);+ setThemeColor(getPropertyValueFromVarString(color));}, [color]);}@@ -11,3 +13,11 @@ function setThemeColor(color: string) {const themeTag = [...metaTags].find(tag => tag.name === 'theme-color');themeTag.setAttribute('content', color);}++function getPropertyValueFromVarString(varString: string) {+ return VAR_STRING_REGEX.test(varString)+ ? window+ .getComputedStyle(document.documentElement)+ .getPropertyValue(varString.match(VAR_STRING_REGEX)[1])+ : varString;+}diff --git a/packages/desktop-client/src/style/themes/dark.ts b/packages/desktop-client/src/style/themes/dark.tsindex 964a67da10..e2691ec83f 100644--- a/packages/desktop-client/src/style/themes/dark.ts+++ b/packages/desktop-client/src/style/themes/dark.ts@@ -83,6 +83,14 @@ export const mobileNavItemSelected = colorPalette.purple400;export const mobileAccountShadow = cardShadow;export const mobileAccountText = colorPalette.blue800;+// Mobile view themes (for the top bar)+export const mobileAccountViewTheme = colorPalette.navy50;+export const mobileAccountsViewTheme = colorPalette.blue800;+export const mobileBudgetViewTheme = colorPalette.purple500;+export const mobileConfigServerViewTheme = colorPalette.purple500;+export const mobileSettingsViewTheme = colorPalette.navy50;+export const mobileTransactionViewTheme = colorPalette.purple500;+// Buttonexport const buttonMenuText = colorPalette.navy100;export const buttonMenuTextHover = colorPalette.navy50;diff --git a/packages/desktop-client/src/style/themes/light.ts b/packages/desktop-client/src/style/themes/light.tsindex af72c18fed..aded0c4476 100644--- a/packages/desktop-client/src/style/themes/light.ts+++ b/packages/desktop-client/src/style/themes/light.ts@@ -83,6 +83,14 @@ export const mobileNavItemSelected = colorPalette.purple500;export const mobileAccountShadow = colorPalette.navy300;export const mobileAccountText = colorPalette.blue800;+// Mobile view themes (for the top bar)+export const mobileAccountViewTheme = colorPalette.navy50;+export const mobileAccountsViewTheme = colorPalette.blue800;+export const mobileBudgetViewTheme = colorPalette.purple500;+export const mobileConfigServerViewTheme = colorPalette.purple500;+export const mobileSettingsViewTheme = colorPalette.navy50;+export const mobileTransactionViewTheme = colorPalette.purple500;+// Buttonexport const buttonMenuText = colorPalette.navy100;export const buttonMenuTextHover = colorPalette.navy50;diff --git a/upcoming-release-notes/1604.md b/upcoming-release-notes/1604.mdnew file mode 100644index 0000000000..f9736dda9c--- /dev/null+++ b/upcoming-release-notes/1604.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [trevdor]+---++Mobile: fix regression of Accounts page theme