aiolabs/webapp
8
0
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: aiolabs:4af220adda0389b2d4debce251e813d3f2e2b0a3
Branches Tags
aiolabs:main
aiolabs:dev
..
compare: aiolabs:4c704e5a4197b511a1d3b8a26dbf81cab3c6b1f7
Branches Tags
aiolabs:dev
aiolabs:main

No commits in common. "4af220adda0389b2d4debce251e813d3f2e2b0a3" and "4c704e5a4197b511a1d3b8a26dbf81cab3c6b1f7" have entirely different histories.
4af220adda ... 4c704e5a41

2 changed files with 15 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/accounting-app/views/BalancePage.vue
View file

@ -98,11 +98,8 @@ async function loadData() {
totalIncomeSats.value = balanceData.total_income_sats || 0 totalIncomeSats.value = balanceData.total_income_sats || 0
totalIncomeFiat.value = balanceData.total_income_fiat || {} totalIncomeFiat.value = balanceData.total_income_fiat || {}
// Filter for pending transactions (flag = '!'), excluding voided ones // Filter for pending transactions (flag = '!')
// (libra convention: voided keeps '!' flag and carries a 'voided' tag). pendingTransactions.value = txData.entries.filter(tx => tx.flag === '!')
pendingTransactions.value = txData.entries.filter(
tx => tx.flag === '!' && !tx.tags?.includes('voided')
)
} catch (error) { } catch (error) {
console.error('[BalancePage] Error loading data:', error) console.error('[BalancePage] Error loading data:', error)
toast.error('Failed to load balance data') toast.error('Failed to load balance data')

50
src/modules/expenses/views/TransactionsPage.vue
View file

@ -46,10 +46,6 @@ function isExpense(t: Transaction): boolean {
return t.tags?.includes('expense-entry') ?? false return t.tags?.includes('expense-entry') ?? false
} }
function isVoided(t: Transaction): boolean {
return t.tags?.includes('voided') ?? false
}
const walletKey = computed(() => user.value?.wallets?.[0]?.inkey) const walletKey = computed(() => user.value?.wallets?.[0]?.inkey)
// Fuzzy search state and configuration // Fuzzy search state and configuration
@ -112,20 +108,17 @@ function formatAmount(amount: number): string {
return new Intl.NumberFormat('en-US').format(amount) return new Intl.NumberFormat('en-US').format(amount)
} }
// Get status icon and color. Voided entries (per libra convention) keep // Get status icon and color based on flag
// flag='!' and carry a 'voided' tag — surface that as the icon regardless function getStatusInfo(flag?: string) {
// of the underlying flag. switch (flag) {
function getStatusInfo(transaction: Transaction) {
if (isVoided(transaction)) {
return { icon: XCircle, color: 'text-muted-foreground', label: 'Voided' }
}
switch (transaction.flag) {
case '*': case '*':
return { icon: CheckCircle2, color: 'text-green-600', label: 'Cleared' } return { icon: CheckCircle2, color: 'text-green-600', label: 'Cleared' }
case '!': case '!':
return { icon: Clock, color: 'text-orange-600', label: 'Pending' } return { icon: Clock, color: 'text-orange-600', label: 'Pending' }
case '#': case '#':
return { icon: Flag, color: 'text-red-600', label: 'Flagged' } return { icon: Flag, color: 'text-red-600', label: 'Flagged' }
case 'x':
return { icon: XCircle, color: 'text-muted-foreground', label: 'Voided' }
default: default:
return null return null
} }
@ -335,19 +328,14 @@ onMounted(() => {
<div class="flex items-center gap-2 mb-1"> <div class="flex items-center gap-2 mb-1">
<!-- Status Icon --> <!-- Status Icon -->
<component <component
v-if="getStatusInfo(transaction)" v-if="getStatusInfo(transaction.flag)"
:is="getStatusInfo(transaction)!.icon" :is="getStatusInfo(transaction.flag)!.icon"
:class="[ :class="[
'h-4 w-4 flex-shrink-0', 'h-4 w-4 flex-shrink-0',
getStatusInfo(transaction)!.color getStatusInfo(transaction.flag)!.color
]" ]"
/> />
<h3 <h3 class="font-medium text-sm sm:text-base truncate">
:class="[
'font-medium text-sm sm:text-base truncate',
isVoided(transaction) && 'line-through text-muted-foreground'
]"
>
{{ transaction.description }} {{ transaction.description }}
</h3> </h3>
</div> </div>
@ -358,21 +346,10 @@ onMounted(() => {
<!-- Amount --> <!-- Amount -->
<div class="text-right flex-shrink-0"> <div class="text-right flex-shrink-0">
<p <p class="font-semibold text-sm sm:text-base">
:class="[
'font-semibold text-sm sm:text-base',
isVoided(transaction) && 'line-through text-muted-foreground'
]"
>
{{ formatAmount(transaction.amount) }} sats {{ formatAmount(transaction.amount) }} sats
</p> </p>
<p <p v-if="transaction.fiat_amount" class="text-xs text-muted-foreground">
v-if="transaction.fiat_amount"
:class="[
'text-xs text-muted-foreground',
isVoided(transaction) && 'line-through'
]"
>
{{ transaction.fiat_amount.toFixed(2) }} {{ transaction.fiat_currency }} {{ transaction.fiat_amount.toFixed(2) }} {{ transaction.fiat_currency }}
</p> </p>
</div> </div>
@ -399,11 +376,10 @@ onMounted(() => {
:class="[ :class="[
'text-xs', 'text-xs',
tag === 'income-entry' && 'bg-green-100 dark:bg-green-900/20 text-green-700 dark:text-green-300', tag === 'income-entry' && 'bg-green-100 dark:bg-green-900/20 text-green-700 dark:text-green-300',
tag === 'expense-entry' && 'bg-red-100 dark:bg-red-900/20 text-red-700 dark:text-red-300', tag === 'expense-entry' && 'bg-red-100 dark:bg-red-900/20 text-red-700 dark:text-red-300'
tag === 'voided' && 'bg-red-100 dark:bg-red-900/20 text-red-700 dark:text-red-300'
]" ]"
> >
{{ tag === 'voided' ? 'Voided' : tag }} {{ tag }}
</Badge> </Badge>
</div> </div>
</div> </div>