Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @Hackmodford, this doesn't look quite right. Could you take a look at the visual changes here please?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After investigating, I think the real issue I have is with the budget colors.

What do you think of removing the current/other budget style and leaving it consistent? The header of the page changes color when on another month.

I believe the different background color is a holdover from the way the budget view in the desktop client has a different color. I don't think it makes sense in the mobile context.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ type PullToRefreshProps = ComponentProps<typeof BasePullToRefresh>;

export function PullToRefresh(props: PullToRefreshProps) {
return (
<div style={{ overflow: 'auto', flex: 1 }}>
<div
style={{
overflow: 'auto',
flex: 1,
}}
>
<BasePullToRefresh
pullDownThreshold={80}
resistance={2}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ export function BudgetTable({
<View
data-testid="budget-table"
style={{
backgroundColor: theme.pageBackground,
backgroundColor: theme.mobilePageBackground,
paddingBottom: MOBILE_NAV_HEIGHT,
}}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import { View } from '@actual-app/components/view';

import { type BudgetType } from 'loot-core/server/prefs';
import * as monthUtils from 'loot-core/shared/months';

Check warning on line 13 in packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx

View workflow job for this annotation

GitHub Actions / autofix

'monthUtils' is defined but never used. Allowed unused vars must match /^(_|React)/u

Check warning on line 13 in packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx

View workflow job for this annotation

GitHub Actions / lint

'monthUtils' is defined but never used. Allowed unused vars must match /^(_|React)/u
import { groupById, integerToCurrency } from 'loot-core/shared/util';
import { type CategoryEntity } from 'loot-core/types/models';

Expand Down Expand Up @@ -415,9 +415,7 @@
paddingRight: 5,
borderBottomWidth: 1,
opacity: isHidden ? 0.5 : undefined,
backgroundColor: monthUtils.isCurrentMonth(month)
? theme.budgetCurrentMonth
: theme.budgetOtherMonth,
backgroundColor: theme.budgetOtherMonth,
}}
>
<ExpenseCategoryName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import { css } from '@emotion/css';
import { AutoTextSize } from 'auto-text-size';

import * as monthUtils from 'loot-core/shared/months';

Check warning on line 15 in packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx

View workflow job for this annotation

GitHub Actions / autofix

'monthUtils' is defined but never used. Allowed unused vars must match /^(_|React)/u

Check warning on line 15 in packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx

View workflow job for this annotation

GitHub Actions / lint

'monthUtils' is defined but never used. Allowed unused vars must match /^(_|React)/u
import {
type CategoryEntity,
type CategoryGroupEntity,
Expand Down Expand Up @@ -128,7 +128,7 @@

export function ExpenseGroupHeader({
categoryGroup,
month,

Check warning on line 131 in packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx

View workflow job for this annotation

GitHub Actions / autofix

'month' is defined but never used. Allowed unused args must match /^(_|React)/u

Check warning on line 131 in packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx

View workflow job for this annotation

GitHub Actions / lint

'month' is defined but never used. Allowed unused args must match /^(_|React)/u
onEditCategoryGroup,
show3Columns,
showBudgetedColumn,
Expand All @@ -148,9 +148,7 @@
paddingLeft: 5,
paddingRight: 5,
opacity: isHidden ? 0.5 : undefined,
backgroundColor: monthUtils.isCurrentMonth(month)
? theme.budgetHeaderCurrentMonth
: theme.budgetHeaderOtherMonth,
backgroundColor: theme.budgetCurrentMonth,
}}
data-testid="category-group-row"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';

import * as monthUtils from 'loot-core/shared/months';

Check warning on line 12 in packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx

View workflow job for this annotation

GitHub Actions / autofix

'monthUtils' is defined but never used. Allowed unused vars must match /^(_|React)/u

Check warning on line 12 in packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx

View workflow job for this annotation

GitHub Actions / lint

'monthUtils' is defined but never used. Allowed unused vars must match /^(_|React)/u
import { type CategoryEntity } from 'loot-core/types/models';

import { BalanceCell } from './BalanceCell';
Expand Down Expand Up @@ -259,9 +259,7 @@
paddingRight: 5,
borderBottomWidth: 1,
opacity: !!category.hidden ? 0.5 : undefined,
backgroundColor: monthUtils.isCurrentMonth(month)
? theme.budgetCurrentMonth
: theme.budgetOtherMonth,
backgroundColor: theme.budgetOtherMonth,
}}
>
<IncomeCategoryName category={category} onEdit={onEdit} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import { css } from '@emotion/css';
import { AutoTextSize } from 'auto-text-size';

import * as monthUtils from 'loot-core/shared/months';

Check warning on line 16 in packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx

View workflow job for this annotation

GitHub Actions / autofix

'monthUtils' is defined but never used. Allowed unused vars must match /^(_|React)/u

Check warning on line 16 in packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx

View workflow job for this annotation

GitHub Actions / lint

'monthUtils' is defined but never used. Allowed unused vars must match /^(_|React)/u
import { type CategoryGroupEntity } from 'loot-core/types/models';

import { getColumnWidth, ROW_HEIGHT } from './BudgetTable';
Expand Down Expand Up @@ -116,7 +116,7 @@

function IncomeGroupHeader({
group,
month,

Check warning on line 119 in packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx

View workflow job for this annotation

GitHub Actions / autofix

'month' is defined but never used. Allowed unused args must match /^(_|React)/u

Check warning on line 119 in packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx

View workflow job for this annotation

GitHub Actions / lint

'month' is defined but never used. Allowed unused args must match /^(_|React)/u
onEdit,
isCollapsed,
onToggleCollapse,
Expand All @@ -134,9 +134,7 @@
paddingLeft: 5,
paddingRight: 5,
opacity: !!group.hidden ? 0.5 : undefined,
backgroundColor: monthUtils.isCurrentMonth(month)
? theme.budgetHeaderCurrentMonth
: theme.budgetHeaderOtherMonth,
backgroundColor: theme.budgetCurrentMonth,
...style,
}}
data-testid="category-group-row"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ export function TransactionList({
alignItems: 'center',
justifyContent: 'center',
backgroundColor: theme.mobilePageBackground,
height: '100%',
minHeight: '50vh',
}}
>
<Text style={{ fontSize: 15 }}>
Expand Down
6 changes: 6 additions & 0 deletions upcoming-release-notes/5917.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Enhancements
authors: [Hackmodford]
---

Improve the background color of the pull to refresh component
Loading