diff --git a/packages/desktop-client/src/components/SidebarWithData.js b/packages/desktop-client/src/components/SidebarWithData.js index 0dffcfadea..1e848cb966 100644 --- a/packages/desktop-client/src/components/SidebarWithData.js +++ b/packages/desktop-client/src/components/SidebarWithData.js @@ -51,9 +51,10 @@ function EditableBudgetName({ prefs, savePrefs }) { } let items = [ - { name: 'rename', text: 'Rename Budget' }, + { name: 'rename', text: 'Rename budget' }, + { name: 'settings', text: 'Settings' }, ...(Platform.isBrowser ? [{ name: 'help', text: 'Help' }] : []), - { name: 'close', text: 'Close File' }, + { name: 'close', text: 'Close file' }, ]; if (editing) { diff --git a/packages/desktop-client/src/components/settings/Experimental.js b/packages/desktop-client/src/components/settings/Experimental.js index 2dcf251e36..ec17bbf8cb 100644 --- a/packages/desktop-client/src/components/settings/Experimental.js +++ b/packages/desktop-client/src/components/settings/Experimental.js @@ -33,7 +33,7 @@ export default function ExperimentalFeatures({ prefs, savePrefs }) { disabled={disabled} />{' '} - Enable budget mode toggle + Budget mode toggle {disabled && ( Switch to a rollover budget before turning off this feature @@ -50,7 +50,7 @@ export default function ExperimentalFeatures({ prefs, savePrefs }) { savePrefs({ 'flags.syncAccount': !flags.syncAccount }); }} />{' '} - Enable account syncing + Account syncing via Nordigen ) : ( diff --git a/packages/desktop-client/src/components/settings/FixSplits.js b/packages/desktop-client/src/components/settings/FixSplits.js index 73024c82fb..a0200bdca7 100644 --- a/packages/desktop-client/src/components/settings/FixSplits.js +++ b/packages/desktop-client/src/components/settings/FixSplits.js @@ -83,27 +83,23 @@ export default function FixSplitsTool() { Repair split transactions if you are experiencing bugs relating to split transactions and the “Reset budget cache” button above does not help. If you see blank payees on splits or account balances (or - any balances) are incorrect, this tool may fix them. + any balances) are incorrect, this tool may fix them. This tool does two + things: - -

This tool does two things:

-

-

-

- + ); } diff --git a/packages/desktop-client/src/components/settings/Global.js b/packages/desktop-client/src/components/settings/Global.js index 2e7c225910..e67df306c6 100644 --- a/packages/desktop-client/src/components/settings/Global.js +++ b/packages/desktop-client/src/components/settings/Global.js @@ -2,8 +2,9 @@ import React, { useState, useEffect, useRef } from 'react'; import { Information } from 'loot-design/src/components/alerts'; import { View, Text, Button } from 'loot-design/src/components/common'; +import { colors } from 'loot-design/src/style'; -import { Section } from './UI'; +import { Setting } from './UI'; export default function GlobalSettings({ globalPrefs, saveGlobalPrefs }) { let [documentDirChanged, setDirChanged] = useState(false); @@ -26,50 +27,38 @@ export default function GlobalSettings({ globalPrefs, saveGlobalPrefs }) { } return ( -
- + + {documentDirChanged && ( + + A restart is required for this change to take effect + + )} + + } + > + + Actual’s files are stored in a folder on your computer. + Currently, that’s: + + - Store files here: - - {globalPrefs.documentDir} - - - - {documentDirChanged && ( - - A restart is required for this change to take effect - - )} -
+ {globalPrefs.documentDir} + + ); } diff --git a/packages/desktop-client/src/components/settings/UI.js b/packages/desktop-client/src/components/settings/UI.js index 23a9cf06c0..3eb49bd0db 100644 --- a/packages/desktop-client/src/components/settings/UI.js +++ b/packages/desktop-client/src/components/settings/UI.js @@ -7,27 +7,10 @@ import { View, Link } from 'loot-design/src/components/common'; import { colors } from 'loot-design/src/style'; import tokens from 'loot-design/src/tokens'; -export function Section({ title, children, style, titleProps, ...props }) { - return ( - - - {title} - - {children} - - ); -} - -export function Setting({ primaryAction, children }) { +export function Setting({ primaryAction, style, children }) { return ( { - if (el && location.hash === '#advanced') { - el.scrollIntoView(true); - } - }} + { + if (el && location.hash === '#advanced') { + el.scrollIntoView(true); + } + }} > + + Advanced Settings + {children} - + ) : ( + - Client version: v{window.Actual.ACTUAL_VERSION} ( + Actual is a super fast privacy-focused app for managing + your finances. + + + Client version: v{window.Actual.ACTUAL_VERSION} + Server version: {version} {isOutdated ? ( - - new version available: {latestVersion} + + New version available: {latestVersion} ) : ( - latest + + You’re up to date! + )} - ) - - Server version: {version} - + + + Release Notes + + + + ); } +function IDName({ children }) { + return {children}; +} + function AdvancedAbout({ prefs }) { return ( - <> - Budget ID: {prefs.id} - - Sync ID: {prefs.groupId || '(none)'} + + + IDs are the names Actual uses to identify your budget + internally. There are several different IDs associated with your budget. + The Budget ID is used to identify your budget file. The Sync ID is used + to access the budget on the server. - + + Budget ID: {prefs.id} + + + Sync ID: {prefs.groupId || '(none)'} + + {/* low priority todo: eliminate some or all of these, or decide when/if to show them */} + {/* + Cloud File ID: {prefs.cloudFileId || '(none)'} + + + User ID: {prefs.userId || '(none)'} + */} + ); } function Settings({ loadPrefs, savePrefs, + saveGlobalPrefs, prefs, globalPrefs, pushModal, @@ -86,32 +130,29 @@ function Settings({ > - {/* The only spot to close a budget on mobile */} -
- - - - - -
+ {isMobile() && ( + + {/* The only spot to close a budget on mobile */} + + + + + + + )} {!Platform.isBrowser && ( )} diff --git a/upcoming-release-notes/799.md b/upcoming-release-notes/799.md new file mode 100644 index 0000000000..af9f7781cb --- /dev/null +++ b/upcoming-release-notes/799.md @@ -0,0 +1,6 @@ +--- +category: Enhancements +authors: [j-f1] +--- + +Improve visual consistency on the settings page