From 35c3d546889803a50845894bbc293454b2a9a8c4 Mon Sep 17 00:00:00 2001 From: youngcw <calebyoung94@gmail.com> Date: Wed, 6 Sep 2023 22:33:44 -0600 Subject: [PATCH] Mobile: Dont show hidden groups (#1654) * fix percent goals in the same priority level not compounding but overwritting * release note * don't show hidden groups on mobile view * cleanup * cleanup2 * cleanup3 * release note --- .../components/budget/MobileBudgetTable.js | 73 ++++++++++--------- upcoming-release-notes/1654.md | 6 ++ 2 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 upcoming-release-notes/1654.md diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.js b/packages/desktop-client/src/components/budget/MobileBudgetTable.js index 8aba0d0d1..44eced7c2 100644 --- a/packages/desktop-client/src/components/budget/MobileBudgetTable.js +++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.js @@ -627,42 +627,45 @@ class BudgetGroup extends PureComponent { // </Droppable> // </Draggable> } + if (!group.hidden) { + return editable( + <Card + style={{ + marginTop: 7, + marginBottom: 7, + }} + > + <TotalsRow + group={group} + budgeted={rolloverBudget.groupBudgeted(group.id)} + balance={rolloverBudget.groupBalance(group.id)} + editMode={editMode} + onAddCategory={onAddCategory} + onReorderCategory={onReorderCategory} + /> - return editable( - <Card - style={{ - marginTop: 7, - marginBottom: 7, - }} - > - <TotalsRow - group={group} - budgeted={rolloverBudget.groupBudgeted(group.id)} - balance={rolloverBudget.groupBalance(group.id)} - editMode={editMode} - onAddCategory={onAddCategory} - onReorderCategory={onReorderCategory} - /> - - {group.categories.map((category, index) => { - // const editing = editingId === category.id; - return ( - <BudgetCategory - key={category.id} - index={index} - category={category} - editing={undefined} //editing} - editMode={editMode} - // gestures={gestures} - month={month} - onEdit={onEditCategory} - onReorder={onReorderCategory} - onBudgetAction={onBudgetAction} - /> - ); - })} - </Card>, - ); + {group.categories.map((category, index) => { + // const editing = editingId === category.id; + return ( + <BudgetCategory + key={category.id} + index={index} + category={category} + editing={undefined} //editing} + editMode={editMode} + //gestures={gestures} + month={month} + onEdit={onEditCategory} + onReorder={onReorderCategory} + onBudgetAction={onBudgetAction} + /> + ); + })} + </Card>, + ); + } else { + return null; + } } } diff --git a/upcoming-release-notes/1654.md b/upcoming-release-notes/1654.md new file mode 100644 index 000000000..9ba072f40 --- /dev/null +++ b/upcoming-release-notes/1654.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [youngcw] +--- + +Don't show hidden groups on mobile -- GitLab