diff --git a/src/features/accounts/components/account-card.tsx b/src/features/accounts/components/account-card.tsx index 26af83b..1624ee8 100644 --- a/src/features/accounts/components/account-card.tsx +++ b/src/features/accounts/components/account-card.tsx @@ -15,6 +15,7 @@ import { TooltipContent, TooltipTrigger, } from "@/shared/components/ui/tooltip"; +import { isAccountInactive } from "@/shared/lib/accounts/constants"; import { cn } from "@/shared/utils/ui"; interface AccountCardProps { @@ -46,7 +47,7 @@ export function AccountCard({ onTransfer, className, }: AccountCardProps) { - const isInactive = status?.toLowerCase() === "inativa"; + const isInactive = isAccountInactive(status); const balanceColor = balance > 0 @@ -145,6 +146,7 @@ export function AccountCard({ Saldo diff --git a/src/features/accounts/components/accounts-page.tsx b/src/features/accounts/components/accounts-page.tsx index 50d9329..012f31f 100644 --- a/src/features/accounts/components/accounts-page.tsx +++ b/src/features/accounts/components/accounts-page.tsx @@ -186,14 +186,14 @@ export function AccountsPage({ Ativas - Arquivadas + Inativas {renderAccountList(orderedAccounts, false)} - + {renderAccountList(orderedArchivedAccounts, true)} diff --git a/src/features/cards/components/cards-page.tsx b/src/features/cards/components/cards-page.tsx index cefb648..b73d1ce 100644 --- a/src/features/cards/components/cards-page.tsx +++ b/src/features/cards/components/cards-page.tsx @@ -174,14 +174,14 @@ export function CardsPage({ Ativos - Arquivados + Inativos {renderCardList(orderedCards, false)} - + {renderCardList(orderedArchivedCards, true)} diff --git a/src/features/dashboard/components/widgets/my-accounts-widget.tsx b/src/features/dashboard/components/widgets/my-accounts-widget.tsx index 3327936..79bc1bf 100644 --- a/src/features/dashboard/components/widgets/my-accounts-widget.tsx +++ b/src/features/dashboard/components/widgets/my-accounts-widget.tsx @@ -22,6 +22,7 @@ import { TooltipTrigger, } from "@/shared/components/ui/tooltip"; import { WidgetEmptyState } from "@/shared/components/widget-empty-state"; +import { isAccountInactive } from "@/shared/lib/accounts/constants"; import { resolveLogoSrc } from "@/shared/lib/logo"; import { formatPeriodForUrl } from "@/shared/utils/period"; @@ -42,12 +43,15 @@ export function MyAccountsWidget({ }: MyAccountsWidgetProps) { const [isPending, startTransition] = useTransition(); - const excludedAccountsCount = accounts.filter( + const activeAccounts = accounts.filter( + (account) => !isAccountInactive(account.status), + ); + const excludedAccountsCount = activeAccounts.filter( (account) => account.excludeFromBalance, ).length; const visibleAccounts = showExcludedAccounts - ? accounts - : accounts.filter((account) => !account.excludeFromBalance); + ? activeAccounts + : activeAccounts.filter((account) => !account.excludeFromBalance); const displayedAccounts = visibleAccounts.slice(0, 5); const remainingCount = visibleAccounts.length - displayedAccounts.length; const hiddenExcludedAccountsCount = showExcludedAccounts @@ -117,7 +121,7 @@ export function MyAccountsWidget({ ) : null}
- {accounts.length === 0 ? ( + {activeAccounts.length === 0 ? (
export const isRefundNote = (note: string | null | undefined) => note?.startsWith(REFUND_NOTE_PREFIX) ?? false; + +export const isAccountInactive = (status: string | null | undefined) => + status?.toLowerCase() === "inativa";