Left over glamor style cleanup (#1668)

* #1666 - left over glamor style cleanup

* vrt

* Release notes

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={{

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}

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>

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' : '',
         }}

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);

upcoming-release-notes/1668.md

+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+Cleanup glamor style properties left behind as result of merge resolution.