diff --git a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png index 097b1beda3bc27166a4964060a1e5b379fc4f070..1685e7e51d787df05bf0a27823e8bebc9dd8493e 100644 Binary files a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png index d96f3ce3035cf3faca769452782be8676bc03ef2..2646cc85e09dd4b7602674ac5cd7965a0b04b5e8 100644 Binary files a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png differ diff --git a/packages/desktop-client/src/components/budget/BudgetTable.js b/packages/desktop-client/src/components/budget/BudgetTable.js index 44939f4f0751ff77fe6e0a8ace01f63b1b69590f..2c177bfaa4a34f761140f1d971a3543f1a3dfa2f 100644 --- a/packages/desktop-client/src/components/budget/BudgetTable.js +++ b/packages/desktop-client/src/components/budget/BudgetTable.js @@ -182,17 +182,17 @@ class BudgetTable extends Component { return ( <View data-testid="budget-table" - style={[ - { flex: 1 }, - styles.lightScrollbar && { + style={{ + flex: 1, + ...(styles.lightScrollbar && { '& ::-webkit-scrollbar': { backgroundColor: 'transparent', }, '& ::-webkit-scrollbar-thumb:vertical': { backgroundColor: 'white', }, - }, - ]} + }), + }} > <View style={{ diff --git a/packages/desktop-client/src/components/budget/ExpenseCategory.js b/packages/desktop-client/src/components/budget/ExpenseCategory.js index b7b15092f8e0e4aaa1ff18f2a91391a002b26e40..cc060c99ffc29079ce8ad955a4a3f60eec2d5c76 100644 --- a/packages/desktop-client/src/components/budget/ExpenseCategory.js +++ b/packages/desktop-client/src/components/budget/ExpenseCategory.js @@ -52,14 +52,7 @@ function ExpenseCategory({ > <DropHighlight pos={dropPos} offset={{ top: 1 }} /> - <View - style={[ - { - flex: 1, - flexDirection: 'row', - }, - ]} - > + <View style={{ flex: 1, flexDirection: 'row' }}> <SidebarCategory innerRef={dragRef} category={cat} diff --git a/packages/desktop-client/src/components/budget/RenderMonths.js b/packages/desktop-client/src/components/budget/RenderMonths.js index 1b4ac3ef21a5720a836397915f9b9bf356b264a1..f563d859fe5ab7f5e6092cb931e8cfdb71d6c453 100644 --- a/packages/desktop-client/src/components/budget/RenderMonths.js +++ b/packages/desktop-client/src/components/budget/RenderMonths.js @@ -20,11 +20,11 @@ function RenderMonths({ component: Component, editingIndex, args, style }) { value={monthUtils.sheetForMonth(month, type)} > <View - style={[ - { flex: 1 }, - { borderLeft: '1px solid ' + colors.border }, - style, - ]} + style={{ + flex: 1, + borderLeft: '1px solid ' + colors.border, + ...style, + }} > <Component monthIndex={index} editing={editing} {...args} /> </View> diff --git a/packages/desktop-client/src/components/budget/SidebarCategory.js b/packages/desktop-client/src/components/budget/SidebarCategory.js index 59372c128c1bfe5326786d8c7badfab09ad4f511..3ccebb13a3b414362b32a48de80f7a834980c250 100644 --- a/packages/desktop-client/src/components/budget/SidebarCategory.js +++ b/packages/desktop-client/src/components/budget/SidebarCategory.js @@ -105,26 +105,24 @@ function SidebarCategory({ return ( <View innerRef={innerRef} - style={[ - { - width: 200, - '& button': { display: 'none' }, - }, - !dragging && + style={{ + width: 200, + '& button': { display: 'none' }, + ...(!dragging && !dragPreview && { '&:hover button': { display: 'flex', color: colors.n1 }, - }, - dragging && { color: colors.n8 }, + }), + ...(dragging && { color: colors.n8 }), // The zIndex here forces the the view on top of a row below // it that may be "collapsed" and show a border on top - dragPreview && { + ...(dragPreview && { backgroundColor: 'white', zIndex: 10000, borderRadius: 6, overflow: 'hidden', - }, - style, - ]} + }), + ...style, + }} onKeyDown={e => { if (e.key === 'Enter') { onEditName(null); @@ -151,7 +149,7 @@ function SidebarCategory({ } }} onBlur={() => onEditName(null)} - style={[{ paddingLeft: 13 }, isLast && { borderBottomWidth: 0 }]} + style={{ paddingLeft: 13, ...(isLast && { borderBottomWidth: 0 }) }} inputProps={{ placeholder: temporary ? 'New Category Name' : '', }} diff --git a/packages/desktop-client/src/components/budget/SidebarGroup.js b/packages/desktop-client/src/components/budget/SidebarGroup.js index 35c87596729a944ae8c8324c4f53f8e09e512573..2273dac88a990b0bcd2dcf6f1070a29aeae2f3ae 100644 --- a/packages/desktop-client/src/components/budget/SidebarGroup.js +++ b/packages/desktop-client/src/components/budget/SidebarGroup.js @@ -121,21 +121,19 @@ function SidebarGroup({ return ( <View innerRef={innerRef} - style={[ - style, - { - width: 200, - backgroundColor: colors.n11, - '& button': { display: 'none' }, - '&:hover button': { display: 'flex', color: colors.n1 }, - }, - dragPreview && { + style={{ + ...style, + width: 200, + backgroundColor: colors.n11, + '& button': { display: 'none' }, + '&:hover button': { display: 'flex', color: colors.n1 }, + ...(dragPreview && { paddingLeft: 10, zIndex: 10000, borderRadius: 6, overflow: 'hidden', - }, - ]} + }), + }} onKeyDown={e => { if (e.key === 'Enter') { onEdit(null); diff --git a/upcoming-release-notes/1668.md b/upcoming-release-notes/1668.md new file mode 100644 index 0000000000000000000000000000000000000000..d31f1dba01039dd1e02bc2467f6ef17961f1fa3e --- /dev/null +++ b/upcoming-release-notes/1668.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [joel-jeremy] +--- + +Cleanup glamor style properties left behind as result of merge resolution.