A local-first personal finance app
Consistent modal paddings (#2571)
Joel Jeremy Marquez53b5f3a0fc8f
diff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.pngindex a2e2fc3f1b..a3662f61ca 100644Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.pngindex 6240ae33bc..13c57c3eb4 100644Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.pngindex 7290097d37..a548f7784f 100644Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.pngnew file mode 100644index 0000000000..78b0b33922Binary files /dev/null and b/packages/desktop-client/e2e/rules.test.js-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.pngindex d4ff966a8d..e2dd224a8f 100644Binary files a/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png differdiff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsxindex 999849eb92..1a4cf70a85 100644--- a/packages/desktop-client/src/components/Modals.tsx+++ b/packages/desktop-client/src/components/Modals.tsx@@ -23,9 +23,9 @@ import { ConfirmCategoryDelete } from './modals/ConfirmCategoryDelete';import { ConfirmTransactionEdit } from './modals/ConfirmTransactionEdit';import { ConfirmUnlinkAccount } from './modals/ConfirmUnlinkAccount';import { CoverModal } from './modals/CoverModal';-import { CreateAccount } from './modals/CreateAccount';+import { CreateAccountModal } from './modals/CreateAccountModal';import { CreateEncryptionKeyModal } from './modals/CreateEncryptionKeyModal';-import { CreateLocalAccount } from './modals/CreateLocalAccount';+import { CreateLocalAccountModal } from './modals/CreateLocalAccountModal';import { EditField } from './modals/EditField';import { EditRule } from './modals/EditRule';import { FixEncryptionKeyModal } from './modals/FixEncryptionKeyModal';@@ -105,7 +105,7 @@ export function Modals() {case 'add-account':return (- <CreateAccount+ <CreateAccountModalkey={name}modalProps={modalProps}syncServerStatus={syncServerStatus}@@ -115,7 +115,7 @@ export function Modals() {case 'add-local-account':return (- <CreateLocalAccount+ <CreateLocalAccountModalkey={name}modalProps={modalProps}actions={actions}diff --git a/packages/desktop-client/src/components/common/Modal.tsx b/packages/desktop-client/src/components/common/Modal.tsxindex 6d0e26e05f..3fc6574b49 100644--- a/packages/desktop-client/src/components/common/Modal.tsx+++ b/packages/desktop-client/src/components/common/Modal.tsx@@ -15,7 +15,6 @@ import ReactModal from 'react-modal';import { AnimatedLoading } from '../../icons/AnimatedLoading';import { SvgLogo } from '../../icons/logo';import { SvgDelete } from '../../icons/v0';-import { useResponsive } from '../../ResponsiveProvider';import { type CSSProperties, styles, theme } from '../../style';import { tokens } from '../../tokens';@@ -52,7 +51,7 @@ export const Modal = ({isCurrent,isHidden,size,- padding = 20,+ padding = 10,showHeader = true,leftHeaderContent,CloseButton: CloseButtonComponent = ModalCloseButton,@@ -69,7 +68,6 @@ export const Modal = ({children,onClose,}: ModalProps) => {- const { isNarrowWidth } = useResponsive();const { enableScope, disableScope } = useHotkeysContext();// This deactivates any key handlers in the "app" scope@@ -133,12 +131,14 @@ export const Modal = ({isCurrent={isCurrent}size={size}style={{+ flex: 1,+ padding,willChange: 'opacity, transform',maxWidth: '90vw',minWidth: '90vw',maxHeight: '90vh',minHeight: 0,- borderRadius: 4,+ borderRadius: 6,//border: '1px solid ' + theme.modalBorder,color: theme.pageText,backgroundColor: theme.modalBackground,@@ -156,17 +156,14 @@ export const Modal = ({style={{justifyContent: 'center',alignItems: 'center',- padding: '0 20px',position: 'relative',- height: 70,+ height: 60,}}><Viewstyle={{position: 'absolute',left: 0,- marginRight: !isNarrowWidth ? 5 : undefined,- marginLeft: !isNarrowWidth ? 15 : undefined,}}>{leftHeaderContent}@@ -178,8 +175,7 @@ export const Modal = ({textAlign: 'center',// We need to force a width for the text-overflow// ellipses to work because we are aligning center.- // This effectively gives it a padding of 20px- width: 'calc(100% - 40px)',+ width: 'calc(100% - 60px)',}}>{!title ? (@@ -200,15 +196,13 @@ export const Modal = ({style={{position: 'absolute',right: 0,- marginRight: !isNarrowWidth ? 15 : undefined,- marginLeft: !isNarrowWidth ? 5 : undefined,}}><CloseButtonComponent onClick={onClose} /></View></View>)}- <View style={{ padding, paddingTop: 0, flex: 1 }}>+ <View style={{ paddingTop: 0, flex: 1 }}>{typeof children === 'function' ? children() : children}</View>{loading && (diff --git a/packages/desktop-client/src/components/manager/DeleteFile.tsx b/packages/desktop-client/src/components/manager/DeleteFile.tsxindex 1418fa7bda..3b1cff1941 100644--- a/packages/desktop-client/src/components/manager/DeleteFile.tsx+++ b/packages/desktop-client/src/components/manager/DeleteFile.tsx@@ -30,7 +30,6 @@ export function DeleteFile({ modalProps, actions, file }: DeleteFileProps) {<Modal{...modalProps}title={'Delete ' + file.name}- padding={0}showOverlay={false}onClose={modalProps.onBack}>diff --git a/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsxindex 15026d0d84..025c9a2658 100644--- a/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx+++ b/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx@@ -42,12 +42,8 @@ export function AccountAutocompleteModal({focusAfterClose={false}{...modalProps}onClose={_onClose}- padding={0}style={{- flex: 0,height: isNarrowWidth ? '85vh' : 275,- padding: '15px 10px',- borderRadius: '6px',backgroundColor: theme.menuAutoCompleteBackground,}}CloseButton={props => (diff --git a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx b/packages/desktop-client/src/components/modals/AccountMenuModal.tsxindex 5e18914e47..36dcfa3f91 100644--- a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/AccountMenuModal.tsx@@ -85,12 +85,8 @@ export function AccountMenuModal({focusAfterClose={false}{...modalProps}onClose={_onClose}- padding={0}style={{- flex: 1,height: '45vh',- padding: '0 10px',- borderRadius: '6px',}}leftHeaderContent={<AdditionalAccountMenu@@ -137,7 +133,6 @@ export function AccountMenuModal({justifyContent: 'space-between',alignContent: 'space-between',paddingTop: 10,- paddingBottom: 10,}}><Button style={buttonStyle} onClick={_onEditNotes}>diff --git a/packages/desktop-client/src/components/modals/BudgetPageMenuModal.tsx b/packages/desktop-client/src/components/modals/BudgetPageMenuModal.tsxindex beeffccbee..6c5a7f77ad 100644--- a/packages/desktop-client/src/components/modals/BudgetPageMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/BudgetPageMenuModal.tsx@@ -27,18 +27,7 @@ export function BudgetPageMenuModal({};return (- <Modal- showHeader- focusAfterClose={false}- {...modalProps}- padding={0}- style={{- flex: 1,- padding: '0 10px',- paddingBottom: 10,- borderRadius: '6px',- }}- >+ <Modal showHeader focusAfterClose={false} {...modalProps}><BudgetPageMenugetItemStyle={() => defaultMenuItemStyle}onAddCategoryGroup={onAddCategoryGroup}diff --git a/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsxindex b561d27ca0..e158b63f13 100644--- a/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx+++ b/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx@@ -48,12 +48,8 @@ export function CategoryAutocompleteModal({focusAfterClose={false}{...modalProps}onClose={_onClose}- padding={0}style={{- flex: 0,height: isNarrowWidth ? '85vh' : 275,- padding: '15px 10px',- borderRadius: '6px',backgroundColor: theme.menuAutoCompleteBackground,}}CloseButton={props => (diff --git a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsxindex e9d9a77682..aab94588ec 100644--- a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx@@ -93,12 +93,8 @@ export function CategoryGroupMenuModal({focusAfterClose={false}{...modalProps}onClose={_onClose}- padding={0}style={{- flex: 1,height: '45vh',- padding: '0 10px',- borderRadius: '6px',}}leftHeaderContent={<AdditionalCategoryGroupMenu@@ -142,7 +138,6 @@ export function CategoryGroupMenuModal({justifyContent: 'space-between',alignContent: 'space-between',paddingTop: 10,- paddingBottom: 10,}}><Button style={buttonStyle} onClick={_onAddCategory}>diff --git a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsxindex 82c8bff783..1fa27a5cdf 100644--- a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx@@ -84,12 +84,8 @@ export function CategoryMenuModal({focusAfterClose={false}{...modalProps}onClose={_onClose}- padding={0}style={{- flex: 1,height: '45vh',- padding: '0 10px',- borderRadius: '6px',}}leftHeaderContent={<AdditionalCategoryMenu@@ -133,7 +129,6 @@ export function CategoryMenuModal({justifyContent: 'space-between',alignContent: 'space-between',paddingTop: 10,- paddingBottom: 10,}}><Button style={buttonStyle} onClick={_onEditNotes}>diff --git a/packages/desktop-client/src/components/modals/CoverModal.tsx b/packages/desktop-client/src/components/modals/CoverModal.tsxindex cf427a79d8..81386d44fb 100644--- a/packages/desktop-client/src/components/modals/CoverModal.tsx+++ b/packages/desktop-client/src/components/modals/CoverModal.tsx@@ -79,42 +79,31 @@ export function CoverModal({showHeaderfocusAfterClose={false}{...modalProps}- padding={0}- style={{- flex: 1,- padding: '0 10px',- paddingBottom: 10,- borderRadius: '6px',- }}>- {() => (- <>- <View>- <FieldLabel title="Cover from category:" />- <TapField value={fromCategory?.name} onClick={onCategoryClick} />- </View>+ <View>+ <FieldLabel title="Cover from category:" />+ <TapField value={fromCategory?.name} onClick={onCategoryClick} />+ </View>- <View- style={{- justifyContent: 'center',- alignItems: 'center',- marginTop: 10,- }}- >- <Button- type="primary"- style={{- height: styles.mobileMinHeight,- marginLeft: styles.mobileEditingPadding,- marginRight: styles.mobileEditingPadding,- }}- onClick={() => _onSubmit(fromCategoryId)}- >- Transfer- </Button>- </View>- </>- )}+ <View+ style={{+ justifyContent: 'center',+ alignItems: 'center',+ paddingTop: 10,+ }}+ >+ <Button+ type="primary"+ style={{+ height: styles.mobileMinHeight,+ marginLeft: styles.mobileEditingPadding,+ marginRight: styles.mobileEditingPadding,+ }}+ onClick={() => _onSubmit(fromCategoryId)}+ >+ Transfer+ </Button>+ </View></Modal>);}diff --git a/packages/desktop-client/src/components/modals/CreateAccount.tsx b/packages/desktop-client/src/components/modals/CreateAccountModal.tsxsimilarity index 99%rename from packages/desktop-client/src/components/modals/CreateAccount.tsxrename to packages/desktop-client/src/components/modals/CreateAccountModal.tsxindex ae035dae49..9c4f4ed590 100644--- a/packages/desktop-client/src/components/modals/CreateAccount.tsx+++ b/packages/desktop-client/src/components/modals/CreateAccountModal.tsx@@ -24,7 +24,7 @@ type CreateAccountProps = {upgradingAccountId?: string;};-export function CreateAccount({+export function CreateAccountModal({modalProps,syncServerStatus,upgradingAccountId,diff --git a/packages/desktop-client/src/components/modals/CreateEncryptionKeyModal.tsx b/packages/desktop-client/src/components/modals/CreateEncryptionKeyModal.tsxindex 20cfa1317c..7de0a7da70 100644--- a/packages/desktop-client/src/components/modals/CreateEncryptionKeyModal.tsx+++ b/packages/desktop-client/src/components/modals/CreateEncryptionKeyModal.tsx@@ -65,11 +65,8 @@ export function CreateEncryptionKeyModal({<Modal{...modalProps}style={{- flex: 1,padding: '0 10px',- borderRadius: '6px',}}- padding={10}title={isRecreating ? 'Generate new key' : 'Enable encryption'}onClose={modalProps.onClose}>diff --git a/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx b/packages/desktop-client/src/components/modals/CreateLocalAccountModal.tsxsimilarity index 93%rename from packages/desktop-client/src/components/modals/CreateLocalAccount.tsxrename to packages/desktop-client/src/components/modals/CreateLocalAccountModal.tsxindex 00dd36e108..2783acf2c8 100644--- a/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx+++ b/packages/desktop-client/src/components/modals/CreateLocalAccountModal.tsx@@ -12,7 +12,7 @@ import { InitialFocus } from '../common/InitialFocus';import { InlineField } from '../common/InlineField';import { Input } from '../common/Input';import { Link } from '../common/Link';-import { Modal, ModalButtons } from '../common/Modal';+import { Modal, ModalButtons, ModalTitle } from '../common/Modal';import { Text } from '../common/Text';import { View } from '../common/View';import { Checkbox } from '../forms';@@ -23,7 +23,7 @@ type CreateLocalAccountProps = {actions: BoundActions;};-export function CreateLocalAccount({+export function CreateLocalAccountModal({modalProps,actions,}: CreateLocalAccountProps) {@@ -38,7 +38,10 @@ export function CreateLocalAccount({const validateBalance = balance => !isNaN(parseFloat(balance));return (- <Modal title="Create Local Account" {...modalProps}>+ <Modal+ title={<ModalTitle title="Create Local Account" shrinkOnOverflow />}+ {...modalProps}+ >{() => (<View><form@@ -62,7 +65,7 @@ export function CreateLocalAccount({}}}>- <InlineField label="Name" width="75%">+ <InlineField label="Name" width="100%"><InitialFocus><Inputname="name"@@ -85,7 +88,7 @@ export function CreateLocalAccount({<Viewstyle={{- width: '75%',+ width: '100%',flexDirection: 'row',justifyContent: 'flex-end',}}@@ -137,7 +140,7 @@ export function CreateLocalAccount({</View></View>- <InlineField label="Balance" width="75%">+ <InlineField label="Balance" width="100%"><Inputname="balance"inputMode="decimal"diff --git a/packages/desktop-client/src/components/modals/EditField.jsx b/packages/desktop-client/src/components/modals/EditField.jsxindex bdcabb487e..295d77659c 100644--- a/packages/desktop-client/src/components/modals/EditField.jsx+++ b/packages/desktop-client/src/components/modals/EditField.jsx@@ -221,12 +221,10 @@ export function EditField({ modalProps, name, onSubmit, onClose }) {focusAfterClose={false}{...modalProps}onClose={onCloseInner}- padding={0}style={{flex: 0,height: isNarrowWidth ? '85vh' : 275,padding: '15px 10px',- borderRadius: '6px',...(minWidth && { minWidth }),backgroundColor: theme.menuAutoCompleteBackground,}}diff --git a/packages/desktop-client/src/components/modals/EditRule.jsx b/packages/desktop-client/src/components/modals/EditRule.jsxindex bbd547ddf2..cb3c6d3ac6 100644--- a/packages/desktop-client/src/components/modals/EditRule.jsx+++ b/packages/desktop-client/src/components/modals/EditRule.jsx@@ -894,7 +894,6 @@ export function EditRule({ modalProps, defaultRule, onSave: originalOnSave }) {return (<Modaltitle="Rule"- padding={0}{...modalProps}style={{ ...modalProps.style, flex: 'inherit' }}>diff --git a/packages/desktop-client/src/components/modals/FixEncryptionKeyModal.tsx b/packages/desktop-client/src/components/modals/FixEncryptionKeyModal.tsxindex 30446306d5..a1a451cb67 100644--- a/packages/desktop-client/src/components/modals/FixEncryptionKeyModal.tsx+++ b/packages/desktop-client/src/components/modals/FixEncryptionKeyModal.tsx@@ -61,11 +61,8 @@ export function FixEncryptionKeyModal({hasExistingKey ? 'Unable to decrypt file' : 'This file is encrypted'}style={{- flex: 1,padding: '0 10px',- borderRadius: '6px',}}- padding={10}onClose={modalProps.onClose}><Viewdiff --git a/packages/desktop-client/src/components/modals/HoldBufferModal.tsx b/packages/desktop-client/src/components/modals/HoldBufferModal.tsxindex c7e249da23..93304923ad 100644--- a/packages/desktop-client/src/components/modals/HoldBufferModal.tsx+++ b/packages/desktop-client/src/components/modals/HoldBufferModal.tsx@@ -42,48 +42,37 @@ export function HoldBufferModal({showHeaderfocusAfterClose={false}{...modalProps}- padding={0}- style={{- flex: 1,- padding: '0 10px',- paddingBottom: 10,- borderRadius: '6px',- }}>- {() => (- <>- <View>- <FieldLabel title="Hold this amount:" />- <InitialFocus>- <InputField- inputMode="decimal"- defaultValue={initialAmount}- onUpdate={value => setAmount(value)}- onEnter={() => _onSubmit(amount)}- />- </InitialFocus>- </View>- <View- style={{- justifyContent: 'center',- alignItems: 'center',- marginTop: 10,- }}- >- <Button- type="primary"- style={{- height: styles.mobileMinHeight,- marginLeft: styles.mobileEditingPadding,- marginRight: styles.mobileEditingPadding,- }}- onClick={() => _onSubmit(amount)}- >- Hold- </Button>- </View>- </>- )}+ <View>+ <FieldLabel title="Hold this amount:" />+ <InitialFocus>+ <InputField+ inputMode="decimal"+ defaultValue={initialAmount}+ onUpdate={value => setAmount(value)}+ onEnter={() => _onSubmit(amount)}+ />+ </InitialFocus>+ </View>+ <View+ style={{+ justifyContent: 'center',+ alignItems: 'center',+ paddingTop: 10,+ }}+ >+ <Button+ type="primary"+ style={{+ height: styles.mobileMinHeight,+ marginLeft: styles.mobileEditingPadding,+ marginRight: styles.mobileEditingPadding,+ }}+ onClick={() => _onSubmit(amount)}+ >+ Hold+ </Button>+ </View></Modal>);}diff --git a/packages/desktop-client/src/components/modals/LoadBackup.jsx b/packages/desktop-client/src/components/modals/LoadBackup.jsxindex e09f783322..741b41d7c0 100644--- a/packages/desktop-client/src/components/modals/LoadBackup.jsx+++ b/packages/desktop-client/src/components/modals/LoadBackup.jsx@@ -74,7 +74,7 @@ export function LoadBackup({const previousBackups = backups.filter(backup => !backup.isLatest);return (- <Modal title="Load Backup" padding={0} {...modalProps} style={{ flex: 0 }}>+ <Modal title="Load Backup" {...modalProps} style={{ flex: 0 }}>{() => (<View style={{ marginBottom: 30 }}><Viewdiff --git a/packages/desktop-client/src/components/modals/ManageRulesModal.tsx b/packages/desktop-client/src/components/modals/ManageRulesModal.tsxindex 6c625005cc..9d1a690222 100644--- a/packages/desktop-client/src/components/modals/ManageRulesModal.tsx+++ b/packages/desktop-client/src/components/modals/ManageRulesModal.tsx@@ -28,15 +28,7 @@ export function ManageRulesModal({}return (- <Modal- title="Rules"- padding={0}- loading={loading}- {...modalProps}- style={{- flex: 1,- }}- >+ <Modal title="Rules" loading={loading} {...modalProps}>{() => <ManageRules isModal payeeId={payeeId} setLoading={setLoading} />}</Modal>);diff --git a/packages/desktop-client/src/components/modals/MergeUnusedPayees.jsx b/packages/desktop-client/src/components/modals/MergeUnusedPayees.jsxindex 33ca3d7032..78d0efc178 100644--- a/packages/desktop-client/src/components/modals/MergeUnusedPayees.jsx+++ b/packages/desktop-client/src/components/modals/MergeUnusedPayees.jsx@@ -80,7 +80,6 @@ export function MergeUnusedPayees({ modalProps, payeeIds, targetPayeeId }) {return (<Modaltitle="Merge payee?"- padding={0}showHeader={false}{...modalProps}style={modalProps.style}diff --git a/packages/desktop-client/src/components/modals/Notes.tsx b/packages/desktop-client/src/components/modals/Notes.tsxindex 2391027219..e788e2734c 100644--- a/packages/desktop-client/src/components/modals/Notes.tsx+++ b/packages/desktop-client/src/components/modals/Notes.tsx@@ -41,57 +41,50 @@ export function Notes({ modalProps, id, name, onSave }: NotesProps) {focusAfterClose={false}{...modalProps}onClose={_onClose}- padding={0}style={{- flex: 1,height: '50vh',- padding: '0 10px',- borderRadius: '6px',}}>- {() => (+ <View+ style={{+ flex: 1,+ flexDirection: 'column',+ }}+ >+ <NotesComponent+ notes={notes}+ editable={true}+ focused={true}+ getStyle={() => ({+ borderRadius: 6,+ flex: 1,+ minWidth: 0,+ })}+ onChange={setNotes}+ /><Viewstyle={{- flex: 1,flexDirection: 'column',+ alignItems: 'center',+ justifyItems: 'center',+ width: '100%',+ paddingTop: 10,}}>- <NotesComponent- notes={notes}- editable={true}- focused={true}- getStyle={() => ({- borderRadius: 6,- flex: 1,- minWidth: 0,- })}- onChange={setNotes}- />- <View+ <Button+ type="primary"style={{- flexDirection: 'column',- alignItems: 'center',- justifyItems: 'center',+ fontSize: 17,+ fontWeight: 400,width: '100%',- paddingTop: 10,- paddingBottom: 10,}}+ onClick={_onSave}>- <Button- type="primary"- style={{- fontSize: 17,- fontWeight: 400,- width: '100%',- }}- onClick={_onSave}- >- <SvgCheck width={17} height={17} style={{ paddingRight: 5 }} />- Save notes- </Button>- </View>+ <SvgCheck width={17} height={17} style={{ paddingRight: 5 }} />+ Save notes+ </Button></View>- )}+ </View></Modal>);}diff --git a/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsxindex 3d26dc45d5..5c860cacc3 100644--- a/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx+++ b/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx@@ -45,12 +45,8 @@ export function PayeeAutocompleteModal({focusAfterClose={false}{...modalProps}onClose={_onClose}- padding={0}style={{- flex: 0,height: isNarrowWidth ? '85vh' : 275,- padding: '15px 10px',- borderRadius: '6px',backgroundColor: theme.menuAutoCompleteBackground,}}CloseButton={props => (diff --git a/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsxindex 1bd2fb83f4..c77f4776d1 100644--- a/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx@@ -41,13 +41,6 @@ export function ReportBalanceMenuModal({showHeaderfocusAfterClose={false}{...modalProps}- padding={0}- style={{- flex: 1,- padding: '0 10px',- paddingBottom: 10,- borderRadius: '6px',- }}><Viewstyle={{diff --git a/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsxindex 17cdc075fd..a76187e2f9 100644--- a/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx@@ -62,12 +62,9 @@ export function ReportBudgetMenuModal({showHeaderfocusAfterClose={false}{...modalProps}- padding={0}style={{- flex: 1,padding: '0 10px',paddingBottom: 10,- borderRadius: '6px',}}><Viewdiff --git a/packages/desktop-client/src/components/modals/ReportBudgetMonthMenuModal.tsx b/packages/desktop-client/src/components/modals/ReportBudgetMonthMenuModal.tsxindex 18cab06ad8..a70079bc0b 100644--- a/packages/desktop-client/src/components/modals/ReportBudgetMonthMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/ReportBudgetMonthMenuModal.tsx@@ -72,11 +72,8 @@ export function ReportBudgetMonthMenuModal({focusAfterClose={false}{...modalProps}onClose={onClose}- padding={10}style={{- flex: 1,height: '50vh',- borderRadius: '6px',}}><Viewdiff --git a/packages/desktop-client/src/components/modals/ReportBudgetSummaryModal.tsx b/packages/desktop-client/src/components/modals/ReportBudgetSummaryModal.tsxindex a58338ce3b..144da8fe02 100644--- a/packages/desktop-client/src/components/modals/ReportBudgetSummaryModal.tsx+++ b/packages/desktop-client/src/components/modals/ReportBudgetSummaryModal.tsx@@ -24,25 +24,23 @@ export function ReportBudgetSummaryModal({const currentMonth = monthUtils.currentMonth();return (<Modal title="Budget Summary" {...modalProps}>- {() => (- <NamespaceContext.Provider value={sheetForMonth(month)}>- <Stack- spacing={2}- style={{- alignSelf: 'center',- backgroundColor: 'transparent',- borderRadius: 4,- }}- >- <IncomeTotal style={{ ...styles.mediumText }} />- <ExpenseTotal style={{ ...styles.mediumText }} />- </Stack>- <Saved- projected={month >= currentMonth}- style={{ ...styles.mediumText, marginTop: 20 }}- />- </NamespaceContext.Provider>- )}+ <NamespaceContext.Provider value={sheetForMonth(month)}>+ <Stack+ spacing={2}+ style={{+ alignSelf: 'center',+ backgroundColor: 'transparent',+ borderRadius: 4,+ }}+ >+ <IncomeTotal style={{ ...styles.mediumText }} />+ <ExpenseTotal style={{ ...styles.mediumText }} />+ </Stack>+ <Saved+ projected={month >= currentMonth}+ style={{ ...styles.mediumText, marginTop: 20 }}+ />+ </NamespaceContext.Provider></Modal>);}diff --git a/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsxindex 33f707fdfd..068c86b1f7 100644--- a/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx@@ -43,13 +43,6 @@ export function RolloverBalanceMenuModal({showHeaderfocusAfterClose={false}{...modalProps}- padding={0}- style={{- flex: 1,- padding: '0 10px',- paddingBottom: 10,- borderRadius: '6px',- }}><Viewstyle={{diff --git a/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsxindex 0130b6d3f6..b64090c92b 100644--- a/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx@@ -62,12 +62,9 @@ export function RolloverBudgetMenuModal({showHeaderfocusAfterClose={false}{...modalProps}- padding={0}style={{- flex: 1,padding: '0 10px',paddingBottom: 10,- borderRadius: '6px',}}><Viewdiff --git a/packages/desktop-client/src/components/modals/RolloverBudgetMonthMenuModal.tsx b/packages/desktop-client/src/components/modals/RolloverBudgetMonthMenuModal.tsxindex caf9df7692..18f4009f9b 100644--- a/packages/desktop-client/src/components/modals/RolloverBudgetMonthMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/RolloverBudgetMonthMenuModal.tsx@@ -72,11 +72,8 @@ export function RolloverBudgetMonthMenuModal({focusAfterClose={false}{...modalProps}onClose={onClose}- padding={10}style={{- flex: 1,height: '50vh',- borderRadius: '6px',}}><Viewdiff --git a/packages/desktop-client/src/components/modals/RolloverBudgetSummaryModal.tsx b/packages/desktop-client/src/components/modals/RolloverBudgetSummaryModal.tsxindex 0cec233d86..1970a1912a 100644--- a/packages/desktop-client/src/components/modals/RolloverBudgetSummaryModal.tsx+++ b/packages/desktop-client/src/components/modals/RolloverBudgetSummaryModal.tsx@@ -79,27 +79,25 @@ export function RolloverBudgetSummaryModal({return (<Modal title="Budget Summary" {...modalProps}>- {() => (- <NamespaceContext.Provider value={sheetForMonth(month)}>- <TotalsList- prevMonthName={prevMonthName}- style={{- ...styles.mediumText,- }}- />- <ToBudgetAmount- prevMonthName={prevMonthName}- style={{- ...styles.mediumText,- marginTop: 15,- }}- amountStyle={{- ...styles.underlinedText,- }}- onClick={onClick}- />- </NamespaceContext.Provider>- )}+ <NamespaceContext.Provider value={sheetForMonth(month)}>+ <TotalsList+ prevMonthName={prevMonthName}+ style={{+ ...styles.mediumText,+ }}+ />+ <ToBudgetAmount+ prevMonthName={prevMonthName}+ style={{+ ...styles.mediumText,+ marginTop: 15,+ }}+ amountStyle={{+ ...styles.underlinedText,+ }}+ onClick={onClick}+ />+ </NamespaceContext.Provider></Modal>);}diff --git a/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsxindex 9daa6ac60b..da1c28a1e2 100644--- a/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx@@ -25,18 +25,7 @@ export function RolloverToBudgetMenuModal({};return (- <Modal- showHeader- focusAfterClose={false}- {...modalProps}- padding={0}- style={{- flex: 1,- padding: '0 10px',- paddingBottom: 10,- borderRadius: '6px',- }}- >+ <Modal showHeader focusAfterClose={false} {...modalProps}><ToBudgetMenugetItemStyle={() => defaultMenuItemStyle}onTransfer={onTransfer}diff --git a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsxindex 8a70ceb157..bac14eeb56 100644--- a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx@@ -23,18 +23,7 @@ export function ScheduledTransactionMenuModal({};return (- <Modal- showHeader- focusAfterClose={false}- {...modalProps}- padding={0}- style={{- flex: 1,- padding: '0 10px',- paddingBottom: 10,- borderRadius: '6px',- }}- >+ <Modal showHeader focusAfterClose={false} {...modalProps}><ScheduledTransactionMenutransactionId={transactionId}onPost={onPost}diff --git a/packages/desktop-client/src/components/modals/SingleInputModal.tsx b/packages/desktop-client/src/components/modals/SingleInputModal.tsxindex 7ea4449409..4bda6b5d3f 100644--- a/packages/desktop-client/src/components/modals/SingleInputModal.tsx+++ b/packages/desktop-client/src/components/modals/SingleInputModal.tsx@@ -42,61 +42,47 @@ export function SingleInputModal({};return (- <Modal- title={title}- {...modalProps}- padding={0}- style={{- flex: 1,- padding: '0 10px',- paddingBottom: 10,- borderRadius: '6px',- }}- >- {() => (- <>- <View>- <InitialFocus>- <InputField- placeholder={inputPlaceholder}- defaultValue={value}- onUpdate={setValue}- onEnter={e => _onSubmit(e.currentTarget.value)}- />- </InitialFocus>- {errorMessage && (- <FormError- style={{- paddingTop: 5,- marginLeft: styles.mobileEditingPadding,- marginRight: styles.mobileEditingPadding,- }}- >- * {errorMessage}- </FormError>- )}- </View>- <View+ <Modal title={title} {...modalProps}>+ <View>+ <InitialFocus>+ <InputField+ placeholder={inputPlaceholder}+ defaultValue={value}+ onUpdate={setValue}+ onEnter={e => _onSubmit(e.currentTarget.value)}+ />+ </InitialFocus>+ {errorMessage && (+ <FormErrorstyle={{- justifyContent: 'center',- alignItems: 'center',- marginTop: 10,+ paddingTop: 5,+ marginLeft: styles.mobileEditingPadding,+ marginRight: styles.mobileEditingPadding,}}>- <Button- type="primary"- style={{- height: styles.mobileMinHeight,- marginLeft: styles.mobileEditingPadding,- marginRight: styles.mobileEditingPadding,- }}- onClick={() => _onSubmit(value)}- >- {buttonText}- </Button>- </View>- </>- )}+ * {errorMessage}+ </FormError>+ )}+ </View>+ <View+ style={{+ justifyContent: 'center',+ alignItems: 'center',+ paddingTop: 10,+ }}+ >+ <Button+ type="primary"+ style={{+ height: styles.mobileMinHeight,+ marginLeft: styles.mobileEditingPadding,+ marginRight: styles.mobileEditingPadding,+ }}+ onClick={() => _onSubmit(value)}+ >+ {buttonText}+ </Button>+ </View></Modal>);}diff --git a/packages/desktop-client/src/components/modals/SwitchBudgetTypeModal.tsx b/packages/desktop-client/src/components/modals/SwitchBudgetTypeModal.tsxindex 27b92df6cb..e4b0c0b499 100644--- a/packages/desktop-client/src/components/modals/SwitchBudgetTypeModal.tsx+++ b/packages/desktop-client/src/components/modals/SwitchBudgetTypeModal.tsx@@ -6,7 +6,7 @@ import { useResponsive } from '../../ResponsiveProvider';import { styles } from '../../style';import { Button } from '../common/Button';import { Link } from '../common/Link';-import { Modal } from '../common/Modal';+import { Modal, ModalTitle } from '../common/Modal';import { Paragraph } from '../common/Paragraph';import { Text } from '../common/Text';import { type CommonModalProps } from '../Modals';@@ -28,45 +28,46 @@ export function SwitchBudgetTypeModal({}: {};return (- <Modal title="Switch budget type?" {...modalProps}>- {() => (- <>- <Paragraph>- You are currently using a{' '}- <Text style={{ fontWeight: 600 }}>- {budgetType === 'report' ? 'Report budget' : 'Rollover budget'}.- </Text>{' '}- Switching will not lose any data and you can always switch back.- </Paragraph>- <Button- type="primary"- style={{- ...narrowStyle,- }}- onClick={() => {- onSwitch?.();- modalProps.onClose?.();- }}+ <Modal+ title={<ModalTitle title="Switch budget type?" shrinkOnOverflow />}+ {...modalProps}+ >+ <>+ <Paragraph>+ You are currently using a{' '}+ <Text style={{ fontWeight: 600 }}>+ {budgetType === 'report' ? 'Report budget' : 'Rollover budget'}.+ </Text>{' '}+ Switching will not lose any data and you can always switch back.+ </Paragraph>+ <Button+ type="primary"+ style={{+ ...narrowStyle,+ }}+ onClick={() => {+ onSwitch?.();+ modalProps.onClose?.();+ }}+ >+ Switch to a{' '}+ {budgetType === 'report' ? 'Rollover budget' : 'Report budget'}+ </Button>+ <Paragraph+ isLast={true}+ style={{+ marginTop: 10,+ }}+ >+ <Link+ variant="external"+ to="https://actualbudget.org/docs/experimental/report-budget"+ linkColor="muted">- Switch to a{' '}- {budgetType === 'report' ? 'Rollover budget' : 'Report budget'}- </Button>- <Paragraph- isLast={true}- style={{- marginTop: 10,- }}- >- <Link- variant="external"- to="https://actualbudget.org/docs/experimental/report-budget"- linkColor="muted"- >- How do these types of budgeting work?- </Link>- </Paragraph>- </>- )}+ How do these types of budgeting work?+ </Link>+ </Paragraph>+ </></Modal>);}diff --git a/packages/desktop-client/src/components/modals/TransferModal.tsx b/packages/desktop-client/src/components/modals/TransferModal.tsxindex 43bf3995dc..8b19a5dd5a 100644--- a/packages/desktop-client/src/components/modals/TransferModal.tsx+++ b/packages/desktop-client/src/components/modals/TransferModal.tsx@@ -72,67 +72,53 @@ export function TransferModal({const toCategory = categories.find(c => c.id === toCategoryId);return (- <Modal- title={title}- showHeader- focusAfterClose={false}- {...modalProps}- padding={0}- style={{- flex: 1,- padding: '0 10px',- paddingBottom: 10,- borderRadius: '6px',- }}- >- {() => (- <>- <View>- <FieldLabel title="Transfer this amount:" />- <InitialFocus>- <InputField- inputMode="decimal"- tabIndex={0}- defaultValue={_initialAmount}- onUpdate={setAmount}- onEnter={() => {- if (!toCategoryId) {- openCategoryModal();- }- }}- />- </InitialFocus>- </View>+ <Modal title={title} showHeader focusAfterClose={false} {...modalProps}>+ <View>+ <View>+ <FieldLabel title="Transfer this amount:" />+ <InitialFocus>+ <InputField+ inputMode="decimal"+ tabIndex={0}+ defaultValue={_initialAmount}+ onUpdate={setAmount}+ onEnter={() => {+ if (!toCategoryId) {+ openCategoryModal();+ }+ }}+ />+ </InitialFocus>+ </View>- <FieldLabel title="To:" />- <TapField- tabIndex={0}- value={toCategory?.name}- onClick={openCategoryModal}- />+ <FieldLabel title="To:" />+ <TapField+ tabIndex={0}+ value={toCategory?.name}+ onClick={openCategoryModal}+ />- <View+ <View+ style={{+ justifyContent: 'center',+ alignItems: 'center',+ paddingTop: 10,+ }}+ >+ <Button+ type="primary"+ tabIndex={0}style={{- justifyContent: 'center',- alignItems: 'center',- marginTop: 10,+ height: styles.mobileMinHeight,+ marginLeft: styles.mobileEditingPadding,+ marginRight: styles.mobileEditingPadding,}}+ onClick={() => _onSubmit(amount, toCategoryId)}>- <Button- type="primary"- tabIndex={0}- style={{- height: styles.mobileMinHeight,- marginLeft: styles.mobileEditingPadding,- marginRight: styles.mobileEditingPadding,- }}- onClick={() => _onSubmit(amount, toCategoryId)}- >- Transfer- </Button>- </View>- </>- )}+ Transfer+ </Button>+ </View>+ </View></Modal>);}diff --git a/upcoming-release-notes/2571.md b/upcoming-release-notes/2571.mdnew file mode 100644index 0000000000..c5d0d0172d--- /dev/null+++ b/upcoming-release-notes/2571.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [joel-jeremy]+---++Use consistent padding in modals