mirror of
https://github.com/actualbudget/actual.git
synced 2026-03-11 20:44:32 -05:00
Compare commits
3 Commits
v26.2.0
...
split-paye
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c6f8056647 | ||
|
|
d2f08f1e51 | ||
|
|
a5e429c0b9 |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
@@ -118,14 +118,19 @@ export const Transaction = memo(function Transaction({
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<View style={{ flex: 1 }}>
|
<View style={{ flex: 1 }}>
|
||||||
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
|
<View
|
||||||
|
style={{
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
color: textStyle.color || theme.tableText,
|
||||||
|
}}
|
||||||
|
>
|
||||||
{schedule && (
|
{schedule && (
|
||||||
<SvgArrowsSynchronize
|
<SvgArrowsSynchronize
|
||||||
style={{
|
style={{
|
||||||
width: 12,
|
width: 12,
|
||||||
height: 12,
|
height: 12,
|
||||||
marginRight: 5,
|
marginRight: 5,
|
||||||
color: textStyle.color || theme.menuItemText,
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@@ -135,13 +140,18 @@ export const Transaction = memo(function Transaction({
|
|||||||
...textStyle,
|
...textStyle,
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
fontWeight: added ? '600' : '400',
|
fontWeight: added ? '600' : '400',
|
||||||
...(prettyDescription === '' && {
|
...(!isPreview &&
|
||||||
color: theme.tableTextLight,
|
prettyDescription === '' && {
|
||||||
fontStyle: 'italic',
|
color: theme.tableTextSubdued,
|
||||||
}),
|
}),
|
||||||
|
...(!isPreview &&
|
||||||
|
(prettyDescription === '' ||
|
||||||
|
prettyDescription === 'Split') && {
|
||||||
|
fontStyle: 'italic',
|
||||||
|
}),
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{prettyDescription || 'Empty'}
|
{prettyDescription || 'No payee'}
|
||||||
</TextOneLine>
|
</TextOneLine>
|
||||||
</View>
|
</View>
|
||||||
{isPreview ? (
|
{isPreview ? (
|
||||||
@@ -170,7 +180,7 @@ export const Transaction = memo(function Transaction({
|
|||||||
height: 11,
|
height: 11,
|
||||||
color: cleared
|
color: cleared
|
||||||
? theme.noticeTextLight
|
? theme.noticeTextLight
|
||||||
: theme.pageTextSubdued,
|
: theme.tableTextSubdued,
|
||||||
marginRight: 5,
|
marginRight: 5,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -69,9 +69,11 @@ function getFieldName(transactionId, field) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function getDescriptionPretty(transaction, payee, transferAcct) {
|
export function getDescriptionPretty(transaction, payee, transferAcct) {
|
||||||
const { amount } = transaction;
|
const { amount, is_parent: isParent } = transaction;
|
||||||
|
|
||||||
if (transferAcct) {
|
if (isParent) {
|
||||||
|
return 'Split';
|
||||||
|
} else if (transferAcct) {
|
||||||
return `Transfer ${amount > 0 ? 'from' : 'to'} ${transferAcct.name}`;
|
return `Transfer ${amount > 0 ? 'from' : 'to'} ${transferAcct.name}`;
|
||||||
} else if (payee) {
|
} else if (payee) {
|
||||||
return payee.name;
|
return payee.name;
|
||||||
|
|||||||
6
upcoming-release-notes/2989.md
Normal file
6
upcoming-release-notes/2989.md
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
category: Enhancements
|
||||||
|
authors: [joel-jeremy]
|
||||||
|
---
|
||||||
|
|
||||||
|
Display Split payee on mobile transactions list
|
||||||
Reference in New Issue
Block a user