Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1486455
feat(cards): credit limit override input and due-date reason summary
hubo1989 Nov 4, 2026
38056be
fix(bills): sort by bill_month desc and hide overdue days for paid pe…
hubo1989 Nov 4, 2026
1b4f797
feat(payables): recurring cycles and custom categories
hubo1989 Nov 4, 2026
f841cc7
Merge branch 'fix/bugs-agent-b' into fix/bugs
hubo1989 Nov 4, 2026
6950b71
Merge branch 'fix/bugs-agent-c' into fix/bugs
hubo1989 Nov 4, 2026
44e880d
feat(cards): unify card vs person-card model with bank rebind and add…
hubo1989 Nov 4, 2026
fb6eb7e
feat(bills): unified credit-account model with conservative backfill …
hubo1989 Nov 4, 2026
0f0d47f
feat(email): CMB merged-statement parser with per-card subtotals
hubo1989 Nov 4, 2026
40be604
feat(settings): dual-theme settings redesign with baoyu-design source…
hubo1989 Nov 4, 2026
744acce
Merge branch 'fix/bugs-agent-f-code' into fix/bugs
hubo1989 Nov 4, 2026
0a9b789
fix(email): aggregate CMB subtotals across all transaction sections
hubo1989 Nov 5, 2026
f7cc0ff
Merge branch 'fix/bugs-agent-e3' into fix/bugs
hubo1989 Nov 5, 2026
876c2e4
refactor(payables): extract shared category resolution and named cons…
hubo1989 Nov 5, 2026
eb45550
fix(cards): wire card detail modals to real entry points and polish f…
hubo1989 Nov 5, 2026
d4b93fd
Merge branch 'fix/bugs-review-r3' into fix/bugs
hubo1989 Nov 5, 2026
de30598
fix(cards): resolve PR #55 findings on card modal group
hubo1989 Nov 5, 2026
6a0a381
Merge branch 'fix/bugs-review-r2' into fix/bugs
hubo1989 Nov 5, 2026
be474ac
fix(bills): unify statement status timezone handling and surface merg…
hubo1989 Nov 5, 2026
7b528d1
Merge branch 'fix/bugs-review-r1' into fix/bugs
hubo1989 Nov 5, 2026
f32bd0d
fix(bills): make calendar-day diff timezone-independent via Asia/Shan…
hubo1989 Nov 5, 2026
af2d98a
fix(bills): align settled state with recalculated payments and tighte…
hubo1989 Nov 5, 2026
3759ef9
fix(cards): preserve limit override on blank edit and share form logic
hubo1989 Nov 5, 2026
39ce4e6
Merge branch 'fix/bugs-review2-s2' into fix/bugs
hubo1989 Nov 5, 2026
8a5deb7
fix(settings): address PR #55 round 2 review findings for settings an…
hubo1989 Nov 5, 2026
b0939ba
Merge branch 'fix/bugs-review2-s1' into fix/bugs
hubo1989 Nov 5, 2026
039659b
fix(cards): clear due-rule override atomically and remove dead CardFo…
hubo1989 Nov 5, 2026
bd3bade
fix(settings): PR #55 review r3 fixes for settings, push and misc
hubo1989 Nov 5, 2026
e896a50
Merge branch 'fix/bugs-review3-t2' into fix/bugs
hubo1989 Nov 5, 2026
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
4 changes: 2 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

- 浏览器端**不写 SQL**:组件只调 `lib/api/*.ts` 包装函数,走 `/api/rpc/<module>/<fn>` 命名白名单路由(`lib/api/rpc-client.ts` + `lib/api/registry.ts`)
- UI 用 ObsidianUI 暗色体系:`components/obsidian/` 原语 + `globals.css` 的 `d-*` token(Tailwind v4 `@theme`)。不要再引入 MUI
- 设计源在 `design/openpencil/`:`.op` 文件是唯一真源,token 三方对齐(foundations.json ↔ .op ↔ globals.css),CI 门禁 `verify-batch.sh --source-only` 会拦漂移
- 设计源在 `design/baoyu/`:baoyu-design(`canvas.json` + `.dc.html` 画板)是现行唯一真源,token 三方对齐(`tokens.json` ↔ `foundations.json` ↔ `globals.css`),CI 门禁 `verify-batch.sh --source-only` 会拦漂移;`design/openpencil/` 与 `.op` 文件保留为历史存档,不再对其进行写操作
- 部署:`npx vinext deploy`(本地构建 + 上传);密钥用 `wrangler secret put`
- `db/seed*.ts`、`scripts/*.mjs` 里残留的 `@insforge/sdk` 脚本是历史存档,SDK 已从依赖移除,跑不动了——别照着它们写新代码

Expand All @@ -26,7 +26,7 @@
npm run typecheck # tsc --noEmit
npm run lint # eslint --max-warnings=0
npm test # vitest run
bash design/openpencil/verify-batch.sh --source-only # 设计源五项检查
bash design/openpencil/verify-batch.sh --source-only # 设计源质量门禁(baoyu-design 画板/Token/热区)
```

CI(`.github/workflows/ci.yml`):代码质量 + 设计源质量,PR 到 main 时跑。
218 changes: 155 additions & 63 deletions app/(mobile)/bills/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,42 @@ import { createPayment, updateBillStatus, getBillDetail, getPaymentTotal } from
import { PaymentForm } from '@/components/mobile/PaymentForm'
import { BillEditForm } from '@/components/mobile/BillEditForm'
import { BillPaymentsManage } from '@/components/mobile/BillPaymentsManage'
import { CardDefinitionModal } from '@/components/mobile/CardDefinitionModal'
import { CardAccountModal } from '@/components/mobile/CardAccountModal'
import type { CreditCardWithProduct } from '@/lib/api/cards'
import { useAuth } from '@/lib/auth'
import { computePaymentDrivenStatus } from '@/lib/utils'
import { ChevronLeftIcon, ChevronRightIcon, BankIcon, UserIcon, ClockIcon } from '@/components/icons/WcIcon'
import { formatCardTail, getEffectiveCardName } from '@/lib/utils'
import type { Bill, Payment, CreditCard, CardProduct, CardHolder } from '@/lib/types'
import {
computePaymentDrivenStatus,
getEffectiveCreditLimit,
getEffectiveBillingDay,
formatCardTail,
getEffectiveCardName,
isBillUnissued,
calculateCardGracePeriod,
} from '@/lib/utils'
import { ChevronLeftIcon, ChevronRightIcon, ClockIcon } from '@/components/icons/WcIcon'
import type { Bill, Payment, CardHolder } from '@/lib/types'

type BillDetail = Bill & {
card: CreditCard & {
card?: CreditCardWithProduct & {
card_holders?: CardHolder
card_product: CardProduct
}
payments: Payment[]
}

/** 计算已还 / 剩余 / 状态 */
/** 计算已还 / 剩余 / 状态 / 是否未出账 */
function computeBillProgress(bill: BillDetail) {
const paid = (bill.payments || []).reduce((s, p) => s + Number(p.amount || 0), 0)
const amount = Number(bill.bill_amount) || 0
const remaining = Math.max(0, amount - paid)
// 与服务端落库、还款重算共用同一个状态函数,避免 0 / 0.01 边界两套口径
const status = computePaymentDrivenStatus(bill, paid)
return { paid, remaining, status }
let status = computePaymentDrivenStatus(bill, paid)
const unissued = isBillUnissued(bill)
if (status === 'overdue' && unissued) {
// 待出账保护:未到出账日绝无逾期
status = 'unpaid'
}
return { paid, remaining, status, isUnissued: unissued }
}

/** 状态徽章(暗色):淡底 + ink,与 bills 暗色视图同一口径 */
Expand Down Expand Up @@ -72,6 +86,8 @@ export default function BillDetailPage({ params }: { params: Promise<{ id: strin
const [paymentOpen, setPaymentOpen] = useState(false)
const [editOpen, setEditOpen] = useState(false)
const [paymentsManageOpen, setPaymentsManageOpen] = useState(false)
const [cardDefModalOpen, setCardDefModalOpen] = useState(false)
const [cardAccountModalOpen, setCardAccountModalOpen] = useState(false)
const { user } = useAuth()
// deleteBill 服务端 admin only;member 隐藏删除入口,权限以服务端为准
const isAdmin = user?.role === 'admin'
Expand All @@ -83,10 +99,15 @@ export default function BillDetailPage({ params }: { params: Promise<{ id: strin
setError(null)
// 账单 + 卡 + 卡产品 + 持卡人 + 还款记录,一次 RPC 返回
const detail = await getBillDetail(id)
const card = detail.bill.card
? { ...detail.bill.card, card_holders: detail.bill.card.card_holder }
const rawCard = detail.bill.card
const card: CreditCardWithProduct | undefined = rawCard && rawCard.card_product
? ({
...rawCard,
card_product: rawCard.card_product,
card_holders: rawCard.card_holder,
} as CreditCardWithProduct)
: undefined
setBill({ ...(detail.bill as Bill), card, payments: detail.payments } as unknown as BillDetail)
setBill({ ...(detail.bill as Bill), card, payments: detail.payments })
} catch (err) {
setError(err instanceof Error ? err.message : '加载账单失败')
} finally {
Expand Down Expand Up @@ -153,9 +174,15 @@ export default function BillDetailPage({ params }: { params: Promise<{ id: strin
const holderName = holder?.name
const last4 = formatCardTail(card?.card_number_last4)

const { paid, remaining, status } = computeBillProgress(bill)
const { paid, remaining, status, isUnissued } = computeBillProgress(bill)
const minPayment = bill.min_payment != null ? Number(bill.min_payment) : null
const billAmount = Number(bill.bill_amount) || 0
const effLimit = card ? getEffectiveCreditLimit(card) : null
const effBillingDay = card ? getEffectiveBillingDay(card) : null
const todayGraceDays =
card && card.card_product
? calculateCardGracePeriod({ ...card, card_product: card.card_product }).graceDays
: 0

// 免息还款期长度:这一期「出账日 → 还款日」的窗口,是卡产品属性,
// 与今天无关;剩余免息:今天距还款日还有几天(负数 = 已逾期)。
Expand All @@ -165,41 +192,43 @@ export default function BillDetailPage({ params }: { params: Promise<{ id: strin
if (!start || !end) return 0
return Math.max(0, Math.round((new Date(end).getTime() - new Date(start).getTime()) / 86400000))
})()
const billPaid = status === 'paid'
const isSettled = status === 'paid'
const graceRemaining = bill.due_date
? Math.round((new Date(bill.due_date).getTime() - Date.now()) / 86400000)
: null

const renderGraceRemainingNotice = () => {
if (isSettled || graceRemaining === null) return null
if (graceRemaining >= 0) {
return (
<p className='mt-0.5 inline-flex items-center gap-1 text-[12px] font-semibold leading-4 text-d-gold'>
<ClockIcon size={12} />
剩 {graceRemaining} 天免息(逾期未还将计息)
</p>
)
}
if (!isUnissued) {
return (
<p className='mt-0.5 inline-flex items-center gap-1 text-[12px] font-semibold leading-4 text-d-danger-ink'>
<ClockIcon size={12} />
已逾期 {-graceRemaining} 天
</p>
)
}
return null
}

const periodStart = bill.statement_start ? format(new Date(bill.statement_start), 'M/d') : ''
const periodEnd = bill.statement_end ? format(new Date(bill.statement_end), 'M/d') : ''

return (
<div className='obsidian-dashboard min-h-dvh bg-d-bg px-5 pb-24 pt-3 text-d-text'>
<HeaderBack title='账单详情' onBack={() => router.back()} />

{/* 头部:卡名 + 持卡人/银行 + 金额 + 状态徽章 */}
{/* 头部:金额 + 状态徽章 + 编辑金额与日期 */}
<div className='mb-2.5 rounded-2xl border border-d-border bg-d-surface p-4'>
<div className='mb-1 flex items-start justify-between gap-2.5'>
<div className='min-w-0 flex-1'>
<p className='truncate text-[15px] font-semibold leading-5 text-d-text'>{cardName}</p>
<div className='mt-1.5 flex flex-wrap items-center gap-1.5'>
<span className='inline-flex items-center gap-1 rounded-full bg-d-subtle px-2 py-0.5 text-[12px] font-semibold leading-4 text-d-accent-light'>
<BankIcon size={11} />
{bankName}
</span>
{holderName && (
<span className='inline-flex items-center gap-1 rounded-full bg-d-subtle px-2 py-0.5 text-[12px] font-semibold leading-4 text-d-accent-light'>
<UserIcon size={11} />
{holderName}
</span>
)}
{last4 && (
<span className='rounded-full bg-d-subtle px-2 py-0.5 text-[12px] font-semibold leading-4 text-d-muted'>
尾号 {last4}
</span>
)}
</div>
</div>
<p className='text-[13px] font-semibold text-d-muted'>账单应还</p>
<StatusBadgeDark status={status} />
</div>
<p className='num-tabular mt-2 text-[28px] font-bold leading-none text-d-text'>
Expand All @@ -224,44 +253,84 @@ export default function BillDetailPage({ params }: { params: Promise<{ id: strin
]}
/>

{/* 账单周期 */}
<Section title='账单周期'>
<p className='text-[13px] leading-5 text-d-text'>
{periodStart && periodEnd ? '账单周期 ' + periodStart + ' – ' + periodEnd : '账单周期 —'}
{last4 ? ' · 尾号 ' + last4 : ''}
</p>
{/* 区块 2:关联卡片(不含持卡人/尾号/账单日) */}
<Section
title='关联卡片'
action={
card && (
<button
type='button'
onClick={() => setCardDefModalOpen(true)}
className='text-[13px] font-semibold text-d-accent-light'
>
修改卡片信息
</button>
)
}
>
<div className='flex flex-col gap-1.5'>
<Row label='卡片名称' value={cardName} />
<Row label='所属银行' value={bankName} />
<Row
label='今日刷卡免息'
value={
todayGraceDays > 0
? `${todayGraceDays} 天`
: '—'
}
/>
Comment on lines +274 to +281

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

bug · medium
「今日刷卡免息」取的是本期「出账日 → 还款日」的固定窗口 graceWindow(与今天无关,见上方注释自述),与本页下方「免息还款期」行是同一个值,同页重复展示;而账单列表页 BillsView 同名词用的是 calculateCardGracePeriod 的今日动态口径(今天距下期还款日天数)。同一标签两页两种语义会误导用户(例:出账日已过 20 天、还款日还剩 30 天时,此处显示 50 天,列表页显示的是另一个数)。建议改用与列表页一致的今日动态免息天数,或改掉标签(如「最长免息期」)并去掉与「免息还款期」行的重复。

Suggestion:

Suggested change
<Row
label='今日刷卡免息'
value={
graceWindow > 0
? `${graceWindow} 天`
: '—'
}
/>
<Row
label='最长免息期'
value={graceWindow > 0 ? `${graceWindow} 天` : '—'}
/>

</div>
</Section>

{/* 日期信息:这一期账单自己的具体日期,不是循环规则 */}
<Section title='日期信息'>
{/* 区块 3:账单信息(人+卡)(不含银行/卡片) */}
<Section
title='账单信息(人+卡)'
action={
card && (
<button
type='button'
onClick={() => setCardAccountModalOpen(true)}
className='text-[13px] font-semibold text-d-accent-light'
>
修改
</button>
)
}
>
<div className='flex flex-col gap-1.5'>
<Row label='出账日' value={bill.statement_date ? format(new Date(bill.statement_date), 'yyyy-MM-dd') : '—'} />
<Row label='账单周期' value={periodStart && periodEnd ? periodStart + ' – ' + periodEnd : '—'} />
<Row label='持卡人' value={holderName || '—'} />
<Row label='卡片尾号' value={last4 || '—'} />
<Row
label='还款日'
value={bill.due_date ? format(new Date(bill.due_date), 'yyyy-MM-dd') : '—'}
label='信用额度'
value={
effLimit !== null && effLimit !== undefined
? `¥${Number(effLimit).toLocaleString()}`
: '—'
}
/>
<Row
label='每月账单日'
value={
effBillingDay !== null && effBillingDay !== undefined && effBillingDay > 0
? `每月 ${effBillingDay} 日`
: '—'
}
/>
Comment on lines +311 to +318

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

performance · low
同一 JSX 表达式内 getEffectiveBillingDay(card) 被调用两次(与信用额度行相同的冗余模式)。建议渲染前提取一次结果再判空,避免重复计算并简化表达式;另外此处用 truthy 判断,账单日为 0 等异常值也会落到 '—',若需区分「未设置」建议显式判空。

Suggestion:

Suggested change
<Row
label='每月账单日'
value={
card && getEffectiveBillingDay(card)
? `每月 ${getEffectiveBillingDay(card)} 日`
: '—'
}
/>
<Row
label='每月账单日'
value={effectiveBillingDay ? `每月 ${effectiveBillingDay} 日` : '—'}
/>


<div className='my-1 h-px bg-d-border/60' />

<Row label='账单周期' value={periodStart && periodEnd ? `${periodStart} – ${periodEnd}` : (bill.bill_month || '—')} />
<Row label='出账日' value={bill.statement_date ? format(new Date(bill.statement_date), 'yyyy-MM-dd') : '—'} />
<Row label='还款日' value={bill.due_date ? format(new Date(bill.due_date), 'yyyy-MM-dd') : '—'} />
<Row
label='免息还款期'
value={
graceWindow > 0
? graceWindow + ' 天(出账日 → 还款日)'
? `${graceWindow} 天(出账日 → 还款日)`
: '—'
}
/>
{!billPaid && graceRemaining !== null && (
<p
className={
'mt-0.5 inline-flex items-center gap-1 text-[12px] font-semibold leading-4 ' +
(graceRemaining < 0 ? 'text-d-danger-ink' : 'text-d-gold')
}
>
<ClockIcon size={12} />
{graceRemaining >= 0
? `剩 ${graceRemaining} 天免息(逾期未还将计息)`
: `已逾期 ${-graceRemaining} 天`}
</p>
)}
{renderGraceRemainingNotice()}
</div>
</Section>

Expand Down Expand Up @@ -370,6 +439,26 @@ export default function BillDetailPage({ params }: { params: Promise<{ id: strin
onClose={() => setPaymentsManageOpen(false)}
onChanged={load}
/>

{/* 修改卡片信息弹窗(所属银行、卡片名称、还款规则) */}
{card && (
<CardDefinitionModal
open={cardDefModalOpen}
onClose={() => setCardDefModalOpen(false)}
card={card}
onSaved={() => load({ silent: true })}
/>
)}

{/* 修改账单信息(人+卡)弹窗(持卡人、卡片尾号、信用额度、每月账单日) */}
{card && (
<CardAccountModal
open={cardAccountModalOpen}
onClose={() => setCardAccountModalOpen(false)}
card={card}
onSaved={() => load({ silent: true })}
/>
Comment on lines +455 to +460

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

bug · medium
这里的 as CreditCardWithProduct 断言掩盖了实际字段缺失:getBillDetail(bills.server.ts)的 SELECT 与 card 组装均未包含 credit_limit_override,返回的 card 只有 credit_limit。后果链:① 详情页「信用额度」行与 CardAccountModal 初始额度输入框经 getEffectiveCreditLimit 都会走 credit_limit 兜底,用户手动设置过的 override(0029 迁移约定:手动额度同时持久化 override,同步只更新 credit_limit)会被无视而显示错误值;② 用户在弹窗中保存时,updateCard 按「credit_limit 有值且 override 未传」的分支会用当前显示的错误值覆盖 credit_limit_override,可能静默清掉真实手动额度。建议在 getBillDetail 的 SELECT 与 card 组装中补上 credit_limit_override,前端再移除或收窄该断言。

Suggestion:

Suggested change
<CardAccountModal
open={cardAccountModalOpen}
onClose={() => setCardAccountModalOpen(false)}
card={card as CreditCardWithProduct}
onSaved={() => load({ silent: true })}
/>
// bills.server.ts getBillDetail 的 SELECT 增加一列:
cc.credit_limit_override AS c_credit_limit_override,
// card 组装对象中补充:
credit_limit_override:
row.c_credit_limit_override != null ? (row.c_credit_limit_override as number) : undefined,

)}
</div>
)
}
Expand Down Expand Up @@ -399,10 +488,13 @@ function Row({ label, value }: { label: string; value: string }) {
)
}

function Section({ title, children }: { title: string; children: React.ReactNode }) {
function Section({ title, action, children }: { title: string; action?: React.ReactNode; children: React.ReactNode }) {
return (
<div className='mb-2.5'>
<p className='mb-1.5 text-[15px] font-semibold leading-5 text-d-text'>{title}</p>
<div className='mb-1.5 flex items-center justify-between'>
<p className='text-[15px] font-semibold leading-5 text-d-text'>{title}</p>
{action}
</div>
<div className='rounded-2xl border border-d-border bg-d-surface p-3.5'>{children}</div>
</div>
)
Expand Down
19 changes: 19 additions & 0 deletions app/(mobile)/bills/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import { syncGmailLedgerToCardsAndBills } from '@/lib/api/sync-gmail'
import { getHolders } from '@/lib/api/holders'
import { PaymentForm } from '@/components/mobile/PaymentForm'
import { BillForm } from '@/components/mobile/BillForm'
import { CardCreateModal } from '@/components/mobile/CardCreateModal'
import { AccountMergeWizardModal } from '@/components/mobile/AccountMergeWizardModal'
import { BillDraftsPanel } from '@/components/mobile/BillDraftsPanel'
import { ManualBillAmountDialog } from '@/components/mobile/ManualBillAmountDialog'
import { PayableForm } from '@/components/mobile/PayableForm'
Expand Down Expand Up @@ -97,6 +99,8 @@ export default function BillsPage() {
const [paymentOpen, setPaymentOpen] = useState(false)
const [selectedBill, setSelectedBill] = useState<BillDashboardItem | null>(null)
const [billFormOpen, setBillFormOpen] = useState(false)
const [cardCreateOpen, setCardCreateOpen] = useState(false)
const [mergeWizardOpen, setMergeWizardOpen] = useState(false)
// 手填金额:只针对「卡」,账单可能还没生成,因此传的是 card,不是 bill
const [manualTarget, setManualTarget] = useState<CardWithBillsSummary | null>(null)
// 固定支出(房租/贷款等按月应付)
Expand Down Expand Up @@ -618,6 +622,21 @@ export default function BillsPage() {
onOpenPayment={openPaymentForBill}
onManualAmount={setManualTarget}
onAddBill={() => setBillFormOpen(true)}
onAddCard={() => setCardCreateOpen(true)}
onMergeCards={() => setMergeWizardOpen(true)}
/>

<CardCreateModal
open={cardCreateOpen}
onClose={() => setCardCreateOpen(false)}
onSuccess={loadData}
/>

<AccountMergeWizardModal
open={mergeWizardOpen}
onClose={() => setMergeWizardOpen(false)}
cards={cardsSummary.map(c => ({ ...c.card, account: c.account }))}
onSuccess={loadData}
/>
Comment on lines +635 to 640

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

bug · medium
mergeWizardOpen 状态与 AccountMergeWizardModal 已渲染,但整个代码库中不存在任何 setMergeWizardOpen(true) 调用:BillsView 本次只新增了 onAddCard 入口,未提供合并入口,合并向导功能用户永远无法触达,属于未完成接线/死代码。建议在 BillsView 页头或卡片行操作中透传一个 onMergeCards 类的入口并在本页调用 setMergeWizardOpen(true);若功能尚未上线,应连同状态与渲染一起移除,避免维护误导。

Suggestion:

Suggested change
<AccountMergeWizardModal
open={mergeWizardOpen}
onClose={() => setMergeWizardOpen(false)}
cards={cardsSummary.map(c => ({ ...c.card, account: c.account }))}
onSuccess={loadData}
/>
<BillsView
...
onAddCard={() => setCardCreateOpen(true)}
onMergeCards={() => setMergeWizardOpen(true)}
/>


{selectedBill && (
Expand Down
Loading
Loading