Skip to content

A local-first personal finance app

Left over glamor style cleanup (#1668)

Joel Jeremy Marquezbca09023e2a0
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 097b1beda3..1685e7e51d 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 d96f3ce303..2646cc85e0 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 44939f4f07..2c177bfaa4 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 b7b15092f8..cc060c99ff 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 1b4ac3ef21..f563d859fe 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 59372c128c..3ccebb13a3 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 35c8759672..2273dac88a 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 0000000000..d31f1dba01
--- /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.