mirror of
https://github.com/actualbudget/actual.git
synced 2026-04-30 10:14:53 -05:00
Last reconciled date not visible mobile (#4922)
* added last reconciled note to the reconciliation popup * release notes * Update packages/desktop-client/src/components/accounts/Reconcile.tsx Co-authored-by: Julian Dominguez-Schatz <julian.dominguezschatz@gmail.com> * bumped up padding * yarn lint --------- Co-authored-by: Julian Dominguez-Schatz <julian.dominguezschatz@gmail.com> Co-authored-by: Alec Bakholdin <alecbakholdin@mac.myfiosgateway.com>
This commit is contained in:
@@ -9,13 +9,15 @@ import { styles } from '@actual-app/components/styles';
|
|||||||
import { Text } from '@actual-app/components/text';
|
import { Text } from '@actual-app/components/text';
|
||||||
import { theme } from '@actual-app/components/theme';
|
import { theme } from '@actual-app/components/theme';
|
||||||
import { View } from '@actual-app/components/view';
|
import { View } from '@actual-app/components/view';
|
||||||
|
import { t } from 'i18next';
|
||||||
|
|
||||||
import * as queries from 'loot-core/client/queries';
|
import * as queries from 'loot-core/client/queries';
|
||||||
import { type Query } from 'loot-core/shared/query';
|
import { type Query } from 'loot-core/shared/query';
|
||||||
import { currencyToInteger } from 'loot-core/shared/util';
|
import { currencyToInteger, tsToRelativeTime } from 'loot-core/shared/util';
|
||||||
import { type AccountEntity } from 'loot-core/types/models';
|
import { type AccountEntity } from 'loot-core/types/models';
|
||||||
import { type TransObjectLiteral } from 'loot-core/types/util';
|
import { type TransObjectLiteral } from 'loot-core/types/util';
|
||||||
|
|
||||||
|
import { useLocale } from '../../hooks/useLocale';
|
||||||
import { useFormat } from '../spreadsheet/useFormat';
|
import { useFormat } from '../spreadsheet/useFormat';
|
||||||
import { useSheetValue } from '../spreadsheet/useSheetValue';
|
import { useSheetValue } from '../spreadsheet/useSheetValue';
|
||||||
|
|
||||||
@@ -132,6 +134,7 @@ export function ReconcileMenu({
|
|||||||
query: balanceQuery.query.filter({ cleared: true }),
|
query: balanceQuery.query.filter({ cleared: true }),
|
||||||
});
|
});
|
||||||
const format = useFormat();
|
const format = useFormat();
|
||||||
|
const locale = useLocale();
|
||||||
const [inputValue, setInputValue] = useState<string | null>(null);
|
const [inputValue, setInputValue] = useState<string | null>(null);
|
||||||
|
|
||||||
function onSubmit() {
|
function onSubmit() {
|
||||||
@@ -164,6 +167,16 @@ export function ReconcileMenu({
|
|||||||
/>
|
/>
|
||||||
</InitialFocus>
|
</InitialFocus>
|
||||||
)}
|
)}
|
||||||
|
<Text style={{ color: theme.pageTextSubdued, paddingBottom: 6 }}>
|
||||||
|
{account?.last_reconciled
|
||||||
|
? t('Reconciled {{ relativeTimeAgo }}', {
|
||||||
|
relativeTimeAgo: tsToRelativeTime(
|
||||||
|
account.last_reconciled,
|
||||||
|
locale,
|
||||||
|
),
|
||||||
|
})
|
||||||
|
: t('Not yet reconciled')}
|
||||||
|
</Text>
|
||||||
<Button variant="primary" onPress={onSubmit}>
|
<Button variant="primary" onPress={onSubmit}>
|
||||||
<Trans>Reconcile</Trans>
|
<Trans>Reconcile</Trans>
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
6
upcoming-release-notes/4922.md
Normal file
6
upcoming-release-notes/4922.md
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
category: Bugfix
|
||||||
|
authors: [alecbakholdin]
|
||||||
|
---
|
||||||
|
|
||||||
|
Improved visibility for reconciliation popover
|
||||||
Reference in New Issue
Block a user