Skip to content

A local-first personal finance app

Merge remote-tracking branch 'upstream/master' into reorg-sidebar

Jed Foxa12b39bd08f1
diff --cc packages/desktop-client/src/components/ManageRules.js
index f4bf23107e,93eb2a0f38..37c8bc0f79
--- a/packages/desktop-client/src/components/ManageRules.js
+++ b/packages/desktop-client/src/components/ManageRules.js
@@@ -634,78 -620,89 +634,78 @@@ export default function ManageRules(
return null;
}
- return (
- <Modal
- title="Rules"
- padding={0}
- loading={loading}
- {...modalProps}
- style={[modalProps.style, { flex: 1, maxWidth: '90%' }]}
+ let actions = (
+ <View
+ style={{
+ flexDirection: 'row',
+ alignItems: 'center',
+ padding: isModal ? '13px 15px' : '0 0 15px',
+ borderTop: '1px solid ' + colors.border
+ }}
>
- {() => (
- <SchedulesQuery.Provider>
- <SelectedProvider instance={selectedInst}>
- <View style={{ height: '70vh' }}>
- <View style={{ flex: 1 }}>
- <RulesHeader />
- <SimpleTable
- ref={tableRef}
- data={rules}
- navigator={navigator}
- loadMore={loadMore}
- // Hide the last border of the item in the table
- style={{ marginBottom: -1 }}
- >
- <RulesList
- rules={rules}
- selectedItems={selectedInst.items}
- navigator={navigator}
- hoveredRule={hoveredRule}
- onHover={onHover}
- onEditRule={onEditRule}
- />
- </SimpleTable>
- </View>
-
- <View
- style={{
- flexDirection: 'row',
- alignItems: 'center',
- padding: '13px 15px',
- borderTop: '1px solid ' + colors.border
- }}
- >
- <View
- style={{
- color: colors.n4,
- flexDirection: 'row',
- alignItems: 'center',
- width: '50%'
- }}
- >
- <Text>
- Rules are always run in the order that you see them.{' '}
- <ExternalLink
- asAnchor={true}
- href="https://actualbudget.github.io/docs/Budgeting/rules/"
- style={{ color: colors.n4 }}
- >
- Learn more
- </ExternalLink>
- </Text>
- </View>
-
- <View style={{ flex: 1 }} />
-
- <Stack
- direction="row"
- align="center"
- justify="flex-end"
- spacing={2}
- >
- {selectedInst.items.size > 0 && (
- <Button onClick={onDeleteSelected}>
- Delete {selectedInst.items.size} rules
- </Button>
- )}
- <Button primary onClick={onCreateRule}>
- Create new rule
- </Button>
- </Stack>
- </View>
- </View>
- </SelectedProvider>
- </SchedulesQuery.Provider>
- )}
- </Modal>
+ <View
+ style={{
+ color: colors.n4,
+ flexDirection: 'row',
+ alignItems: 'center',
+ width: '50%'
+ }}
+ >
+ <Text>
+ Rules are always run in the order that you see them.{' '}
+ <ExternalLink
+ asAnchor={true}
- href="https://actualbudget.com/docs/other/rules/"
++ href="https://actualbudget.github.io/docs/Budgeting/rules/"
+ style={{ color: colors.n4 }}
+ >
+ Learn more
+ </ExternalLink>
+ </Text>
+ </View>
+
+ <View style={{ flex: 1 }} />
+
+ <Stack direction="row" align="center" justify="flex-end" spacing={2}>
+ {selectedInst.items.size > 0 && (
+ <Button onClick={onDeleteSelected}>
+ Delete {selectedInst.items.size} rules
+ </Button>
+ )}
+ <Button primary onClick={onCreateRule}>
+ Create new rule
+ </Button>
+ </Stack>
+ </View>
+ );
+
+ return (
+ <SchedulesQuery.Provider>
+ <SelectedProvider instance={selectedInst}>
+ <View style={{ overflow: 'hidden' }}>
+ {!isModal && actions}
+ <View style={{ flex: 1 }}>
+ <RulesHeader />
+ <SimpleTable
+ ref={tableRef}
+ data={rules}
+ navigator={navigator}
+ loadMore={loadMore}
+ // Hide the last border of the item in the table
+ style={{ marginBottom: -1 }}
+ >
+ <RulesList
+ rules={rules}
+ selectedItems={selectedInst.items}
+ navigator={navigator}
+ hoveredRule={hoveredRule}
+ onHover={onHover}
+ onEditRule={onEditRule}
+ />
+ </SimpleTable>
+ </View>
+ {isModal && actions}
+ </View>
+ </SelectedProvider>
+ </SchedulesQuery.Provider>
);
}
diff --cc packages/loot-design/src/components/sidebar.js
index b03499757c,669c69fd05..a5f0218c0d
--- a/packages/loot-design/src/components/sidebar.js
+++ b/packages/loot-design/src/components/sidebar.js
@@@ -394,7 -408,13 +397,8 @@@ const MenuButton = withRouter(function
}
let items = [
- { name: 'open-payees', text: 'Manage Payees' },
- { name: 'open-rules', text: 'Manage Rules' },
- { name: 'find-schedules', text: 'Find schedules' },
- { name: 'repair-splits', text: 'Repair split transactions' },
- Menu.line,
{ name: 'settings', text: 'Settings' },
+ { name: 'help', text: 'Help' },
{ name: 'close', text: 'Close File' }
];