feat(insights): adiciona suporte ao Ollama

chore(release): prepara versao 2.7.0
chore(deps): atualiza dependencias do workspace
2026-06-09 23:06:01 +00:00 · 2026-05-28 20:01:44 -03:00 · 2026-05-28 11:00:27 -03:00 · 2026-05-28 11:00:20 -03:00 · 2026-05-28 11:00:14 -03:00 · 2026-05-28 10:59:46 -03:00
119 changed files with 6988 additions and 4675 deletions
--- a/.env.example
+++ b/.env.example
@@ -17,6 +17,11 @@ POSTGRES_DB=openmonetis_db
 # Gere com: openssl rand -base64 32
 BETTER_AUTH_SECRET=your-secret-key-here-change-this
 BETTER_AUTH_URL=http://localhost:3000
+# Defina como true para bloquear novos cadastros
+DISABLE_SIGNUP=false
+# Duração de sessões persistentes quando "Manter conectado" estiver marcado
+AUTH_SESSION_EXPIRES_IN_DAYS=30
+AUTH_SESSION_UPDATE_AGE_HOURS=24

 # === Portas ===
 APP_PORT=3000
@@ -54,9 +59,12 @@ UMAMI_DOMAINS=
 ANTHROPIC_API_KEY=
 OPENAI_API_KEY=
 GOOGLE_GENERATIVE_AI_API_KEY=
+MINIMAX_API_KEY=
 OPENROUTER_API_KEY=
+OLLAMA_BASE_URL=http://127.0.0.1:11434/v1
+OLLAMA_API_KEY=

 # === Logo.dev (Opcional) ===
 # Logos automáticos de estabelecimentos. Cadastre em https://www.logo.dev
 LOGO_DEV_TOKEN=
-LOGO_DEV_SECRET_KEY=
+LOGO_DEV_SECRET_KEY=
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -13,22 +13,19 @@ on:

 env:
  DOCKER_IMAGE_NAME: openmonetis
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true

 jobs:
  quality:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5

      - name: Setup pnpm
        uses: pnpm/action-setup@v4
-        with:
-          version: 10.33.0

      - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
        with:
          node-version: 22
          cache: 'pnpm'
@@ -48,7 +45,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,9 +5,6 @@ on:
    branches:
      - main

-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-
 jobs:
  release:
    runs-on: ubuntu-latest
@@ -16,7 +13,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
        with:
          fetch-depth: 0

--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,32 +0,0 @@
-{
-	"files.exclude": {
-		"**/.git": true,
-		"**/.svn": true,
-		"**/.hg": true,
-		"**/.DS_Store": true,
-		"**/Thumbs.db": true,
-		"**/node_modules": true,
-		"node_modules": true,
-		"**/.vscode": true,
-		".vscode": true,
-		"**/.next": true,
-		".next": true
-	},
-	"editor.defaultFormatter": "biomejs.biome",
-	"editor.formatOnSave": true,
-	"editor.codeActionsOnSave": {
-		"source.organizeImports": "never",
-		"source.organizeImports.biome": "always",
-		"source.fixAll": "never",
-		"source.fixAll.biome": "always",
-		"source.fixAll.eslint": "never"
-	},
-	"[json]": {
-		"editor.defaultFormatter": "biomejs.biome"
-	},
-	"prettier.enable": false,
-	"editor.fontSize": 15,
-	"[jsonc]": {
-		"editor.defaultFormatter": "vscode.json-language-features"
-	}
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,119 @@ Todas as mudanças notáveis deste projeto serão documentadas neste arquivo.
 O formato é baseado em [Keep a Changelog](https://keepachangelog.com/pt-BR/1.1.0/),
 e este projeto adere ao [Versionamento Semântico](https://semver.org/lang/pt-BR/).

+## [2.7.0] - 2026-05-28
+
+Esta versão amplia o OpenMonetis para quem usa o app todos os dias e para quem prefere mais controle sobre os próprios dados. Os Insights ganham novas opções de IA, incluindo modelos locais via Ollama, enquanto a autenticação fica mais confortável em dispositivos pessoais. Também entram melhorias práticas em contas, lançamentos compartilhados, filtros, relatórios e dashboard, deixando os fluxos financeiros mais completos e fáceis de revisar.
+
+### Adicionado
+- Autenticação: a tela de login agora tem a opção "Manter conectado neste dispositivo", usando a persistência nativa do Better Auth para evitar novo login ao reabrir o navegador ou PWA.
+- Autenticação: novas variáveis `AUTH_SESSION_EXPIRES_IN_DAYS` e `AUTH_SESSION_UPDATE_AGE_HOURS` para configurar, em ambientes self-hosted, a duração e a renovação de sessões persistentes.
+- Contas: o extrato de uma conta agora tem um atalho "Adicionar rendimento" ao lado de "Ajustar saldo", abrindo um modal simples com valor e data para criar uma receita paga na conta atual, com categoria `Rendimentos`, forma de pagamento `Transferência bancária` e pessoa admin.
+- Insights: adicionado suporte ao provider MiniMax via `vercel-minimax-ai-provider`, incluindo os modelos M2.7, M2.7 Highspeed, M2.5, M2.5 Highspeed, M2.1, M2.1 Highspeed e M2.
+- Insights: adicionado suporte ao provider Ollama via endpoint OpenAI-compatible, com modelos sugeridos `llama3.2`, `llama3.1`, `qwen2.5` e `mistral`, além de input para qualquer modelo instalado localmente.
+- Configuração: adicionadas as variáveis `MINIMAX_API_KEY`, `OLLAMA_BASE_URL` e `OLLAMA_API_KEY` aos exemplos de ambiente, ao assistente de setup e à documentação.
+- Dependências: adicionada `@ai-sdk/openai-compatible` para integrar provedores compatíveis com a API da OpenAI, incluindo Ollama.
+- Lançamentos: o campo "Dividir com" agora permite selecionar múltiplas pessoas e exibe um campo de valor para cada participante escolhido.
+- Lançamentos: o modal de criação e edição agora exibe um card compacto de resumo da operação abaixo dos anexos, incluindo forma de pagamento, destino, categoria, pessoas, valores divididos e quantidade de lançamentos que serão criados.
+
+### Alterado
+- Contas: o modal "Adicionar rendimento" usa o mesmo seletor de data do modal de lançamentos e os botões de rendimento e ajuste de saldo agora exibem tooltip.
+- Categorias: o header de `/categories/[categoryId]` agora usa três blocos de métrica alinhados para total do mês selecionado, total do mês anterior e variação.
+- Dashboard: o botão expansível dos widgets passou de "Ver tudo" para "Expandir", com visual secundário e gradiente inferior mais compacto para diferenciar melhor a ação de abrir o modal dos links que navegam para páginas completas.
+- Insights: a resolução de modelos foi centralizada em `model-provider.ts`, reduzindo ramificações na action de geração e preservando OpenAI, Anthropic, Google, MiniMax e OpenRouter.
+- Insights: o aviso de privacidade agora diferencia providers externos de providers locais como Ollama.
+- Lançamentos: o filtro de categorias agora separa as opções em grupos de `Despesas` e `Receitas`, preservando ícones e busca dentro do seletor.
+- Lançamentos: a configuração de divisão foi movida para um modal dedicado e minimalista, com seleção direta de participantes, divisão igual e conferência do total distribuído.
+- Lançamentos: a validação de divisão agora aceita uma lista de participações, exige pessoas distintas e confere se a soma dos valores bate com o total do lançamento.
+- Lançamentos: os textos de edição de lançamentos divididos foram ajustados para tratar divisões com mais de duas pessoas.
+- Lançamentos: o card "Dividir lançamento" agora mostra avatares discretos antes dos nomes das pessoas selecionadas e remove as vírgulas entre os nomes no resumo.
+- Relatórios: em `/reports/category-trends`, o seletor de categorias não exibe mais a ação `Todas`; quando há seleção ativa, mostra apenas `Limpar seleção` e resume múltiplas escolhas pela contagem.
+- Relatórios: em `/reports/category-trends`, as tabelas agora usam os cabeçalhos `Categoria Despesa` e `Categoria Receita` e não exibem mais o ponto colorido antes do nome da categoria.
+
+### Corrigido
+- Categorias: em `/categories/[categoryId]`, o percentual de variação do header agora aparece sem `+` quando já há uma etiqueta indicando aumento, queda ou estabilidade.
+- Dashboard: os modais "Ver tudo" dos widgets agora reservam espaço para a barra de rolagem, evitando que ela fique sobreposta aos valores alinhados à direita.
+- Insights: o seletor de modelo do OpenRouter mantém o provider selecionado enquanto o usuário digita um modelo customizado sem `/`, evitando voltar automaticamente para o provider padrão.
+- Relatórios: em `/reports/category-trends`, a busca do seletor de categorias agora pesquisa pelo nome da categoria, e não apenas pelo ID interno, incluindo correspondência sem acentos.
+
+## [2.6.4] - 2026-05-23
+
+Esta versão reúne o polimento final antes da próxima publicação: melhora o fluxo de antecipação de parcelas, deixa os dialogs de lançamentos mais seguros e consistentes, e incorpora as contribuições vindas dos PRs abertos para nomes de logos e ajustes no cadastro de transações.
+
+### Adicionado
+- Logos: adicionado um dicionário de nomes de exibição para logos, com busca normalizada sem acentos e fallback para o comportamento anterior quando não houver mapeamento específico (PR #69).
+- Lançamentos: o dialog de adicionar múltiplos lançamentos agora pede confirmação antes de descartar alterações não salvas ao fechar ou cancelar (PR #70).
+
+### Alterado
+- Lançamentos: o modal "Histórico de Antecipações" agora segue o padrão do modal de detalhes, com `Fechar` e `Desfazer Antecipação` no rodapé, contagem dentro do conteúdo e cards de antecipação reorganizados em blocos mais escaneáveis.
+- Lançamentos: a antecipação de parcelas agora só permite selecionar parcelas futuras ao período escolhido, evitando antecipar a parcela do próprio mês sem bloquear parcelas seguintes da mesma compra.
+- Lançamentos: ao criar uma antecipação, o cache do histórico da série agora é invalidado e o modal refaz a busca ao abrir.
+- Lançamentos: ao adicionar uma nova linha no dialog de múltiplos lançamentos, a data passa a seguir a última transação informada em vez de voltar para a data atual (PR #72).
+
+### Corrigido
+- Lançamentos: ajustado o espaçamento horizontal da área rolável do dialog de adicionar transação para preservar o alinhamento dos campos e botões (PR #71).
+
+## [2.6.3] - 2026-05-22
+
+Esta versão concentra os ajustes feitos depois da `2.6.2` em um único ciclo público. O foco está em dar mais precisão aos filtros de lançamentos por período real de compra e em polir a análise de parcelas para priorizar parcelamentos mais próximos da quitação sem causar saltos visuais nos cards.
+
+### Adicionado
+- Lançamentos: o drawer de filtros agora permite informar data inicial e data final para filtrar a tabela por `data_compra`.
+
+### Alterado
+- Lançamentos: quando um intervalo de datas está ativo, a consulta server-side deixa de limitar os dados a um único mês e usa o intervalo real de compra, mantendo paginação e exportação alinhadas ao que aparece na tabela.
+- Relatórios: os cards de `/reports/installment-analysis` agora são ordenados pelo percentual pago em ordem decrescente, mantendo a data da compra como critério de desempate.
+- Relatórios: em `/reports/installment-analysis`, o contador de parcelas selecionadas agora aparece discretamente no botão "detalhes", sem criar uma área extra no corpo do card.
+
+### Corrigido
+- Relatórios: selecionar parcelas em um card de `/reports/installment-analysis` não força mais os outros cards da mesma linha a reservarem espaço vazio para o resumo de seleção.
+
+## [2.6.2] - 2026-05-21
+
+Esta versão corrige o build da imagem Docker depois da atualização para `pnpm@11.1.3`. A etapa de dependências dentro do Docker não recebia a configuração do workspace, então o install congelado falhava ao comparar os `overrides` e as políticas de build com o lockfile.
+
+### Corrigido
+- Docker: o `Dockerfile` agora usa `pnpm@11.1.3` em todos os estágios e copia `pnpm-workspace.yaml` antes do `pnpm install --frozen-lockfile`, garantindo que `overrides` e `allowBuilds` sejam aplicados também no build da imagem.
+
+## [2.6.1] - 2026-05-21
+
+Esta versão corrige o pipeline de publicação após o salto para a `2.6.0`. O build do GitHub Actions falhava antes mesmo de instalar as dependências porque o workflow ainda fixava uma versão antiga do `pnpm`, enquanto o projeto já declarava `pnpm@11.1.3` no `packageManager`.
+
+### Corrigido
+- CI: o workflow de build deixou de fixar uma versão diferente do `pnpm`, usando a versão declarada em `packageManager` para evitar conflito no `pnpm/action-setup`.
+- CI: a política de builds do `pnpm` foi migrada para `allowBuilds`, permitindo explicitamente os scripts necessários de `core-js`, `esbuild`, `sharp` e `unrs-resolver` durante o install no GitHub Actions.
+
+## [2.6.0] - 2026-05-21
+
+Esta versão implementa melhorias pensadas para o uso real do dia a dia. O OpenMonetis passa a lidar melhor com parcelamentos que já começaram, recupera atalhos importantes no extrato, deixa a revisão de importações mais precisa e dá mais controle para quem mantém uma instância self-hosted. Também entram correções de consistência no dashboard, em cartões, no tratamento da categoria `Pagamentos` e nas datas vindas de planilhas.
+
+### Adicionado
+- Autenticação: nova variável `DISABLE_SIGNUP=true` para bloquear novos cadastros. Quando ativa, a tela de cadastro deixa de aparecer na navegação, `/signup` redireciona para login/dashboard e a API de signup responde `403`.
+- Lançamentos: compras parceladas agora podem começar em uma parcela intermediária, como `5 de 10`. O sistema gera apenas as parcelas restantes e preserva o cálculo do valor unitário com base no total original.
+- Logos: adicionado o logo da Bipa à biblioteca local de marcas.
+- Relatórios: a análise de parcelas agora separa parcelas acompanhadas daquelas que ficaram fora do acompanhamento quando o parcelamento começa no meio da série.
+
+### Alterado
+- Contas: a página de extrato em `/accounts/[accountId]` voltou a exibir os botões "Nova Receita" e "Nova Despesa", alinhando o fluxo com as demais telas de lançamentos.
+- Cartões: os cards de `/cards` agora mostram o valor da fatura do mês atual junto dos indicadores de limite. O limite utilizado passa a considerar faturas em aberto, não apenas o status interno do lançamento.
+- Lançamentos: ao criar um lançamento a partir do extrato de uma conta, o diálogo já abre com essa conta selecionada como destino padrão.
+- Importação: os controles globais da revisão de extrato foram realinhados à esquerda, com espaçamento mais compacto e larguras mais consistentes.
+
+### Corrigido
+- Dashboard: o widget "Status de Pagamento" voltou a mostrar corretamente os valores em "A Pagar", somando despesas pelo valor absoluto e mantendo reembolsos como abatimento.
+- Importação: datas vindas de planilhas agora preservam o dia informado no Excel, evitando que `20/05/2026` apareça como `19/05/2026` em fusos como `America/Sao_Paulo`.
+- Importação: o seletor de categoria por linha agora mostra apenas categorias compatíveis com o tipo detectado do lançamento, separando receitas e despesas durante a revisão do extrato.
+- Importação: cada linha da revisão de extrato agora permite escolher uma pessoa específica, enquanto o campo global continua servindo como atalho para aplicar a pessoa nos lançamentos selecionados.
+- Lançamentos: despesas comuns na categoria `Pagamentos` voltaram a poder ser editadas, removidas, copiadas e importadas. A proteção continua valendo apenas para pagamentos automáticos de fatura com nota técnica `AUTO_FATURA:`.
+
+### Dependências
+- Stack core: `pnpm` 10.33.0 → 11.1.3.
+- Auth: `better-auth` e `@better-auth/passkey` 1.6.10 → 1.6.11.
+- AI SDKs: `@ai-sdk/anthropic` 3.0.76 → 3.0.78, `@ai-sdk/google` 3.0.71 → 3.0.75, `@ai-sdk/openai` 3.0.63 → 3.0.64 e `ai` 6.0.177 → 6.0.185.
+- AWS: `@aws-sdk/client-s3` e `@aws-sdk/s3-request-presigner` 3.1045.0 → 3.1050.0.
+- UI e dados: `@tanstack/react-query` 5.100.9 → 5.100.11, `date-fns` 4.1.0 → 4.2.1, `jspdf-autotable` 5.0.7 → 5.0.8, `pg` 8.20.0 → 8.21.0 e `react-day-picker` 10.0.0 → 10.0.1.
+- Dev tooling: `@types/node` 25.6.2 → 25.9.1, `@types/react` 19.2.14 → 19.2.15, `knip` 6.12.2 → 6.14.1, `tsx` 4.21.0 → 4.22.3 e novo `babel-plugin-react-compiler` 1.0.0.
+
 ## [2.5.7] - 2026-05-14

 Esta versão faz um polimento visual no relatório de análise de parcelas, deixando o estabelecimento como referência principal do card e mantendo o cartão visível de forma mais discreta no contexto da compra.
--- a/11
+++ b/11
@@ -5,12 +5,13 @@
 # ============================================
 FROM node:22-alpine AS deps

-RUN corepack enable && corepack prepare pnpm@10.33.0 --activate
+ARG PNPM_VERSION=11.1.3
+RUN corepack enable && corepack prepare pnpm@${PNPM_VERSION} --activate

 WORKDIR /app

 # Copiar apenas arquivos de dependências para aproveitar cache
-COPY package.json pnpm-lock.yaml* ./
+COPY package.json pnpm-lock.yaml* pnpm-workspace.yaml ./

 # Criar pasta public para o postinstall do pdfjs-dist
 RUN mkdir -p public
@@ -23,7 +24,8 @@ RUN pnpm install --frozen-lockfile
 # ============================================
 FROM node:22-alpine AS builder

-RUN corepack enable && corepack prepare pnpm@10.33.0 --activate
+ARG PNPM_VERSION=11.1.3
+RUN corepack enable && corepack prepare pnpm@${PNPM_VERSION} --activate

 WORKDIR /app

@@ -52,7 +54,8 @@ RUN pnpm build
 # ============================================
 FROM node:22-alpine AS runner

-RUN corepack enable && corepack prepare pnpm@10.33.0 --activate
+ARG PNPM_VERSION=11.1.3
+RUN corepack enable && corepack prepare pnpm@${PNPM_VERSION} --activate

 WORKDIR /app

--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@

 > **⚠️ Não há versão online hospedada.** Você precisa clonar o repositório e rodar localmente ou no seu próprio servidor.

-[![Version](https://img.shields.io/badge/version-2.5.7-blue?style=flat-square)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.7.0-blue?style=flat-square)](CHANGELOG.md)
 [![Next.js](https://img.shields.io/badge/Next.js-black?style=flat-square&logo=next.js)](https://nextjs.org/)
 [![TypeScript](https://img.shields.io/badge/TypeScript-blue?style=flat-square&logo=typescript)](https://www.typescriptlang.org/)
 [![PostgreSQL](https://img.shields.io/badge/PostgreSQL-blue?style=flat-square&logo=postgresql)](https://www.postgresql.org/)
@@ -39,6 +39,7 @@
 - [Arquitetura](#-arquitetura)
 - [Contribuindo](#-contribuindo)
 - [Apoie o Projeto](#-apoie-o-projeto)
+- [Star History](#-star-history)
 - [Licença](#-licença)

 ---
@@ -61,7 +62,7 @@ A ideia é simples: ter um lugar onde consigo ver todas as minhas contas, cartõ

 ### Funcionalidades

-💰 **Contas e transações** — Contas bancárias, cartões, dinheiro. Receitas, despesas e transferências. Categorização, filtros combináveis, extratos detalhados e importação de extratos OFX e XLS/XLSX com detecção automática de categoria.
+💰 **Contas e transações** — Contas bancárias, cartões, dinheiro. Receitas, despesas, rendimentos e transferências. Categorização, divisão de lançamentos entre várias pessoas, filtros combináveis com intervalo de datas, extratos detalhados e importação de extratos OFX e XLS/XLSX com detecção automática de categoria.

 📊 **Dashboard e relatórios** — Widgets interativos de métricas, gráficos de evolução, comparativos por categoria, tendências, uso de cartões, top estabelecimentos. Exportação em PDF e Excel.

@@ -71,7 +72,7 @@ A ideia é simples: ter um lugar onde consigo ver todas as minhas contas, cartõ

 💸 **Parcelamentos avançados** — Séries de parcelas, antecipação com cálculo de desconto, análise consolidada.

-🤖 **Insights com IA** — Análises geradas por Claude, GPT, Gemini ou OpenRouter. Insights personalizados e histórico salvo.
+🤖 **Insights com IA** — Análises geradas por Claude, GPT, Gemini, MiniMax, OpenRouter ou modelos locais via Ollama. Insights personalizados e histórico salvo.

 👥 **Gestão colaborativa** — Pagadores com permissões (admin/viewer), notificações automáticas por e-mail, códigos de compartilhamento.

@@ -95,7 +96,7 @@ A ideia é simples: ter um lugar onde consigo ver todas as minhas contas, cartõ
 - **shadcn/ui** (Radix UI) + **Tailwind CSS**
 - **Docker** (multi-stage build)
 - **Biome** (linting + formatting)
- **Vercel AI SDK** (Claude, GPT, Gemini, OpenRouter)
+- **Vercel AI SDK** (Claude, GPT, Gemini, MiniMax, OpenRouter, Ollama)

 ---

@@ -127,10 +128,11 @@ Só quer rodar o OpenMonetis. **Não precisa clonar o repositório nem instalar
 # 1. Baixe o compose
 curl -fsSL https://raw.githubusercontent.com/felipegcoutinho/openmonetis/main/docker-compose.yml -o docker-compose.yml

-# 2. Crie um .en na mesma pasta.
+# 2. Crie um .env na mesma pasta.
 # .env mínimo recomendado para produção
 BETTER_AUTH_SECRET=gere-um-valor-com-openssl-rand-base64-32
 BETTER_AUTH_URL=http://seu-dominio.com
+DISABLE_SIGNUP=false # opcional: true bloqueia novos cadastros

 # 3. Suba tudo
 docker compose up -d
@@ -443,6 +445,11 @@ POSTGRES_USER=openmonetis
 POSTGRES_PASSWORD=openmonetis_dev_password
 POSTGRES_DB=openmonetis_db

+# Autenticação
+DISABLE_SIGNUP=false # true bloqueia novos cadastros
+AUTH_SESSION_EXPIRES_IN_DAYS=30 # duração de sessões persistentes
+AUTH_SESSION_UPDATE_AGE_HOURS=24 # frequência de renovação da sessão
+
 # S3 Server (opcional, necessario para anexos)
 S3_ENDPOINT=
 S3_REGION=
@@ -465,7 +472,10 @@ RESEND_FROM_EMAIL=
 ANTHROPIC_API_KEY=
 OPENAI_API_KEY=
 GOOGLE_GENERATIVE_AI_API_KEY=
+MINIMAX_API_KEY=
 OPENROUTER_API_KEY=
+OLLAMA_BASE_URL=http://localhost:11434/v1
+OLLAMA_API_KEY=

 # Logo.dev (opcional, necessário para logos automáticos de estabelecimentos)
 # Ambas as variáveis são runtime — basta definir no host; nenhum build arg necessário.
@@ -473,6 +483,25 @@ LOGO_DEV_TOKEN=
 LOGO_DEV_SECRET_KEY=
 ```

+### IA local com Ollama
+
+O provider Ollama permite gerar insights usando modelos locais. Instale e suba o Ollama no host onde o modelo ficará disponível:
+
+```bash
+ollama pull llama3.2
+ollama serve
+```
+
+Configure a URL OpenAI-compatible no `.env`:
+
+```env
+OLLAMA_BASE_URL=http://localhost:11434/v1
+# Opcional; normalmente o Ollama local não exige chave.
+OLLAMA_API_KEY=
+```
+
+Se o OpenMonetis estiver rodando dentro de um container Docker e o Ollama estiver no host, `localhost` aponta para o próprio container. Nesse caso, use uma URL acessível a partir do container, como `http://host.docker.internal:11434/v1` quando disponível, ou o endereço da rede Docker/host configurado no seu ambiente.
+
 ---

 ## 🏗️ Arquitetura
@@ -575,6 +604,18 @@ Outras formas de contribuir: ⭐ estrela no repo, reportar bugs, melhorar docs,

 ---

+## ⭐ Star History
+
+<a href="https://www.star-history.com/?repos=felipegcoutinho%2Fopenmonetis&type=date&legend=top-left">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=felipegcoutinho/openmonetis&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=felipegcoutinho/openmonetis&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=felipegcoutinho/openmonetis&type=date&legend=top-left" />
+ </picture>
+</a>
+
+---
+
 ## 📄 Licença

 **Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International** (CC BY-NC-SA 4.0).
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "openmonetis",
-	"version": "2.5.7",
+	"version": "2.7.0",
 	"private": true,
-	"packageManager": "pnpm@10.33.0",
+	"packageManager": "pnpm@11.1.3",
 	"scripts": {
 		"dev": "next dev --turbopack",
 		"db:seed": "tsx scripts/mock-data.ts",
@@ -31,12 +31,13 @@
 		"mockup": "tsx scripts/mock-data.ts"
 	},
 	"dependencies": {
-		"@ai-sdk/anthropic": "^3.0.76",
-		"@ai-sdk/google": "^3.0.71",
-		"@ai-sdk/openai": "^3.0.63",
-		"@aws-sdk/client-s3": "^3.1045.0",
-		"@aws-sdk/s3-request-presigner": "^3.1045.0",
-		"@better-auth/passkey": "^1.6.10",
+		"@ai-sdk/anthropic": "^3.0.79",
+		"@ai-sdk/google": "^3.0.79",
+		"@ai-sdk/openai": "^3.0.65",
+		"@ai-sdk/openai-compatible": "^2.0.48",
+		"@aws-sdk/client-s3": "^3.1050.0",
+		"@aws-sdk/s3-request-presigner": "^3.1050.0",
+		"@better-auth/passkey": "^1.6.11",
 		"@dnd-kit/core": "^6.3.1",
 		"@dnd-kit/sortable": "^10.0.0",
 		"@dnd-kit/utilities": "^3.2.2",
@@ -63,53 +64,50 @@
 		"@radix-ui/react-toggle-group": "1.1.11",
 		"@radix-ui/react-tooltip": "1.2.8",
 		"@remixicon/react": "4.9.0",
-		"@tanstack/react-query": "^5.100.9",
+		"@tanstack/react-query": "^5.100.14",
 		"@tanstack/react-table": "8.21.3",
-		"@tanstack/react-virtual": "^3.13.24",
-		"ai": "^6.0.177",
-		"better-auth": "1.6.10",
+		"@tanstack/react-virtual": "^3.13.26",
+		"ai": "^6.0.191",
+		"better-auth": "1.6.11",
 		"canvas-confetti": "^1.9.4",
 		"class-variance-authority": "0.7.1",
 		"clsx": "2.1.1",
 		"cmdk": "^1.1.1",
-		"date-fns": "^4.1.0",
+		"date-fns": "^4.3.0",
 		"drizzle-orm": "0.45.2",
 		"exceljs": "^4.4.0",
 		"jspdf": "^4.2.1",
-		"jspdf-autotable": "^5.0.7",
+		"jspdf-autotable": "^5.0.8",
 		"next": "16.2.6",
 		"next-themes": "0.4.6",
 		"pdfjs-dist": "^5.7.284",
-		"pg": "8.20.0",
+		"pg": "8.21.0",
 		"react": "19.2.6",
-		"react-day-picker": "^10.0.0",
+		"react-day-picker": "^10.0.1",
 		"react-dom": "19.2.6",
 		"recharts": "3.8.1",
-		"resend": "^6.12.3",
+		"resend": "^6.12.4",
 		"sonner": "2.0.7",
 		"tailwind-merge": "3.6.0",
 		"tw-animate-css": "^1.4.0",
 		"vaul": "1.1.2",
+		"vercel-minimax-ai-provider": "^0.0.2",
 		"zod": "4.4.3"
 	},
-	"pnpm": {
-		"overrides": {
-			"defu": "6.1.7"
-		}
-	},
 	"devDependencies": {
 		"@biomejs/biome": "2.4.15",
 		"@tailwindcss/postcss": "4.3.0",
 		"@types/canvas-confetti": "^1.9.0",
-		"@types/node": "25.6.2",
+		"@types/node": "25.9.1",
 		"@types/pg": "^8.20.0",
-		"@types/react": "19.2.14",
+		"@types/react": "19.2.15",
 		"@types/react-dom": "19.2.3",
+		"babel-plugin-react-compiler": "^1.0.0",
 		"dotenv": "^17.4.2",
 		"drizzle-kit": "0.31.10",
-		"knip": "^6.12.2",
+		"knip": "^6.14.2",
 		"tailwindcss": "4.3.0",
-		"tsx": "4.21.0",
+		"tsx": "4.22.3",
 		"typescript": "6.0.3"
 	}
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,5 +1,35 @@
-onlyBuiltDependencies:
-  - core-js
-  - esbuild
-  - sharp
-  - unrs-resolver
+packages:
+  - '.'
+
+allowBuilds:
+  core-js: true
+  esbuild: true
+  sharp: true
+  unrs-resolver: true
+
+minimumReleaseAgeExclude:
+  - '@aws-sdk/client-s3@3.1050.0'
+  - '@aws-sdk/s3-request-presigner@3.1050.0'
+  - '@types/node@25.9.1'
+  - '@types/react@19.2.15'
+  - '@aws-sdk/client-s3@3.1054.0'
+  - '@aws-sdk/core@3.974.14'
+  - '@aws-sdk/credential-provider-env@3.972.40'
+  - '@aws-sdk/credential-provider-http@3.972.42'
+  - '@aws-sdk/credential-provider-ini@3.972.44'
+  - '@aws-sdk/credential-provider-login@3.972.44'
+  - '@aws-sdk/credential-provider-node@3.972.45'
+  - '@aws-sdk/credential-provider-process@3.972.40'
+  - '@aws-sdk/credential-provider-sso@3.972.44'
+  - '@aws-sdk/credential-provider-web-identity@3.972.44'
+  - '@aws-sdk/middleware-bucket-endpoint@3.972.16'
+  - '@aws-sdk/middleware-flexible-checksums@3.974.22'
+  - '@aws-sdk/middleware-sdk-s3@3.972.43'
+  - '@aws-sdk/nested-clients@3.997.12'
+  - '@aws-sdk/s3-request-presigner@3.1054.0'
+  - '@aws-sdk/signature-v4-multi-region@3.996.29'
+  - '@aws-sdk/token-providers@3.1054.0'
+  - '@aws-sdk/xml-builder@3.972.26'
+
+overrides:
+  defu: 6.1.7
--- a/public/fonts/font_index.ts
+++ b/public/fonts/font_index.ts
@@ -1,6 +1,6 @@
-import { Inter } from "next/font/google";
+import { Golos_Text } from "next/font/google";

-export const inter = Inter({
+export const inter = Golos_Text({
 	subsets: ["latin"],
 	display: "swap",
 	variable: "--font-inter",
--- a/public/logos/bipa.png
+++ b/public/logos/bipa.png
--- a/public/providers/minimax.svg
+++ b/public/providers/minimax.svg
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>MiniMax</title><defs><linearGradient id="lobe-icons-minimax-gradient" x1="0%" x2="100.182%" y1="50.057%" y2="50.057%"><stop offset="0%" stop-color="#E2167E"/><stop offset="100%" stop-color="#FE603C"/></linearGradient></defs><path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z" fill="url(#lobe-icons-minimax-gradient)" fill-rule="nonzero"/></svg>
--- a/public/providers/ollama_dark.svg
+++ b/public/providers/ollama_dark.svg
--- a/public/providers/ollama_light.svg
+++ b/public/providers/ollama_light.svg
--- a/setup.mjs
+++ b/setup.mjs
@@ -229,14 +229,22 @@ if (await askYesNo("  E-mail via Resend (notificações e convites)?")) {
 let anthropicKey = "";
 let openaiKey = "";
 let googleAiKey = "";
+let minimaxKey = "";
 let openrouterKey = "";
-if (await askYesNo("  Insights com IA (Claude, GPT, Gemini, OpenRouter)?")) {
+let ollamaBaseUrl = "";
+let ollamaApiKey = "";
+if (await askYesNo("  Insights com IA (Claude, GPT, Gemini, MiniMax, OpenRouter)?")) {
  console.log(`  ${c.dim}Deixe em branco o que não for usar${c.reset}`);
  anthropicKey = await ask("  ANTHROPIC_API_KEY: ");
  openaiKey = await ask("  OPENAI_API_KEY: ");
  googleAiKey = await ask("  GOOGLE_GENERATIVE_AI_API_KEY: ");
+  minimaxKey = await ask("  MINIMAX_API_KEY: ");
  openrouterKey = await ask("  OPENROUTER_API_KEY: ");
 }
+if (await askYesNo("  Insights locais com Ollama?")) {
+  ollamaBaseUrl = await askDefault("  OLLAMA_BASE_URL", "http://localhost:11434/v1");
+  ollamaApiKey = await ask("  OLLAMA_API_KEY (opcional): ");
+}

 // Domínio público
 let publicDomain = "";
@@ -285,6 +293,9 @@ const envContent = [
  "# === Better Auth ===",
  `BETTER_AUTH_SECRET=${authSecret}`,
  `BETTER_AUTH_URL=${betterAuthUrl}`,
+  "DISABLE_SIGNUP=false",
+  "AUTH_SESSION_EXPIRES_IN_DAYS=30",
+  "AUTH_SESSION_UPDATE_AGE_HOURS=24",
  "",
  "# === Portas ===",
  "APP_PORT=3000",
@@ -310,7 +321,10 @@ const envContent = [
  opt("ANTHROPIC_API_KEY", anthropicKey),
  opt("OPENAI_API_KEY", openaiKey),
  opt("GOOGLE_GENERATIVE_AI_API_KEY", googleAiKey),
+  opt("MINIMAX_API_KEY", minimaxKey),
  opt("OPENROUTER_API_KEY", openrouterKey),
+  opt("OLLAMA_BASE_URL", ollamaBaseUrl),
+  opt("OLLAMA_API_KEY", ollamaApiKey),
 ].join("\n");

 writeFileSync(join(targetDir, ".env"), envContent);
--- a/src/app/(auth)/login/page.tsx
+++ b/src/app/(auth)/login/page.tsx
@@ -1,5 +1,6 @@
 import { LoginForm } from "@/features/auth/components/login-form";
+import { isSignupDisabled } from "@/shared/lib/auth/signup";

 export default function LoginPage() {
-	return <LoginForm />;
+	return <LoginForm signupDisabled={isSignupDisabled()} />;
 }
--- a/src/app/(auth)/signup/page.tsx
+++ b/src/app/(auth)/signup/page.tsx
@@ -1,5 +1,11 @@
+import { redirect } from "next/navigation";
 import { SignupForm } from "@/features/auth/components/signup-form";
+import { isSignupDisabled } from "@/shared/lib/auth/signup";

 export default function SignupPage() {
+	if (isSignupDisabled()) {
+		redirect("/login");
+	}
+
 	return <SignupForm />;
 }
--- a/src/app/(dashboard)/accounts/[accountId]/statement/page.tsx
+++ b/src/app/(dashboard)/accounts/[accountId]/statement/page.tsx
@@ -3,6 +3,7 @@ import { notFound } from "next/navigation";
 import { connection } from "next/server";
 import { AccountDialog } from "@/features/accounts/components/account-dialog";
 import { AccountStatementCard } from "@/features/accounts/components/account-statement-card";
+import { AddYieldDialog } from "@/features/accounts/components/add-yield-dialog";
 import { AdjustBalanceDialog } from "@/features/accounts/components/adjust-balance-dialog";
 import type { Account } from "@/features/accounts/components/types";
 import {
@@ -31,6 +32,7 @@ import MonthNavigation from "@/shared/components/month-picker/month-navigation";
 import { Button } from "@/shared/components/ui/button";
 import { getUserId } from "@/shared/lib/auth/server";
 import { loadLogoOptions } from "@/shared/lib/logo/options";
+import { getBusinessDateString } from "@/shared/utils/date";
 import { parsePeriodParam } from "@/shared/utils/period";

 type PageSearchParams = Promise<ResolvedSearchParams>;
@@ -43,6 +45,26 @@ type PageProps = {
 const capitalize = (value: string) =>
 	value.length > 0 ? value[0]?.toUpperCase().concat(value.slice(1)) : value;

+const resolveDefaultPaymentMethod = (
+	accountType: string | null | undefined,
+) => {
+	if (accountType === "Dinheiro") return "Dinheiro";
+	if (accountType === "Pré-Pago | VR/VA") return "Pré-Pago | VR/VA";
+
+	return "Pix";
+};
+
+const resolveDefaultYieldDate = (period: string) => {
+	const today = getBusinessDateString();
+	if (today.startsWith(period)) return today;
+
+	const [year, month] = period.split("-").map((part) => Number(part));
+	if (!year || !month) return today;
+
+	const lastDay = new Date(year, month, 0).getDate();
+	return `${period}-${String(lastDay).padStart(2, "0")}`;
+};
+
 export default async function Page({ params, searchParams }: PageProps) {
 	await connection();
 	const { accountId } = await params;
@@ -100,6 +122,7 @@ export default async function Page({ params, searchParams }: PageProps) {
 		accountSummary;

 	const periodLabel = `${capitalize(monthName)} de ${year}`;
+	const defaultYieldDate = resolveDefaultYieldDate(selectedPeriod);

 	const accountDialogData: Account = {
 		id: account.id,
@@ -143,11 +166,17 @@ export default async function Page({ params, searchParams }: PageProps) {
 				totalExpenses={totalExpenses}
 				logo={account.logo}
 				balanceAdjustment={
-					<AdjustBalanceDialog
-						accountId={account.id}
-						period={selectedPeriod}
-						currentBalance={currentBalance}
-					/>
+					<>
+						<AddYieldDialog
+							accountId={account.id}
+							defaultDate={defaultYieldDate}
+						/>
+						<AdjustBalanceDialog
+							accountId={account.id}
+							period={selectedPeriod}
+							currentBalance={currentBalance}
+						/>
+					</>
 				}
 				actions={
 					<AccountDialog
@@ -197,7 +226,11 @@ export default async function Page({ params, searchParams }: PageProps) {
 						accountId: account.id,
 						settledOnly: true,
 					}}
-					allowCreate={false}
+					allowCreate
+					defaultAccountId={account.id}
+					defaultPaymentMethod={resolveDefaultPaymentMethod(
+						account.accountType,
+					)}
 					noteAsColumn={userPreferences?.statementNoteAsColumn ?? false}
 					columnOrder={userPreferences?.transactionsColumnOrder ?? null}
 					attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50}
--- a/src/app/(dashboard)/accounts/layout.tsx
+++ b/src/app/(dashboard)/accounts/layout.tsx
@@ -16,8 +16,7 @@ export default function RootLayout({
 				icon={<RiBankLine />}
 				title="Contas"
 				subtitle="Acompanhe todas as contas do mês selecionado incluindo receitas,
-        despesas e transações previstas. Use o seletor abaixo para navegar pelos
-        meses e visualizar as movimentações correspondentes."
+        despesas e transações previstas."
 			/>
 			{children}
 		</section>
--- a/src/app/(dashboard)/cards/[cardId]/invoice/page.tsx
+++ b/src/app/(dashboard)/cards/[cardId]/invoice/page.tsx
@@ -134,6 +134,8 @@ export default async function Page({ params, searchParams }: PageProps) {
 		accountName,
 		limitInUse: 0,
 		limitAvailable: limitAmount,
+		currentInvoiceAmount: 0,
+		currentInvoiceLabel: "",
 	};

 	const { totalAmount, invoiceStatus, paymentDate } = invoiceData;
--- a/src/app/(dashboard)/cards/layout.tsx
+++ b/src/app/(dashboard)/cards/layout.tsx
@@ -16,8 +16,7 @@ export default function RootLayout({
 				icon={<RiBankCard2Line />}
 				title="Cartões"
 				subtitle="Acompanhe todas os cartões do mês selecionado incluindo faturas, limites
-        e transações previstas. Use o seletor abaixo para navegar pelos meses e
-        visualizar as movimentações correspondentes."
+        e transações previstas."
 			/>
 			{children}
 		</section>
--- a/src/app/(dashboard)/payers/[payerId]/page.tsx
+++ b/src/app/(dashboard)/payers/[payerId]/page.tsx
@@ -87,6 +87,8 @@ const EMPTY_FILTERS: TransactionSearchFilters = {
 	dividedFilter: null,
 	amountMinFilter: null,
 	amountMaxFilter: null,
+	dateStartFilter: null,
+	dateEndFilter: null,
 };

 const createEmptySlugMaps = (): SlugMaps => ({
--- a/src/app/(dashboard)/transactions/layout.tsx
+++ b/src/app/(dashboard)/transactions/layout.tsx
@@ -16,8 +16,7 @@ export default function RootLayout({
 				icon={<RiArrowLeftRightLine />}
 				title="Lançamentos"
 				subtitle="Acompanhe todos os lançamentos financeiros do mês selecionado incluindo
-        receitas, despesas e transações previstas. Use o seletor abaixo para
-        navegar pelos meses e visualizar as movimentações correspondentes."
+        receitas, despesas e transações previstas."
 			/>
 			{children}
 		</section>
--- a/src/app/(landing-page)/page.tsx
+++ b/src/app/(landing-page)/page.tsx
@@ -30,6 +30,7 @@ import { Badge } from "@/shared/components/ui/badge";
 import { Button } from "@/shared/components/ui/button";
 import { Card, CardContent } from "@/shared/components/ui/card";
 import { getOptionalUserSession } from "@/shared/lib/auth/server";
+import { isSignupDisabled } from "@/shared/lib/auth/signup";

 export default async function Page() {
 	const [session, headersList, githubStats] = await Promise.all([
@@ -43,6 +44,7 @@ export default async function Page() {
 		"",
 	).replace(/:\d+$/, "");
 	const isPublicDomain = !!(publicDomain && hostname === publicDomain);
+	const signupDisabled = isSignupDisabled();
 	const metricsItems = getMetricsItems(githubStats.stars, githubStats.forks);

 	return (
@@ -86,20 +88,23 @@ export default async function Page() {
 										Entrar
 									</Button>
 								</Link>
-								<Link href="/signup">
-									<Button
-										variant="ghost"
-										size="sm"
-										className="h-9 text-primary-foreground/75 hover:bg-primary-foreground/10 hover:text-primary-foreground shadow-none dark:text-white/75 dark:hover:bg-white/10 dark:hover:text-white"
-									>
-										Começar
-									</Button>
-								</Link>
+								{!signupDisabled && (
+									<Link href="/signup">
+										<Button
+											variant="ghost"
+											size="sm"
+											className="h-9 text-primary-foreground/75 hover:bg-primary-foreground/10 hover:text-primary-foreground shadow-none dark:text-white/75 dark:hover:bg-white/10 dark:hover:text-white"
+										>
+											Começar
+										</Button>
+									</Link>
+								)}
 							</div>
 						))}
 					<MobileNav
 						isPublicDomain={isPublicDomain}
 						isLoggedIn={!!session?.user}
+						signupDisabled={signupDisabled}
 					/>
 				</nav>
 			</NavbarShell>
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -28,7 +28,7 @@
  --accent: oklch(94.8% 0.009 65);
  --accent-foreground: var(--foreground);

-  --success: oklch(61.685% 0.13077 162.978);
+  --success: oklch(63.924% 0.1657 151.561);
  --success-foreground: oklch(98% 0.01 150);
  --warning: oklch(78.357% 0.15147 68.301);
  --warning-foreground: oklch(20% 0.04 85);
@@ -41,9 +41,9 @@
  --input: var(--border);
  --ring: var(--primary);

-  --chart-1: var(--color-emerald-500);
-  --chart-2: var(--color-red-500);
-  --chart-3: var(--color-amber-500);
+  --chart-1: var(--color-orange-600);
+  --chart-2: var(--color-orange-400);
+  --chart-3: var(--color-orange-200);
  --chart-4: var(--color-blue-500);
  --chart-5: var(--color-pink-500);
  --chart-6: var(--color-stone-500);
@@ -90,7 +90,7 @@

 .dark {
  --background: oklch(18% 0.004 55);
-  --foreground: oklch(93% 0.008 80);
+  --foreground: #feefe1;
  --card: oklch(21.531% 0.00369 48.293);
  --card-foreground: var(--foreground);
  --popover: oklch(24% 0.004 55);
@@ -117,13 +117,13 @@
  --destructive: oklch(62% 0.2 28);
  --destructive-foreground: oklch(98% 0.005 30);

-  --border: oklch(24.957% 0.00355 48.274);
+  --border: oklch(31.987% 0.00462 39.069);
  --input: var(--border);
  --ring: var(--primary);

-  --chart-1: var(--color-emerald-500);
-  --chart-2: var(--color-orange-500);
-  --chart-3: var(--color-indigo-500);
+  --chart-1: var(--color-orange-600);
+  --chart-2: var(--color-orange-400);
+  --chart-3: var(--color-orange-200);
  --chart-4: var(--color-amber-500);
  --chart-5: var(--color-pink-500);
  --chart-6: var(--color-stone-500);
--- a/src/features/accounts/actions.ts
+++ b/src/features/accounts/actions.ts
@@ -32,9 +32,20 @@ import {
 	formatCurrency,
 	formatDecimalForDbRequired,
 } from "@/shared/utils/currency";
-import { getBusinessTodayDate, getTodayInfo } from "@/shared/utils/date";
+import {
+	getBusinessTodayDate,
+	getTodayInfo,
+	parseLocalDateString,
+} from "@/shared/utils/date";
+import { derivePeriodFromDate } from "@/shared/utils/period";
 import { normalizeFilePath } from "@/shared/utils/string";

+const ACCOUNT_YIELD_CATEGORY_NAME = "Rendimentos";
+const ACCOUNT_YIELD_CATEGORY_ICON = "RiFundsLine";
+const ACCOUNT_YIELD_TRANSACTION_NAME = "Rendimento";
+const ACCOUNT_YIELD_CONDITION = INITIAL_BALANCE_CONDITION;
+const ACCOUNT_YIELD_PAYMENT_METHOD = "Transferência bancária" as const;
+
 const accountBaseSchema = z.object({
 	name: z
 		.string({ message: "Informe o nome da conta." })
@@ -408,6 +419,107 @@ const adjustAccountBalanceSchema = z.object({

 type AdjustAccountBalanceInput = z.infer<typeof adjustAccountBalanceSchema>;

+const addAccountYieldSchema = z.object({
+	accountId: uuidSchema("FinancialAccount"),
+	amount: z
+		.number({ message: "Valor inválido." })
+		.positive("Informe um valor maior que zero."),
+	date: z
+		.string({ message: "Data inválida." })
+		.trim()
+		.regex(/^\d{4}-\d{2}-\d{2}$/u, "Data inválida."),
+});
+
+type AddAccountYieldInput = z.infer<typeof addAccountYieldSchema>;
+
+export async function addAccountYieldAction(
+	input: AddAccountYieldInput,
+): Promise<ActionResult> {
+	try {
+		const user = await getUser();
+		const data = addAccountYieldSchema.parse(input);
+		const adminPayerId = await getAdminPayerId(user.id);
+
+		if (!adminPayerId) {
+			throw new Error(
+				"Pessoa com papel administrador não encontrada. Crie uma pessoa admin antes de adicionar rendimentos.",
+			);
+		}
+
+		const purchaseDate = parseLocalDateString(data.date);
+		if (Number.isNaN(purchaseDate.getTime())) {
+			throw new Error("Data inválida.");
+		}
+
+		await db.transaction(async (tx: typeof db) => {
+			const account = await tx.query.financialAccounts.findFirst({
+				columns: { id: true },
+				where: and(
+					eq(financialAccounts.id, data.accountId),
+					eq(financialAccounts.userId, user.id),
+				),
+			});
+
+			if (!account) {
+				throw new Error("Conta não encontrada.");
+			}
+
+			const existingCategory = await tx.query.categories.findFirst({
+				columns: { id: true },
+				where: and(
+					eq(categories.userId, user.id),
+					eq(categories.type, "receita"),
+					eq(categories.name, ACCOUNT_YIELD_CATEGORY_NAME),
+				),
+			});
+
+			const category =
+				existingCategory ??
+				(
+					await tx
+						.insert(categories)
+						.values({
+							name: ACCOUNT_YIELD_CATEGORY_NAME,
+							type: "receita",
+							icon: ACCOUNT_YIELD_CATEGORY_ICON,
+							userId: user.id,
+						})
+						.returning({ id: categories.id })
+				)[0];
+
+			if (!category) {
+				throw new Error(
+					"Não foi possível preparar a categoria de rendimentos.",
+				);
+			}
+
+			await tx.insert(transactions).values({
+				condition: ACCOUNT_YIELD_CONDITION,
+				name: ACCOUNT_YIELD_TRANSACTION_NAME,
+				paymentMethod: ACCOUNT_YIELD_PAYMENT_METHOD,
+				note: null,
+				amount: formatDecimalForDbRequired(data.amount),
+				purchaseDate,
+				transactionType: "Receita" as const,
+				period: derivePeriodFromDate(data.date),
+				isSettled: true,
+				userId: user.id,
+				accountId: data.accountId,
+				cardId: null,
+				categoryId: category.id,
+				payerId: adminPayerId,
+			});
+		});
+
+		revalidateForEntity("accounts", user.id);
+		revalidateForEntity("transactions", user.id);
+
+		return { success: true, message: "Rendimento adicionado com sucesso." };
+	} catch (error) {
+		return handleActionError(error);
+	}
+}
+
 export async function adjustAccountBalanceAction(
 	input: AdjustAccountBalanceInput,
 ): Promise<ActionResult> {
--- a/src/features/accounts/components/account-dialog.tsx
+++ b/src/features/accounts/components/account-dialog.tsx
@@ -23,7 +23,7 @@ import {
 } from "@/shared/components/ui/dialog";
 import { useControlledState } from "@/shared/hooks/use-controlled-state";
 import { useFormState } from "@/shared/hooks/use-form-state";
-import { deriveNameFromLogo, normalizeLogo } from "@/shared/lib/logo";
+import { getLogoDisplayName, normalizeLogo } from "@/shared/lib/logo";
 import {
 	formatInitialBalanceInput,
 	normalizeDecimalInput,
@@ -66,7 +66,7 @@ const buildInitialValues = ({
 }): AccountFormValues => {
 	const fallbackLogo = logoOptions[0] ?? "";
 	const selectedLogo = normalizeLogo(account?.logo) || fallbackLogo;
-	const derivedName = deriveNameFromLogo(selectedLogo);
+	const derivedName = getLogoDisplayName(selectedLogo);

 	return {
 		name: account?.name ?? derivedName,
--- a/src/features/accounts/components/add-yield-dialog.tsx
+++ b/src/features/accounts/components/add-yield-dialog.tsx
@@ -0,0 +1,155 @@
+"use client";
+
+import { RiCalculatorLine, RiFundsLine } from "@remixicon/react";
+import { useRouter } from "next/navigation";
+import { useEffect, useState, useTransition } from "react";
+import { toast } from "sonner";
+import { addAccountYieldAction } from "@/features/accounts/actions";
+import { CalculatorDialogButton } from "@/shared/components/calculator/calculator-dialog";
+import { Button } from "@/shared/components/ui/button";
+import { CurrencyInput } from "@/shared/components/ui/currency-input";
+import { DatePicker } from "@/shared/components/ui/date-picker";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/shared/components/ui/dialog";
+import { Label } from "@/shared/components/ui/label";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "@/shared/components/ui/tooltip";
+
+type AddYieldDialogProps = {
+	accountId: string;
+	defaultDate: string;
+};
+
+export function AddYieldDialog({
+	accountId,
+	defaultDate,
+}: AddYieldDialogProps) {
+	const router = useRouter();
+	const [open, setOpen] = useState(false);
+	const [isPending, startTransition] = useTransition();
+	const [amount, setAmount] = useState("");
+	const [date, setDate] = useState(defaultDate);
+
+	useEffect(() => {
+		if (open) {
+			setAmount("");
+			setDate(defaultDate);
+		}
+	}, [open, defaultDate]);
+
+	const handleSave = () => {
+		const numericAmount = Number(amount);
+
+		if (!Number.isFinite(numericAmount) || numericAmount <= 0) {
+			toast.error("Informe um valor maior que zero.");
+			return;
+		}
+
+		if (!date) {
+			toast.error("Informe a data do rendimento.");
+			return;
+		}
+
+		startTransition(async () => {
+			const result = await addAccountYieldAction({
+				accountId,
+				amount: numericAmount,
+				date,
+			});
+
+			if (result.success) {
+				toast.success(result.message);
+				setOpen(false);
+				router.refresh();
+				return;
+			}
+
+			toast.error(result.error);
+		});
+	};
+
+	return (
+		<Dialog open={open} onOpenChange={setOpen}>
+			<Tooltip>
+				<TooltipTrigger asChild>
+					<DialogTrigger asChild>
+						<Button
+							type="button"
+							variant="ghost"
+							size="icon-sm"
+							className="text-primary hover:text-primary"
+							aria-label="Adicionar rendimento"
+						>
+							<RiFundsLine className="size-4" />
+						</Button>
+					</DialogTrigger>
+				</TooltipTrigger>
+				<TooltipContent>Adicionar rendimento</TooltipContent>
+			</Tooltip>
+			<DialogContent className="sm:max-w-md">
+				<DialogHeader>
+					<DialogTitle>Adicionar rendimento</DialogTitle>
+					<DialogDescription>
+						Registre um rendimento como receita paga nesta conta.
+					</DialogDescription>
+				</DialogHeader>
+				<div className="space-y-4">
+					<div className="space-y-2">
+						<Label htmlFor="yield-amount">Valor</Label>
+						<div className="relative">
+							<CurrencyInput
+								id="yield-amount"
+								value={amount}
+								onValueChange={setAmount}
+								autoFocus
+								className="pr-10"
+								placeholder="R$ 0,00"
+							/>
+							<CalculatorDialogButton
+								variant="ghost"
+								size="icon-sm"
+								className="absolute right-1 top-1/2 h-7 w-7 -translate-y-1/2"
+								onSelectValue={setAmount}
+							>
+								<RiCalculatorLine className="h-4 w-4 text-muted-foreground" />
+							</CalculatorDialogButton>
+						</div>
+					</div>
+					<div className="space-y-2">
+						<Label htmlFor="yield-date">Data</Label>
+						<DatePicker
+							id="yield-date"
+							value={date}
+							onChange={setDate}
+							placeholder="Data"
+							required
+						/>
+					</div>
+				</div>
+				<DialogFooter>
+					<Button
+						type="button"
+						variant="outline"
+						onClick={() => setOpen(false)}
+						disabled={isPending}
+					>
+						Cancelar
+					</Button>
+					<Button type="button" onClick={handleSave} disabled={isPending}>
+						{isPending ? "Salvando..." : "Adicionar"}
+					</Button>
+				</DialogFooter>
+			</DialogContent>
+		</Dialog>
+	);
+}
--- a/src/features/accounts/components/adjust-balance-dialog.tsx
+++ b/src/features/accounts/components/adjust-balance-dialog.tsx
@@ -17,6 +17,11 @@ import {
 	DialogTrigger,
 } from "@/shared/components/ui/dialog";
 import { Label } from "@/shared/components/ui/label";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "@/shared/components/ui/tooltip";
 import { formatCurrency } from "@/shared/utils/currency";

 type AdjustBalanceDialogProps = {
@@ -79,17 +84,22 @@ export function AdjustBalanceDialog({

 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
-				<Button
-					type="button"
-					variant="ghost"
-					size="icon-sm"
-					className="text-muted-foreground hover:text-foreground"
-					aria-label="Ajustar saldo"
-				>
-					<RiEqualizerLine className="size-4" />
-				</Button>
-			</DialogTrigger>
+			<Tooltip>
+				<TooltipTrigger asChild>
+					<DialogTrigger asChild>
+						<Button
+							type="button"
+							variant="ghost"
+							size="icon-sm"
+							className="text-primary hover:text-primary"
+							aria-label="Ajustar saldo"
+						>
+							<RiEqualizerLine className="size-4" />
+						</Button>
+					</DialogTrigger>
+				</TooltipTrigger>
+				<TooltipContent>Ajustar saldo</TooltipContent>
+			</Tooltip>
 			<DialogContent className="sm:max-w-md">
 				<DialogHeader>
 					<DialogTitle>Ajustar saldo</DialogTitle>
--- a/src/features/auth/components/login-form.tsx
+++ b/src/features/auth/components/login-form.tsx
@@ -4,6 +4,7 @@ import { useRouter } from "next/navigation";
 import { type FormEvent, useEffect, useState } from "react";
 import { toast } from "sonner";
 import { Button } from "@/shared/components/ui/button";
+import { Checkbox } from "@/shared/components/ui/checkbox";
 import {
 	Field,
 	FieldDescription,
@@ -21,15 +22,24 @@ import { GoogleAuthButton } from "./google-auth-button";

 type DivProps = React.ComponentProps<"div">;

+interface LoginFormProps extends DivProps {
+	signupDisabled?: boolean;
+}
+
 const authLinkClassName =
 	"font-medium text-foreground/88 underline decoration-border underline-offset-4 transition-colors hover:text-foreground hover:decoration-foreground/30 focus-visible:rounded-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/40";

-export function LoginForm({ className, ...props }: DivProps) {
+export function LoginForm({
+	className,
+	signupDisabled = false,
+	...props
+}: LoginFormProps) {
 	const router = useRouter();
 	const isGoogleAvailable = googleSignInAvailable;

 	const [email, setEmail] = useState("");
 	const [password, setPassword] = useState("");
+	const [rememberMe, setRememberMe] = useState(false);

 	const [error, setError] = useState("");
 	const [loadingEmail, setLoadingEmail] = useState(false);
@@ -52,7 +62,7 @@ export function LoginForm({ className, ...props }: DivProps) {
 				email,
 				password,
 				callbackURL: "/dashboard",
-				rememberMe: false,
+				rememberMe,
 			},
 			{
 				onRequest: () => {
@@ -178,6 +188,24 @@ export function LoginForm({ className, ...props }: DivProps) {
 							/>
 						</Field>

+						<div className="flex items-start gap-3">
+							<Checkbox
+								id="remember-me"
+								checked={rememberMe}
+								onCheckedChange={(checked) => setRememberMe(checked === true)}
+								disabled={loadingEmail || loadingGoogle || loadingPasskey}
+								className="mt-0.5"
+							/>
+							<div className="grid gap-1">
+								<FieldLabel
+									htmlFor="remember-me"
+									className="cursor-pointer font-medium"
+								>
+									Manter conectado neste dispositivo
+								</FieldLabel>
+							</div>
+						</div>
+
 						<Field>
 							<Button
 								type="submit"
@@ -233,12 +261,14 @@ export function LoginForm({ className, ...props }: DivProps) {
 							</div>
 						</Field>

-						<FieldDescription className="pt-1 text-center">
-							Não tem uma conta?{" "}
-							<a href="/signup" className={authLinkClassName}>
-								Inscreva-se
-							</a>
-						</FieldDescription>
+						{!signupDisabled && (
+							<FieldDescription className="pt-1 text-center">
+								Não tem uma conta?{" "}
+								<a href="/signup" className={authLinkClassName}>
+									Inscreva-se
+								</a>
+							</FieldDescription>
+						)}

 						<FieldDescription className="text-center text-sm text-muted-foreground">
 							<a href="/" className={authLinkClassName}>
--- a/src/features/cards/components/card-dialog.tsx
+++ b/src/features/cards/components/card-dialog.tsx
@@ -24,7 +24,7 @@ import {
 	DEFAULT_CARD_BRANDS,
 	DEFAULT_CARD_STATUS,
 } from "@/shared/lib/cards/constants";
-import { deriveNameFromLogo, normalizeLogo } from "@/shared/lib/logo";
+import { getLogoDisplayName, normalizeLogo } from "@/shared/lib/logo";
 import {
 	formatLimitInput,
 	normalizeDecimalInput,
@@ -59,7 +59,7 @@ const buildInitialValues = ({
 }): CardFormValues => {
 	const fallbackLogo = logoOptions[0] ?? "";
 	const selectedLogo = normalizeLogo(card?.logo) || fallbackLogo;
-	const derivedName = deriveNameFromLogo(selectedLogo);
+	const derivedName = getLogoDisplayName(selectedLogo);

 	return {
 		name: card?.name ?? derivedName,
--- a/src/features/cards/components/card-item.tsx
+++ b/src/features/cards/components/card-item.tsx
@@ -1,6 +1,8 @@
 "use client";

 import {
+	RiCalendarCloseLine,
+	RiCalendarScheduleLine,
 	RiChat3Line,
 	RiDeleteBin5Line,
 	RiFileList2Line,
@@ -33,6 +35,8 @@ interface CardItemProps {
 	limit: number;
 	limitInUse?: number;
 	limitAvailable?: number;
+	currentInvoiceAmount: number;
+	currentInvoiceLabel: string;
 	accountName: string;
 	logo?: string | null;
 	note?: string | null;
@@ -52,6 +56,8 @@ export function CardItem({
 	limit,
 	limitInUse,
 	limitAvailable,
+	currentInvoiceAmount,
+	currentInvoiceLabel,
 	accountName: _accountName,
 	logo,
 	note,
@@ -77,7 +83,7 @@ export function CardItem({

 	return (
 		<Card className="flex flex-col p-6 w-full">
-			<CardHeader className="space-y-2 p-0">
+			<CardHeader className="space-y-1 p-0">
 				<div className="flex items-start justify-between gap-2">
 					<div className="flex flex-1 items-center gap-2">
 						{logoPath ? (
@@ -146,15 +152,17 @@ export function CardItem({
 					)}
 				</div>

-				<div className="flex items-center justify-between border-y py-3 text-sm text-muted-foreground">
-					<span>
-						Fecha em{" "}
+				<div className="flex items-center justify-between text-sm text-muted-foreground rounded-lg py-4 px-2 bg-primary/5">
+					<span className="inline-flex items-center gap-1">
+						<RiCalendarCloseLine className="size-4" aria-hidden />
+						Fecha{" "}
 						<span className="font-semibold text-foreground">
 							dia {formatDay(closingDay)}
 						</span>
 					</span>
-					<span>
-						Vence em{" "}
+					<span className="inline-flex items-center gap-1">
+						<RiCalendarScheduleLine className="size-4" aria-hidden />
+						Vence{" "}
 						<span className="font-semibold text-foreground">
 							dia {formatDay(dueDay)}
 						</span>
@@ -165,29 +173,40 @@ export function CardItem({
 			<CardContent className="flex flex-1 flex-col gap-4 px-0">
 				<div className="flex flex-col gap-0.5">
 					<span className="text-xs text-muted-foreground">
-						Limite disponível
+						{currentInvoiceLabel}
 					</span>
 					<MoneyValues
-						amount={available}
-						className="text-xl font-semibold text-success"
+						amount={currentInvoiceAmount}
+						className="text-xl font-semibold text-info"
 					/>
 				</div>

-				<div className="grid grid-cols-2 gap-2">
-					<div className="flex flex-col gap-0.5">
+				<div className="flex gap-2 justify-between w-full">
+					<div className="flex min-w-0 flex-col gap-0.5">
 						<span className="text-xs text-muted-foreground">Limite total</span>
 						<MoneyValues
 							amount={limit}
 							className="text-sm font-semibold text-foreground"
 						/>
 					</div>
-					<div className="flex flex-col gap-0.5">
+
+					<div className="flex min-w-0 flex-col gap-0.5">
 						<span className="text-xs text-muted-foreground">
 							Limite utilizado
 						</span>
 						<MoneyValues
 							amount={used}
-							className="text-sm font-semibold text-destructive"
+							className="text-sm font-semibold text-primary"
+						/>
+					</div>
+
+					<div className="flex min-w-0 flex-col gap-0.5">
+						<span className="text-xs text-muted-foreground">
+							Limite disponível
+						</span>
+						<MoneyValues
+							amount={available}
+							className="text-sm font-semibold text-success"
 						/>
 					</div>
 				</div>
@@ -200,7 +219,7 @@ export function CardItem({
 						aria-label={`${usagePercent.toFixed(0)}% do limite utilizado`}
 					/>
 					<span className="text-xs text-muted-foreground">
-						{usagePercent.toFixed(1)}% utilizado
+						{usagePercent.toFixed(0)}% utilizado
 					</span>
 				</div>
 			</CardContent>
@@ -220,7 +239,7 @@ export function CardItem({
 					className="flex items-center gap-1 font-medium text-primary transition-opacity hover:opacity-80"
 				>
 					<RiFileList2Line className="size-4" aria-hidden />
-					ver fatura
+					fatura
 				</button>
 				<button
 					type="button"
--- a/src/features/cards/components/cards-page.tsx
+++ b/src/features/cards/components/cards-page.tsx
@@ -130,7 +130,7 @@ export function CardsPage({
 		}

 		return (
-			<div className="grid gap-4 grid-cols-1 sm:grid-cols-2 xl:grid-cols-3">
+			<div className="grid gap-4 grid-cols-1 sm:grid-cols-1 xl:grid-cols-3">
 				{list.map((card) => (
 					<CardItem
 						key={card.id}
@@ -142,6 +142,8 @@ export function CardsPage({
 						limit={card.limit}
 						limitInUse={card.limitInUse ?? null}
 						limitAvailable={card.limitAvailable ?? card.limit ?? null}
+						currentInvoiceAmount={card.currentInvoiceAmount}
+						currentInvoiceLabel={card.currentInvoiceLabel}
 						accountName={card.accountName}
 						logo={card.logo}
 						note={card.note}
--- a/src/features/cards/components/types.ts
+++ b/src/features/cards/components/types.ts
@@ -12,6 +12,8 @@ export type Card = {
 	accountName: string;
 	limitInUse: number;
 	limitAvailable: number;
+	currentInvoiceAmount: number;
+	currentInvoiceLabel: string;
 };

 export type CardFormValues = {
--- a/src/features/cards/queries.ts
+++ b/src/features/cards/queries.ts
@@ -1,7 +1,23 @@
-import { and, eq, ilike, isNull, ne, not, or, sql } from "drizzle-orm";
-import { cards, financialAccounts, transactions } from "@/db/schema";
+import {
+	and,
+	eq,
+	ilike,
+	isNotNull,
+	isNull,
+	ne,
+	not,
+	or,
+	sql,
+} from "drizzle-orm";
+import { cards, financialAccounts, invoices, transactions } from "@/db/schema";
 import { db } from "@/shared/lib/db";
+import { INVOICE_PAYMENT_STATUS } from "@/shared/lib/invoices";
 import { loadLogoOptions } from "@/shared/lib/logo/options";
+import {
+	formatPeriodMonthShort,
+	getCurrentPeriod,
+	parsePeriod,
+} from "@/shared/utils/period";

 type CardData = {
 	id: string;
@@ -15,6 +31,8 @@ type CardData = {
 	limit: number;
 	limitInUse: number;
 	limitAvailable: number;
+	currentInvoiceAmount: number;
+	currentInvoiceLabel: string;
 	accountId: string;
 	accountName: string;
 };
@@ -25,6 +43,11 @@ type AccountSimple = {
 	logo: string | null;
 };

+function formatCurrentInvoiceLabel(period: string) {
+	const { year } = parsePeriod(period);
+	return `Fatura ${formatPeriodMonthShort(period)}. ${year}`;
+}
+
 async function fetchCardsByStatus(
 	userId: string,
 	archived: boolean,
@@ -33,59 +56,94 @@ async function fetchCardsByStatus(
 	accounts: AccountSimple[];
 	logoOptions: string[];
 }> {
-	const [cardRows, accountRows, logoOptions, usageRows] = await Promise.all([
-		db.query.cards.findMany({
-			orderBy: (table, { desc }) => [desc(table.name)],
-			where: and(
-				eq(cards.userId, userId),
-				archived
-					? ilike(cards.status, "inativo")
-					: not(ilike(cards.status, "inativo")),
-			),
-			with: {
-				financialAccount: {
-					columns: {
-						id: true,
-						name: true,
+	const currentPeriod = getCurrentPeriod();
+	const currentInvoiceLabel = formatCurrentInvoiceLabel(currentPeriod);
+	const [cardRows, accountRows, logoOptions, usageRows, invoiceRows] =
+		await Promise.all([
+			db.query.cards.findMany({
+				orderBy: (table, { desc }) => [desc(table.name)],
+				where: and(
+					eq(cards.userId, userId),
+					archived
+						? ilike(cards.status, "inativo")
+						: not(ilike(cards.status, "inativo")),
+				),
+				with: {
+					financialAccount: {
+						columns: {
+							id: true,
+							name: true,
+						},
 					},
 				},
-			},
-		}),
-		db.query.financialAccounts.findMany({
-			orderBy: (table, { desc }) => [desc(table.name)],
-			where: eq(financialAccounts.userId, userId),
-			columns: {
-				id: true,
-				name: true,
-				logo: true,
-			},
-		}),
-		loadLogoOptions(),
-		db
-			.select({
-				cardId: transactions.cardId,
-				total: sql<number>`coalesce(sum(${transactions.amount}), 0)`,
-			})
-			.from(transactions)
-			.where(
-				and(
-					eq(transactions.userId, userId),
-					or(isNull(transactions.isSettled), eq(transactions.isSettled, false)),
-					// Recorrente no cartão: só consome limite quando a data da ocorrência já passou
-					or(
-						ne(transactions.condition, "Recorrente"),
-						sql`${transactions.purchaseDate} <= current_date`,
+			}),
+			db.query.financialAccounts.findMany({
+				orderBy: (table, { desc }) => [desc(table.name)],
+				where: eq(financialAccounts.userId, userId),
+				columns: {
+					id: true,
+					name: true,
+					logo: true,
+				},
+			}),
+			loadLogoOptions(),
+			db
+				.select({
+					cardId: transactions.cardId,
+					total: sql<number>`coalesce(sum(${transactions.amount}), 0)`,
+				})
+				.from(transactions)
+				.leftJoin(
+					invoices,
+					and(
+						eq(invoices.userId, transactions.userId),
+						eq(invoices.cardId, transactions.cardId),
+						eq(invoices.period, transactions.period),
 					),
-				),
-			)
-			.groupBy(transactions.cardId),
-	]);
+				)
+				.where(
+					and(
+						eq(transactions.userId, userId),
+						isNotNull(transactions.cardId),
+						or(
+							isNull(invoices.paymentStatus),
+							ne(invoices.paymentStatus, INVOICE_PAYMENT_STATUS.PAID),
+						),
+						// Recorrente no cartão: só consome limite quando a data da ocorrência já passou
+						or(
+							ne(transactions.condition, "Recorrente"),
+							sql`${transactions.purchaseDate} <= current_date`,
+						),
+					),
+				)
+				.groupBy(transactions.cardId),
+			db
+				.select({
+					cardId: transactions.cardId,
+					total: sql<number>`coalesce(sum(${transactions.amount}), 0)`,
+				})
+				.from(transactions)
+				.where(
+					and(
+						eq(transactions.userId, userId),
+						eq(transactions.period, currentPeriod),
+					),
+				)
+				.groupBy(transactions.cardId),
+		]);

 	const usageMap = new Map<string, number>();
 	usageRows.forEach((row: { cardId: string | null; total: number | null }) => {
 		if (!row.cardId) return;
 		usageMap.set(row.cardId, Number(row.total ?? 0));
 	});
+	const invoiceMap = new Map<string, number>();
+	invoiceRows.forEach(
+		(row: { cardId: string | null; total: number | null }) => {
+			if (!row.cardId) return;
+			invoiceMap.set(row.cardId, Math.abs(Number(row.total ?? 0)));
+		},
+	);

 	const cardList = cardRows.map((card) => ({
 		id: card.id,
@@ -99,13 +157,15 @@ async function fetchCardsByStatus(
 		limit: Number(card.limit),
 		limitInUse: (() => {
 			const total = usageMap.get(card.id) ?? 0;
-			return total < 0 ? Math.abs(total) : 0;
+			return Math.abs(total);
 		})(),
 		limitAvailable: (() => {
 			const total = usageMap.get(card.id) ?? 0;
-			const inUse = total < 0 ? Math.abs(total) : 0;
+			const inUse = Math.abs(total);
 			return Math.max(Number(card.limit) - inUse, 0);
 		})(),
+		currentInvoiceAmount: invoiceMap.get(card.id) ?? 0,
+		currentInvoiceLabel,
 		accountId: card.accountId,
 		accountName:
 			(card.financialAccount as { name?: string } | null)?.name ??
--- a/src/features/categories/components/category-detail-header.tsx
+++ b/src/features/categories/components/category-detail-header.tsx
@@ -5,6 +5,7 @@ import { Card } from "@/shared/components/ui/card";
 import type { CategoryType } from "@/shared/lib/categories/constants";
 import { currencyFormatter } from "@/shared/utils/currency";
 import { formatPercentage } from "@/shared/utils/percentage";
+import { cn } from "@/shared/utils/ui";

 type CategorySummary = {
 	id: string;
@@ -32,19 +33,40 @@ export function CategoryDetailHeader({
 	percentageChange,
 	transactionCount,
 }: CategoryDetailHeaderProps) {
+	const absoluteChange = currentTotal - previousTotal;
 	const variationLabel =
 		typeof percentageChange === "number"
 			? formatPercentage(percentageChange, {
 					minimumFractionDigits: 1,
 					maximumFractionDigits: 1,
 					absolute: true,
-					signDisplay: percentageChange === 0 ? "auto" : "always",
 				})
 			: "—";
+	const hasComparison = typeof percentageChange === "number";
+	const isFlat = absoluteChange === 0;
+	const changeDirection =
+		absoluteChange > 0 ? "increase" : absoluteChange < 0 ? "decrease" : "flat";
+	const comparisonTone =
+		isFlat || !hasComparison
+			? "neutral"
+			: category.type === "receita"
+				? changeDirection === "increase"
+					? "positive"
+					: "negative"
+				: changeDirection === "decrease"
+					? "positive"
+					: "negative";
+	const statusLabel = !hasComparison
+		? "Sem comparação"
+		: isFlat
+			? "Estável"
+			: changeDirection === "increase"
+				? "Aumento"
+				: "Queda";

 	return (
-		<Card className="px-4">
-			<div className="flex flex-col gap-6 lg:flex-row lg:items-center lg:justify-between">
+		<Card className="px-5 py-5">
+			<div className="flex flex-col gap-5">
 				<div className="flex items-start gap-3">
 					<CategoryIconBadge
 						icon={category.icon}
@@ -59,41 +81,59 @@ export function CategoryDetailHeader({
 							<TransactionTypeBadge kind={category.type} />
 							<span>
 								{transactionCount}{" "}
-								{transactionCount === 1 ? "lançamento" : "lançamentos"} no{" "}
-								período
+								{transactionCount === 1 ? "lançamento" : "lançamentos"} em{" "}
+								{currentPeriodLabel}
 							</span>
 						</div>
 					</div>
 				</div>

-				<div className="grid w-full gap-4 sm:grid-cols-2 lg:w-auto lg:grid-cols-3">
-					<div>
+				<div className="grid gap-3 md:grid-cols-3">
+					<div className="rounded-md border border-dashed bg-muted/20 px-3 py-3">
 						<p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
 							Total em {currentPeriodLabel}
 						</p>
-						<p className="mt-1 text-2xl font-semibold">
+						<p className="mt-1 text-3xl font-semibold tracking-tight">
 							{currencyFormatter.format(currentTotal)}
 						</p>
 					</div>
-					<div>
+
+					<div className="rounded-md border border-dashed bg-muted/20 px-3 py-3">
 						<p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
 							Total em {previousPeriodLabel}
 						</p>
-						<p className="mt-1 text-lg font-semibold text-muted-foreground">
+						<p className="mt-1 text-2xl font-semibold tracking-tight text-muted-foreground">
 							{currencyFormatter.format(previousTotal)}
 						</p>
 					</div>
-					<div>
+
+					<div className="rounded-md border border-dashed bg-muted/20 px-3 py-3">
 						<p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
-							Variação vs mês anterior
+							Variação
 						</p>
-						<PercentageChangeIndicator
-							value={percentageChange}
-							label={variationLabel}
-							positiveTrend={category.type === "receita" ? "up" : "down"}
-							className="mt-1 gap-1 text-lg font-semibold"
-							iconClassName="size-4"
-						/>
+						<div className="mt-2 flex flex-wrap items-center gap-2">
+							<span
+								className={cn(
+									"inline-flex h-6 items-center rounded-sm border px-2 text-xs font-medium",
+									comparisonTone === "positive" &&
+										"border-success/30 bg-success/5 text-success",
+									comparisonTone === "negative" &&
+										"border-destructive/30 bg-destructive/5 text-destructive",
+									comparisonTone === "neutral" &&
+										"border-muted-foreground/30 bg-muted/30 text-muted-foreground",
+								)}
+							>
+								{statusLabel}
+							</span>
+							<PercentageChangeIndicator
+								value={percentageChange}
+								label={variationLabel}
+								positiveTrend={category.type === "receita" ? "up" : "down"}
+								className="gap-1 text-lg font-semibold"
+								iconClassName="size-4"
+								showFlatIcon
+							/>
+						</div>
 					</div>
 				</div>
 			</div>
--- a/src/features/dashboard/components/category-breakdown/category-breakdown-list-item.tsx
+++ b/src/features/dashboard/components/category-breakdown/category-breakdown-list-item.tsx
@@ -1,4 +1,4 @@
-import { RiExternalLinkLine, RiWallet3Line } from "@remixicon/react";
+import { RiExternalLinkLine } from "@remixicon/react";
 import Link from "next/link";
 import type { DashboardCategoryBreakdownItem } from "@/features/dashboard/categories/category-breakdown-helpers";
 import { PercentageChangeIndicator } from "@/features/dashboard/components/percentage-change-indicator";
@@ -63,7 +63,7 @@ export function CategoryBreakdownListItem({
 								/>
 							</Link>
 						</div>
-						<div className="flex flex-wrap items-center gap-x-2 gap-y-0.5 text-xs text-muted-foreground">
+						<div className="flex flex-wrap items-center gap-x-1 text-xs text-muted-foreground">
 							<span>
 								{formatPercentage(
 									category.percentageOfTotal,
@@ -77,10 +77,9 @@ export function CategoryBreakdownListItem({
 									<span
 										className={`flex items-center gap-1 ${budgetExceeded ? "text-destructive" : "text-info"}`}
 									>
-										<RiWallet3Line className="size-3 shrink-0" />
 										{budgetExceeded ? (
 											<>
-												excedeu{" "}
+												Excedeu{" "}
 												<span className="font-medium">
 													{formatCurrency(exceededAmount)}
 												</span>
--- a/src/features/dashboard/components/dashboard-grid-editable.tsx
+++ b/src/features/dashboard/components/dashboard-grid-editable.tsx
@@ -330,7 +330,7 @@ export function DashboardGridEditable({
 							>
 								<div className="relative">
 									{isEditing && (
-										<div className="absolute inset-0 z-10 bg-background/50 backdrop-blur-xs rounded-lg border border-dashed border-primary flex items-center justify-center">
+										<div className="absolute inset-0 z-10 bg-background/60 backdrop-blur-[1.5px] rounded-lg border border-dashed border-primary flex items-center justify-center">
 											<div className="flex flex-col items-center gap-2">
 												<RiDragMove2Line className="size-8 text-primary" />
 												<span className="text-xs font-medium">
--- a/src/features/dashboard/components/dashboard-metrics-cards.tsx
+++ b/src/features/dashboard/components/dashboard-metrics-cards.tsx
@@ -8,6 +8,7 @@ import { MetricsCardInfoButton } from "@/features/dashboard/components/metrics-c
 import { PercentageChangeIndicator } from "@/features/dashboard/components/percentage-change-indicator";
 import type { DashboardCardMetrics } from "@/features/dashboard/overview/dashboard-metrics-queries";
 import MoneyValues from "@/shared/components/money-values";
+import { Badge } from "@/shared/components/ui/badge";
 import {
 	Card,
 	CardContent,
@@ -102,21 +103,22 @@ const getTrend = (current: number, previous: number): Trend => {
 	return "flat";
 };

-const getPercentChange = (current: number, previous: number): string => {
+const getPercentChange = (current: number, previous: number): string | null => {
 	const EPSILON = 0.01;

 	if (Math.abs(previous) < EPSILON) {
 		if (Math.abs(current) < EPSILON) return "0%";
-		return "—";
+		return null;
 	}

 	const change = ((current - previous) / Math.abs(previous)) * 100;
-	if (!Number.isFinite(change)) return "—";
+	if (!Number.isFinite(change)) return null;
+	if (Math.abs(change) < TREND_THRESHOLD) return "0%";
 	if (change > 999) return "+999%";
 	if (change < -999) return "-999%";
 	return formatPercentage(change, {
-		maximumFractionDigits: 2,
-		minimumFractionDigits: 2,
+		maximumFractionDigits: 0,
+		minimumFractionDigits: 0,
 		signDisplay: "always",
 	});
 };
@@ -160,28 +162,45 @@ export function DashboardMetricsCards({ metrics }: DashboardMetricsCardsProps) {
 								<Separator className="mt-1" />
 							</CardHeader>

-							<CardContent className="flex flex-col gap-3">
-								<div className="flex flex-wrap items-center justify-between gap-2 mt-1">
-									<MoneyValues
-										className="text-2xl leading-none font-medium"
-										amount={metric.current}
-									/>
-									<PercentageChangeIndicator
-										trend={trend}
-										label={percentChange}
-										positiveTrend={invertTrend ? "down" : "up"}
-										showFlatIcon
-										className="gap-1"
-										iconClassName="size-3.5"
-									/>
-								</div>
+							<CardContent className="flex flex-col">
+								<div className="flex items-start justify-between mt-1">
+									<div className="flex flex-col gap-2 min-w-0">
+										<div className="flex flex-wrap items-center">
+											<MoneyValues
+												className="text-2xl leading-none"
+												amount={metric.current}
+											/>
+										</div>

-								<div className="text-xs text-muted-foreground">
-									<MoneyValues
-										className="inline text-xs font-medium text-muted-foreground"
-										amount={metric.previous}
-									/>
-									<span className="ml-1">no mês anterior</span>
+										<div className="text-xs text-muted-foreground gap-1 flex items-center">
+											<span className="text-muted-foreground/50">vs</span>
+											<MoneyValues
+												className="inline text-xs"
+												amount={metric.previous}
+											/>
+											<Badge
+												variant="secondary"
+												aria-hidden={!percentChange}
+												className={cn(
+													"w-14 justify-center px-0 text-xs",
+													!percentChange && "invisible",
+												)}
+											>
+												{percentChange ? (
+													<PercentageChangeIndicator
+														trend={trend}
+														label={percentChange}
+														positiveTrend={invertTrend ? "down" : "up"}
+														showFlatIcon={false}
+														className="shrink-0 justify-center text-center text-xs tabular-nums"
+														iconClassName="hidden"
+													/>
+												) : (
+													<span className="tabular-nums">0%</span>
+												)}
+											</Badge>
+										</div>
+									</div>
 								</div>
 							</CardContent>
 						</Card>
--- a/src/features/dashboard/components/installment-analysis/installment-analysis-page.tsx
+++ b/src/features/dashboard/components/installment-analysis/installment-analysis-page.tsx
@@ -130,7 +130,7 @@ export function InstallmentAnalysisPage({
 	return (
 		<div className="flex flex-col gap-4">
 			{/* Card de resumo principal */}
-			<Card className="border-none bg-primary/10 dark:bg-primary/10">
+			<Card className="border-none bg-primary/10 shadow-none">
 				<CardContent className="flex flex-col items-start justify-center gap-2 py-2">
 					<p className="text-sm text-muted-foreground">
 						Se você pagar tudo que está selecionado:
--- a/src/features/dashboard/components/installment-analysis/installment-group-card.tsx
+++ b/src/features/dashboard/components/installment-analysis/installment-group-card.tsx
@@ -64,8 +64,8 @@ export function InstallmentGroupCard({
 	const hasSelection = selectedInstallments.size > 0;

 	const progress =
-		group.totalInstallments > 0
-			? (group.paidInstallments / group.totalInstallments) * 100
+		group.trackedInstallments > 0
+			? (group.paidInstallments / group.trackedInstallments) * 100
 			: 0;

 	const selectedAmount = group.pendingInstallments
@@ -83,6 +83,10 @@ export function InstallmentGroupCard({
 	);
 	const cardLogoSrc = resolveLogoSrc(group.cartaoLogo);
 	const cardName = group.cartaoName ?? "Compra parcelada";
+	const untrackedLabel =
+		group.untrackedInstallments === 1
+			? "1 parcela anterior fora do acompanhamento"
+			: `${group.untrackedInstallments} parcelas anteriores fora do acompanhamento`;

 	return (
 		<>
@@ -153,7 +157,7 @@ export function InstallmentGroupCard({
 					<div className="grid grid-cols-2 gap-4 p-4 rounded-lg bg-primary/5 mb-4">
 						<div className="space-y-1">
 							<p className="text-xs text-muted-foreground font-medium">
-								Valor total
+								Valor acompanhado
 							</p>
 							<MoneyValues
 								amount={totalAmount}
@@ -180,8 +184,8 @@ export function InstallmentGroupCard({
 							<div className="flex items-center gap-1 text-muted-foreground">
 								<RiCheckboxCircleFill className="size-3.5 text-success" />
 								<span>
-									{group.paidInstallments} de {group.totalInstallments} parcelas
-									pagas
+									{group.paidInstallments} de {group.trackedInstallments}{" "}
+									parcelas acompanhadas pagas
 								</span>
 							</div>
 							{unpaidCount > 0 && (
@@ -198,34 +202,28 @@ export function InstallmentGroupCard({
 							className="h-2.5 bg-muted"
 							indicatorClassName="bg-success"
 						/>
+						{group.untrackedInstallments > 0 && (
+							<p className="text-xs text-muted-foreground">{untrackedLabel}</p>
+						)}
 					</div>

-					{/* Valor selecionado */}
-					{hasSelection && (
-						<div className="flex items-center justify-between p-3 rounded-lg bg-primary/5 border border-primary/20 mb-4">
-							<span className="text-sm font-medium text-foreground">
-								{selectedInstallments.size}{" "}
-								{selectedInstallments.size === 1
-									? "parcela selecionada"
-									: "parcelas selecionadas"}
-							</span>
-							<MoneyValues
-								amount={selectedAmount}
-								className="text-base font-semibold text-primary"
-							/>
-						</div>
-					)}
-
 					{/* Botão para abrir detalhes */}
 					<Button
 						type="button"
 						variant="secondary"
 						size="sm"
-						className="w-full gap-1.5"
+						className="relative w-full justify-center gap-1.5"
 						onClick={() => setIsDetailsOpen(true)}
 					>
-						<RiFileList2Line className="size-4" />
-						detalhes ({group.pendingInstallments.length} parcelas)
+						<span className="inline-flex items-center gap-1.5">
+							<RiFileList2Line className="size-4" />
+							detalhes
+						</span>
+						{hasSelection && (
+							<span className="absolute right-2 rounded-full bg-primary/10 px-2 py-0.5 text-xs font-medium text-primary">
+								{selectedInstallments.size} sel.
+							</span>
+						)}
 					</Button>
 				</CardContent>
 			</Card>
--- a/src/features/dashboard/components/installment-expenses/installment-expense-list-item.tsx
+++ b/src/features/dashboard/components/installment-expenses/installment-expense-list-item.tsx
@@ -20,6 +20,7 @@ export function InstallmentExpenseListItem({
 	const {
 		compactLabel,
 		isLast,
+		remainingLabel,
 		remainingInstallments,
 		remainingAmount,
 		endDate,
@@ -65,15 +66,22 @@ export function InstallmentExpenseListItem({
 					/>
 				</div>

-				<p className="text-xs text-muted-foreground">
-					{endDate ? `Termina em ${endDate}` : null}
-					{" · Restante "}
-					<MoneyValues
-						amount={remainingAmount}
-						className="inline-block font-semibold"
-					/>{" "}
-					({remainingInstallments})
-				</p>
+				{remainingInstallments === 0 ? (
+					<p className="text-xs text-muted-foreground">
+						{endDate ? `Termina em ${endDate}` : null}
+						{" · Quitado"}
+					</p>
+				) : (
+					<p className="text-xs text-muted-foreground">
+						{endDate ? `Termina em ${endDate}` : null}
+						{` · ${remainingLabel}: `}
+						<MoneyValues
+							amount={remainingAmount}
+							className="inline-block font-semibold"
+						/>{" "}
+						({remainingInstallments}x)
+					</p>
+				)}

 				<Progress value={progress} className="mt-1 h-2" />
 			</div>
--- a/src/features/dashboard/components/metrics-card-info-button.tsx
+++ b/src/features/dashboard/components/metrics-card-info-button.tsx
@@ -2,10 +2,10 @@

 import { RiInformationLine } from "@remixicon/react";
 import {
-	HoverCard,
-	HoverCardContent,
-	HoverCardTrigger,
-} from "@/shared/components/ui/hover-card";
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "@/shared/components/ui/tooltip";

 type MetricsCardInfoButtonProps = {
 	label: string;
@@ -19,8 +19,8 @@ export function MetricsCardInfoButton({
 	helpLines,
 }: MetricsCardInfoButtonProps) {
 	return (
-		<HoverCard openDelay={150}>
-			<HoverCardTrigger asChild>
+		<Tooltip>
+			<TooltipTrigger asChild>
 				<button
 					type="button"
 					className="inline-flex items-center rounded-full text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/60"
@@ -28,17 +28,22 @@ export function MetricsCardInfoButton({
 				>
 					<RiInformationLine className="size-4" aria-hidden />
 				</button>
-			</HoverCardTrigger>
-			<HoverCardContent align="start" className="w-80 space-y-3">
+			</TooltipTrigger>
+			<TooltipContent
+				align="start"
+				side="bottom"
+				sideOffset={8}
+				className="max-w-80 space-y-3 p-3 text-left"
+			>
 				<div className="space-y-1">
-					<p className="text-sm font-medium text-foreground">{helpTitle}</p>
+					<p className="text-sm font-medium text-background">{helpTitle}</p>
 				</div>
-				<ul className="space-y-2 text-xs text-muted-foreground">
+				<ul className="space-y-2 text-xs text-background/80">
 					{helpLines.map((line) => (
 						<li key={`${label}-${line}`}>{line}</li>
 					))}
 				</ul>
-			</HoverCardContent>
-		</HoverCard>
+			</TooltipContent>
+		</Tooltip>
 	);
 }
--- a/src/features/dashboard/components/widgets/income-expense-balance-widget.tsx
+++ b/src/features/dashboard/components/widgets/income-expense-balance-widget.tsx
@@ -19,15 +19,15 @@ type IncomeExpenseBalanceWidgetProps = {
 const chartConfig = {
 	receita: {
 		label: "Receita",
-		color: "var(--success)",
+		color: "var(--chart-1)",
 	},
 	despesa: {
 		label: "Despesa",
-		color: "var(--destructive)",
+		color: "var(--chart-2)",
 	},
 	balanco: {
 		label: "Balanço",
-		color: "var(--warning)",
+		color: "var(--chart-3)",
 	},
 } satisfies ChartConfig;

--- a/src/features/dashboard/components/widgets/widget-settings-dialog.tsx
+++ b/src/features/dashboard/components/widgets/widget-settings-dialog.tsx
@@ -73,6 +73,7 @@ export function WidgetSettingsDialog({
 										</div>
 									</div>
 									<Switch
+										aria-label={`${isVisible ? "Ocultar" : "Exibir"} widget ${widget.title}`}
 										checked={isVisible}
 										onCheckedChange={() => onToggleWidget(widget.id)}
 									/>
--- a/src/features/dashboard/expenses/installment-analysis-queries.ts
+++ b/src/features/dashboard/expenses/installment-analysis-queries.ts
@@ -51,6 +51,9 @@ export type InstallmentGroup = {
 	cartaoDueDay: string | null;
 	cartaoLogo: string | null;
 	totalInstallments: number;
+	trackedStartInstallment: number;
+	trackedInstallments: number;
+	untrackedInstallments: number;
 	paidInstallments: number;
 	pendingInstallments: InstallmentDetail[];
 	totalPendingAmount: number;
@@ -153,6 +156,12 @@ export async function fetchInstallmentAnalysis(
 				cartaoDueDay: row.cartaoDueDay,
 				cartaoLogo: row.cartaoLogo,
 				totalInstallments: row.installmentCount ?? 0,
+				trackedStartInstallment: installmentDetail.currentInstallment,
+				trackedInstallments: 1,
+				untrackedInstallments: Math.max(
+					0,
+					installmentDetail.currentInstallment - 1,
+				),
 				paidInstallments: 0,
 				pendingInstallments: [installmentDetail],
 				totalPendingAmount: amount,
@@ -168,7 +177,13 @@ export async function fetchInstallmentAnalysis(
 			const paidCount = group.pendingInstallments.filter(
 				(i) => i.isSettled,
 			).length;
+			const trackedStartInstallment = Math.min(
+				...group.pendingInstallments.map((i) => i.currentInstallment),
+			);
 			group.paidInstallments = paidCount;
+			group.trackedStartInstallment = trackedStartInstallment;
+			group.trackedInstallments = group.pendingInstallments.length;
+			group.untrackedInstallments = Math.max(0, trackedStartInstallment - 1);
 			return group;
 		})
 		// Filtrar apenas séries que têm pelo menos uma parcela em aberto (não paga)
@@ -177,6 +192,22 @@ export async function fetchInstallmentAnalysis(
 				(i) => !i.isSettled,
 			);
 			return hasUnpaidInstallments;
+		})
+		.sort((a, b) => {
+			const progressA =
+				a.trackedInstallments > 0
+					? a.paidInstallments / a.trackedInstallments
+					: 0;
+			const progressB =
+				b.trackedInstallments > 0
+					? b.paidInstallments / b.trackedInstallments
+					: 0;
+
+			if (progressA !== progressB) {
+				return progressB - progressA;
+			}
+
+			return a.firstPurchaseDate.getTime() - b.firstPurchaseDate.getTime();
 		});

 	// Calcular totais
--- a/src/features/dashboard/expenses/installment-expenses-helpers.ts
+++ b/src/features/dashboard/expenses/installment-expenses-helpers.ts
@@ -1,12 +1,11 @@
 import type { InstallmentExpense } from "@/features/dashboard/expenses/installment-expenses-queries";
-import {
-	calculateLastInstallmentDate,
-	formatLastInstallmentDate,
-} from "@/shared/lib/installments/utils";
+import { calculateLastInstallmentDate } from "@/shared/lib/installments/utils";
+import { capitalize } from "@/shared/utils/string";

 type InstallmentExpenseDisplay = {
 	compactLabel: string | null;
 	isLast: boolean;
+	remainingLabel: "Próx." | "Aberto";
 	remainingInstallments: number;
 	remainingAmount: number;
 	endDate: string | null;
@@ -38,21 +37,30 @@ const isInstallmentLast = (
 const calculateInstallmentRemainingCount = (
 	currentInstallment: number | null,
 	installmentCount: number | null,
+	isSettled: boolean | null,
 ) => {
 	if (!currentInstallment || !installmentCount) {
 		return 0;
 	}

-	return Math.max(0, installmentCount - currentInstallment);
+	const includeCurrentInstallment = isSettled !== true;
+	const currentOffset = includeCurrentInstallment ? 1 : 0;
+
+	return Math.max(0, installmentCount - currentInstallment + currentOffset);
 };

 const calculateInstallmentRemainingAmount = (
 	amount: number,
 	currentInstallment: number | null,
 	installmentCount: number | null,
+	isSettled: boolean | null,
 ) =>
 	amount *
-	calculateInstallmentRemainingCount(currentInstallment, installmentCount);
+	calculateInstallmentRemainingCount(
+		currentInstallment,
+		installmentCount,
+		isSettled,
+	);

 const formatInstallmentEndDate = (
 	period: string,
@@ -69,7 +77,12 @@ const formatInstallmentEndDate = (
 		installmentCount,
 	);

-	return formatLastInstallmentDate(lastDate);
+	const month = new Intl.DateTimeFormat("pt-BR", {
+		month: "short",
+		timeZone: "UTC",
+	}).format(lastDate);
+
+	return `${capitalize(month)} de ${lastDate.getFullYear()}`;
 };

 const buildInstallmentProgress = (
@@ -89,7 +102,8 @@ const buildInstallmentProgress = (
 export const buildInstallmentExpenseDisplay = (
 	expense: InstallmentExpense,
 ): InstallmentExpenseDisplay => {
-	const { amount, currentInstallment, installmentCount, period } = expense;
+	const { amount, currentInstallment, installmentCount, isSettled, period } =
+		expense;

 	return {
 		compactLabel: buildInstallmentCompactLabel(
@@ -97,14 +111,17 @@ export const buildInstallmentExpenseDisplay = (
 			installmentCount,
 		),
 		isLast: isInstallmentLast(currentInstallment, installmentCount),
+		remainingLabel: isSettled === true ? "Próx." : "Aberto",
 		remainingInstallments: calculateInstallmentRemainingCount(
 			currentInstallment,
 			installmentCount,
+			isSettled,
 		),
 		remainingAmount: calculateInstallmentRemainingAmount(
 			amount,
 			currentInstallment,
 			installmentCount,
+			isSettled,
 		),
 		endDate: formatInstallmentEndDate(
 			period,
--- a/src/features/dashboard/expenses/installment-expenses-queries.ts
+++ b/src/features/dashboard/expenses/installment-expenses-queries.ts
@@ -8,6 +8,7 @@ export type InstallmentExpense = {
 	dueDate: Date | null;
 	purchaseDate: Date;
 	period: string;
+	isSettled: boolean | null;
 };

 export type InstallmentExpensesData = {
--- a/src/features/dashboard/overview/current-period-overview-queries.ts
+++ b/src/features/dashboard/overview/current-period-overview-queries.ts
@@ -274,15 +274,14 @@ const buildPaymentStatusData = (
 			continue;
 		}

-		const target =
-			row.transactionType === TRANSACTION_TYPE_INCOME
-				? result.income
-				: result.expenses;
+		const isExpense = row.transactionType === TRANSACTION_TYPE_EXPENSE;
+		const target = isExpense ? result.expenses : result.income;
+		const displayAmount = isExpense ? Math.abs(amount) : amount;

 		if (row.isSettled === true) {
-			target.confirmed += amount;
+			target.confirmed += displayAmount;
 		} else {
-			target.pending += amount;
+			target.pending += displayAmount;
 		}
 	}

@@ -406,6 +405,7 @@ const buildInstallmentExpensesData = (
 			dueDate: row.dueDate,
 			purchaseDate: row.purchaseDate,
 			period: row.period,
+			isSettled: row.isSettled,
 		}))
 		.sort((a, b) => {
 			const remainingA =
--- a/src/features/inbox/components/inbox-card.tsx
+++ b/src/features/inbox/components/inbox-card.tsx
@@ -213,8 +213,8 @@ export const InboxCard = memo(function InboxCard({
 						variant="ghost"
 						onClick={() => onViewDetails?.(item)}
 						className="text-muted-foreground hover:text-foreground"
-						aria-label="Ver detalhes"
-						title="Ver detalhes"
+						aria-label="detalhes"
+						title="detalhes"
 					>
 						<RiFileList2Line className="size-4" />
 					</Button>
--- a/src/features/insights/actions/generate.ts
+++ b/src/features/insights/actions/generate.ts
@@ -1,16 +1,14 @@
 "use server";

-import { anthropic } from "@ai-sdk/anthropic";
-import { google } from "@ai-sdk/google";
-import { openai } from "@ai-sdk/openai";
-import { createOpenRouter } from "@openrouter/ai-sdk-provider";
 import { generateObject } from "ai";
 import { getUser } from "@/shared/lib/auth/server";
 import {
 	type InsightsResponse,
 	InsightsResponseSchema,
 } from "@/shared/lib/schemas/insights";
-import { AVAILABLE_MODELS, INSIGHTS_SYSTEM_PROMPT } from "../constants";
+import { INSIGHTS_SYSTEM_PROMPT } from "../constants";
+import { resolveInsightsModel } from "../lib/model-provider";
+import { USER_INSTRUCTIONS_MAX_LENGTH } from "../lib/user-instructions";
 import { aggregateMonthData } from "./aggregate";
 import type { ActionResult } from "./types";

@@ -19,6 +17,7 @@ const PERIOD_REGEX = /^\d{4}-\d{2}$/;
 export async function generateInsightsAction(
 	period: string,
 	modelId: string,
+	userInstructions?: string,
 ): Promise<ActionResult<InsightsResponse>> {
 	try {
 		const user = await getUser();
@@ -30,50 +29,23 @@ export async function generateInsightsAction(
 			};
 		}

-		const selectedModel = AVAILABLE_MODELS.find((m) => m.id === modelId);
-		const isOpenRouterFormat = /^[a-zA-Z0-9_-]+\/[a-zA-Z0-9._-]+$/.test(
-			modelId,
-		);
-		if (!selectedModel && !isOpenRouterFormat) {
+		const normalizedUserInstructions = userInstructions?.trim() ?? "";
+		if (normalizedUserInstructions.length > USER_INSTRUCTIONS_MAX_LENGTH) {
 			return {
 				success: false,
-				error: "Modelo inválido.",
+				error: `As orientações devem ter no máximo ${USER_INSTRUCTIONS_MAX_LENGTH} caracteres.`,
 			};
 		}

+		const resolvedModel = resolveInsightsModel(modelId);
+		if (!resolvedModel.success) {
+			return resolvedModel;
+		}
+
 		const aggregatedData = await aggregateMonthData(user.id, period);

-		let model: ReturnType<typeof google>;
-
-		if (isOpenRouterFormat && !selectedModel) {
-			const apiKey = process.env.OPENROUTER_API_KEY;
-			if (!apiKey) {
-				return {
-					success: false,
-					error:
-						"OPENROUTER_API_KEY não configurada. Adicione a chave no arquivo .env",
-				};
-			}
-
-			const openrouter = createOpenRouter({
-				apiKey,
-			});
-			model = openrouter.chat(modelId);
-		} else if (selectedModel?.provider === "openai") {
-			model = openai(modelId);
-		} else if (selectedModel?.provider === "anthropic") {
-			model = anthropic(modelId);
-		} else if (selectedModel?.provider === "google") {
-			model = google(modelId);
-		} else {
-			return {
-				success: false,
-				error: "Provider de modelo não suportado.",
-			};
-		}
-
 		const result = await generateObject({
-			model,
+			model: resolvedModel.model,
 			schema: InsightsResponseSchema,
 			system: INSIGHTS_SYSTEM_PROMPT,
 			prompt: `Analise os seguintes dados financeiros agregados do período ${period}.
@@ -98,6 +70,11 @@ DADOS IMPORTANTES PARA SUA ANÁLISE:
 - Comprometimento futuro de R$ ${aggregatedData.installments.futureCommitment.toFixed(2)}
 - Use isso para alertas sobre comprometimento de renda futura

+ORIENTAÇÕES DO USUÁRIO PARA ESTA ANÁLISE:
+${normalizedUserInstructions || "Nenhuma orientação adicional."}
+
+Use as orientações do usuário apenas para priorizar achados, ajustar foco e calibrar o tom da análise. Não ignore o schema obrigatório, não invente dados que não estejam nos agregados e não execute ações ou alterações no sistema.
+
 Organize suas observações nas 4 categories especificadas no prompt do sistema:
 1. Comportamentos Observados (behaviors): 3-6 itens
 2. Gatilhos de Consumo (triggers): 3-6 itens
--- a/src/features/insights/components/analysis-summary-card.tsx
+++ b/src/features/insights/components/analysis-summary-card.tsx
@@ -0,0 +1,246 @@
+import {
+	RiCalendarLine,
+	RiDatabase2Line,
+	RiEditLine,
+	RiInformationLine,
+	RiSearchLine,
+	RiShieldCheckLine,
+	RiSparklingLine,
+} from "@remixicon/react";
+import type React from "react";
+import { type AIProvider, PROVIDERS } from "@/features/insights/constants";
+import { USER_INSTRUCTIONS_MAX_LENGTH } from "@/features/insights/lib/user-instructions";
+import { Badge } from "@/shared/components/ui/badge";
+import { Button } from "@/shared/components/ui/button";
+import { Card, CardContent } from "@/shared/components/ui/card";
+import {
+	Dialog,
+	DialogClose,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/shared/components/ui/dialog";
+import { Textarea } from "@/shared/components/ui/textarea";
+import { displayPeriod } from "@/shared/utils/period";
+import { cn } from "@/shared/utils/ui";
+import { ProviderIcon } from "./provider-icon";
+
+interface AnalysisSummaryCardProps {
+	period: string;
+	currentProvider: AIProvider;
+	selectedModelLabel: string;
+	userInstructions: string;
+	onUserInstructionsChange: (value: string) => void;
+}
+
+export function AnalysisSummaryCard({
+	period,
+	currentProvider,
+	selectedModelLabel,
+	userInstructions,
+	onUserInstructionsChange,
+}: AnalysisSummaryCardProps) {
+	const hasUserInstructions = userInstructions.trim().length > 0;
+
+	const handleUserInstructionsChange = (value: string) => {
+		onUserInstructionsChange(value.slice(0, USER_INSTRUCTIONS_MAX_LENGTH));
+	};
+
+	return (
+		<aside>
+			<Card className="border-border/70 bg-card/95 shadow-sm">
+				<CardContent className="flex flex-col gap-4">
+					<div className="flex items-center gap-3">
+						<div className="flex size-9 items-center justify-center rounded-xl bg-primary/10 text-primary">
+							<RiSparklingLine className="size-4" />
+						</div>
+						<div>
+							<h3 className="font-semibold text-sm">Resumo da análise</h3>
+							<p className="text-muted-foreground text-xs">
+								Configuração atual
+							</p>
+						</div>
+					</div>
+
+					<Dialog>
+						<DialogTrigger asChild>
+							<Button
+								className="w-full justify-start"
+								type="button"
+								variant="secondary"
+							>
+								<RiEditLine className="size-4" />
+								{hasUserInstructions
+									? "Editar orientações da IA"
+									: "Adicionar orientações da IA"}
+							</Button>
+						</DialogTrigger>
+						<DialogContent className="sm:max-w-2xl">
+							<DialogHeader>
+								<DialogTitle>Orientações para a IA</DialogTitle>
+								<DialogDescription>
+									Use este campo para direcionar o foco e o tom desta análise.
+									Essas orientações não alteram os dados analisados nem
+									substituem o formato obrigatório da resposta.
+								</DialogDescription>
+							</DialogHeader>
+
+							<div className="space-y-4">
+								<div className="rounded-2xl bg-warning/15 p-4">
+									<div className="flex gap-3">
+										<RiInformationLine className="mt-0.5 size-5 shrink-0 text-warning" />
+										<div className="space-y-1">
+											<p className="font-medium text-sm">
+												O que pode ser ajustado
+											</p>
+											<p className="text-muted-foreground text-xs leading-relaxed">
+												Você pode pedir mais foco em parcelamentos, gastos
+												recorrentes, cartão de crédito, oportunidades de
+												economia ou preferir um tom mais direto. A IA ainda deve
+												seguir o schema e usar apenas os dados agregados do
+												período.
+											</p>
+										</div>
+									</div>
+								</div>
+
+								<Textarea
+									className="min-h-52 resize-y"
+									maxLength={USER_INSTRUCTIONS_MAX_LENGTH}
+									onChange={(event) =>
+										handleUserInstructionsChange(event.target.value)
+									}
+									placeholder="Ex: foque em parcelamentos e despesas recorrentes; seja mais direto; ignore gastos de mercado."
+									value={userInstructions}
+								/>
+
+								<div className="flex items-center justify-between gap-3 text-muted-foreground text-xs">
+									<span>
+										Exemplos bons: “priorize economia”, “dê mais atenção ao
+										cartão”, “seja objetivo”.
+									</span>
+									<span className="shrink-0">
+										{userInstructions.length}/{USER_INSTRUCTIONS_MAX_LENGTH}
+									</span>
+								</div>
+							</div>
+
+							<DialogFooter>
+								<Button
+									onClick={() => onUserInstructionsChange("")}
+									type="button"
+									variant="outline"
+								>
+									Limpar
+								</Button>
+								<DialogClose asChild>
+									<Button type="button">Aplicar orientações</Button>
+								</DialogClose>
+							</DialogFooter>
+						</DialogContent>
+					</Dialog>
+
+					<p
+						className={cn(
+							"min-h-8 text-xs leading-relaxed",
+							hasUserInstructions ? "text-primary" : "text-info",
+						)}
+					>
+						{hasUserInstructions
+							? "Prompt personalizado ativo. As orientações serão consideradas nesta análise."
+							: "Prompt padrão ativo. A análise seguirá o formato e as prioridades originais."}
+					</p>
+
+					<div className="grid gap-2">
+						<SummaryRow
+							icon={<RiCalendarLine className="size-4" />}
+							label="Período"
+							value={displayPeriod(period)}
+						/>
+						<SummaryRow
+							icon={<RiDatabase2Line className="size-4" />}
+							label="Fonte dos dados"
+							value="Transações, categorias, cartões, contas, orçamentos, recorrências e parcelamentos do mês."
+						/>
+					</div>
+
+					<div>
+						<p className="mb-2 font-medium text-muted-foreground text-xs uppercase tracking-wide">
+							Modelo selecionado
+						</p>
+						<div className="flex items-center gap-3">
+							<ProviderIcon provider={currentProvider} />
+							<div className="min-w-0 flex-1">
+								<p className="font-semibold text-sm">
+									{PROVIDERS[currentProvider].name}
+								</p>
+								<p className="truncate text-muted-foreground text-xs">
+									{selectedModelLabel || "Nenhum modelo selecionado"}
+								</p>
+							</div>
+							{currentProvider === "ollama" && (
+								<Badge
+									className="bg-emerald-500/10 text-emerald-700 dark:text-emerald-300 border-none"
+									variant="outline"
+								>
+									Local
+								</Badge>
+							)}
+						</div>
+					</div>
+
+					<div>
+						<div className="rounded-2xl bg-warning/15 p-4">
+							<div className="flex gap-3">
+								<RiSearchLine className="mt-0.5 size-4 shrink-0 text-warning" />
+								<div className="space-y-1">
+									<p className="font-medium text-xs">Escopo da análise</p>
+									<p className="text-muted-foreground text-xs leading-relaxed">
+										Busca comportamentos, gatilhos, recomendações e melhorias.
+									</p>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div className="rounded-2xl bg-violet-500/10 p-4">
+						<div className="flex gap-3">
+							<RiShieldCheckLine className="mt-0.5 size-4 shrink-0 text-violet-600 dark:text-violet-300" />
+							<div className="space-y-1">
+								<p className="font-medium text-xs">Privacidade dos dados</p>
+								<p className="text-muted-foreground text-xs leading-relaxed">
+									{currentProvider === "ollama"
+										? "Dados enviados para sua instância Ollama."
+										: "Dados enviados ao provedor externo escolhido."}
+								</p>
+							</div>
+						</div>
+					</div>
+				</CardContent>
+			</Card>
+		</aside>
+	);
+}
+
+function SummaryRow({
+	icon,
+	label,
+	value,
+}: {
+	icon: React.ReactNode;
+	label: string;
+	value: string;
+}) {
+	return (
+		<div className="flex gap-3">
+			<div className="mt-0.5 text-muted-foreground">{icon}</div>
+			<div className="space-y-1">
+				<p className="font-semibold text-xs">{label}</p>
+				<p className="text-muted-foreground text-xs leading-relaxed">{value}</p>
+			</div>
+		</div>
+	);
+}
--- a/src/features/insights/components/insights-grid.tsx
+++ b/src/features/insights/components/insights-grid.tsx
@@ -5,7 +5,9 @@ import {
 	RiFlashlightLine,
 	RiLightbulbLine,
 	RiRocketLine,
+	RiSparklingLine,
 } from "@remixicon/react";
+import type React from "react";
 import {
 	Card,
 	CardContent,
@@ -22,6 +24,7 @@ import { cn } from "@/shared/utils/ui";

 interface InsightsGridProps {
 	insights: InsightsResponse;
+	action?: React.ReactNode;
 }

 const CATEGORY_ICONS: Record<InsightCategoryId, RemixiconComponentType> = {
@@ -53,21 +56,34 @@ const CATEGORY_COLORS: Record<
 	},
 };

-export function InsightsGrid({ insights }: InsightsGridProps) {
+export function InsightsGrid({ insights, action }: InsightsGridProps) {
 	const formattedPeriod = displayPeriod(insights.month);

 	return (
 		<div className="space-y-6">
-			<div className="space-y-2 px-1 text-muted-foreground">
-				<p>
-					No período selecionado ({formattedPeriod}), identificamos os
-					principais comportamentos e gatilhos que impactaram seu padrão de
-					consumo.
-				</p>
-				<p>Segue um panorama prático com recomendações acionáveis.</p>
-			</div>
+			<Card className="overflow-hidden border-primary/10 bg-linear-to-br from-primary/10 via-card to-card">
+				<CardContent className="px-4 py-1">
+					<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
+						<div className="flex gap-3">
+							<div className="flex size-11 shrink-0 items-center justify-center rounded-2xl bg-primary/10 text-primary">
+								<RiSparklingLine className="size-5" />
+							</div>
+							<div className="space-y-1">
+								<p className="font-semibold text-lg tracking-tight">
+									Análise pronta para {formattedPeriod}
+								</p>
+								<p className="max-w-2xl text-muted-foreground text-sm leading-relaxed">
+									Organizamos os sinais mais relevantes do período em quatro
+									blocos: comportamentos, gatilhos, recomendações e
+									oportunidades de melhoria.
+								</p>
+							</div>
+						</div>
+						{action && <div className="shrink-0">{action}</div>}
+					</div>
+				</CardContent>
+			</Card>

-			{/* Grid de Cards */}
 			<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
 				{insights.categories.map((categoryData) => {
 					const categoryConfig = INSIGHT_CATEGORIES[categoryData.category];
--- a/src/features/insights/components/insights-page.tsx
+++ b/src/features/insights/components/insights-page.tsx
@@ -1,15 +1,18 @@
 "use client";

 import {
-	RiAlertLine,
 	RiDeleteBinLine,
+	RiEyeLine,
+	RiFlashlightLine,
+	RiLightbulbLine,
+	RiLoader4Line,
+	RiRocketLine,
 	RiSaveLine,
-	RiSparklingLine,
 } from "@remixicon/react";
 import { useQueryClient } from "@tanstack/react-query";
 import { format } from "date-fns";
 import { ptBR } from "date-fns/locale";
-import { useEffect, useState, useTransition } from "react";
+import { useEffect, useRef, useState, useTransition } from "react";
 import { toast } from "sonner";
 import {
 	deleteSavedInsightsAction,
@@ -21,8 +24,6 @@ import {
 	savedInsightsQueryKey,
 	useSavedInsights,
 } from "@/features/insights/hooks/use-saved-insights";
-import { EmptyState } from "@/shared/components/feedback/empty-state";
-import { Alert, AlertDescription } from "@/shared/components/ui/alert";
 import { Button } from "@/shared/components/ui/button";
 import { Card, CardContent, CardHeader } from "@/shared/components/ui/card";
 import { Skeleton } from "@/shared/components/ui/skeleton";
@@ -47,6 +48,9 @@ export function InsightsPage({ period, onAnalyze }: InsightsPageProps) {
 		string | null
 	>(null);
 	const [error, setError] = useState<string | null>(null);
+	const [userInstructions, setUserInstructions] = useState("");
+	const [shouldScrollToAnalysis, setShouldScrollToAnalysis] = useState(false);
+	const analysisAreaRef = useRef<HTMLDivElement>(null);
 	const savedInsights = savedInsightsQuery.data ?? null;
 	const insights = draftInsights ?? savedInsights?.insights ?? null;
 	const selectedModel =
@@ -59,20 +63,45 @@ export function InsightsPage({ period, onAnalyze }: InsightsPageProps) {
 		draftInsights === null && savedInsightsQuery.error instanceof Error
 			? savedInsightsQuery.error.message
 			: null;
+	const shouldShowAnalysisArea = Boolean(
+		isPending ||
+			isLoadingSavedInsights ||
+			insights ||
+			error ||
+			savedInsightsError,
+	);

 	useEffect(() => {
 		void period;
 		setDraftInsights(null);
 		setSelectedModelOverride(null);
 		setError(null);
+		setShouldScrollToAnalysis(false);
 	}, [period]);

+	useEffect(() => {
+		if (!shouldScrollToAnalysis || !shouldShowAnalysisArea) return;
+
+		requestAnimationFrame(() => {
+			analysisAreaRef.current?.scrollIntoView({
+				behavior: "smooth",
+				block: "start",
+			});
+		});
+		setShouldScrollToAnalysis(false);
+	}, [shouldScrollToAnalysis, shouldShowAnalysisArea]);
+
 	const handleAnalyze = () => {
 		setError(null);
+		setShouldScrollToAnalysis(true);
 		onAnalyze?.();
 		startTransition(async () => {
 			try {
-				const result = await generateInsightsAction(period, selectedModel);
+				const result = await generateInsightsAction(
+					period,
+					selectedModel,
+					userInstructions,
+				);

 				if (result.success) {
 					setDraftInsights(result.data);
@@ -145,145 +174,173 @@ export function InsightsPage({ period, onAnalyze }: InsightsPageProps) {

 	return (
 		<div className="flex flex-col gap-6">
-			{/* Privacy Warning */}
-			<Alert className="border-none bg-primary/15">
-				<RiAlertLine className="size-4" color="red" />
-				<AlertDescription className="text-sm text-card-foreground">
-					<strong>Aviso de privacidade:</strong> Ao gerar insights, seus dados
-					financeiros serão enviados para o provedor de IA selecionado
-					(Anthropic, OpenAI, Google ou OpenRouter) para processamento.
-					Certifique-se de que você confia no provedor escolhido antes de
-					prosseguir.
-				</AlertDescription>
-			</Alert>
-
-			{/* Model Selector */}
 			<ModelSelector
 				value={selectedModel}
 				onValueChange={setSelectedModelOverride}
+				period={period}
+				onAnalyze={handleAnalyze}
+				userInstructions={userInstructions}
+				onUserInstructionsChange={setUserInstructions}
+				onCancel={() => {
+					setSelectedModelOverride(null);
+					setError(null);
+				}}
 				disabled={isPending}
+				isLoadingSavedInsights={isLoadingSavedInsights}
 			/>

-			{/* Analyze Button */}
-			<div className="flex items-center gap-3 flex-wrap">
-				<Button
-					onClick={handleAnalyze}
-					disabled={isPending || isLoadingSavedInsights}
-					className="bg-linear-to-r from-primary via-violet-400 to-cyan-400 dark:from-primary-dark dark:to-cyan-600"
-				>
-					<RiSparklingLine className="mr-2 size-5" aria-hidden="true" />
-					{isPending ? "Analisando..." : "Gerar análise inteligente"}
-				</Button>
-
-				{insights && !error && (
-					<Button
-						onClick={isSaved ? handleDelete : handleSave}
-						disabled={isSaving || isPending || isLoadingSavedInsights}
-						variant={isSaved ? "destructive" : "outline"}
-					>
-						{isSaved ? (
-							<>
-								<RiDeleteBinLine className="mr-2 size-4" />
-								{isSaving ? "Removendo..." : "Remover análise"}
-							</>
-						) : (
-							<>
-								<RiSaveLine className="mr-2 size-4" />
-								{isSaving ? "Salvando..." : "Salvar análise"}
-							</>
-						)}
-					</Button>
-				)}
-
-				{isSaved && savedDate && (
-					<span className="text-sm text-muted-foreground">
-						Salva em{" "}
-						{format(new Date(savedDate), "dd/MM/yyyy 'às' HH:mm", {
-							locale: ptBR,
-						})}
-					</span>
-				)}
-			</div>
-
-			{/* Content Area */}
-			<div className="min-h-[400px]">
-				{(isPending || isLoadingSavedInsights) && <LoadingState />}
-				{!isPending &&
-					!isLoadingSavedInsights &&
-					!insights &&
-					!error &&
-					!savedInsightsError && (
-						<Card className="flex min-h-[50vh] w-full items-center justify-center py-12">
-							<EmptyState
-								media={<RiSparklingLine className="size-6 text-primary" />}
-								title="Nenhuma análise realizada"
-								description="Clique no botão acima para gerar insights inteligentes sobre seus
-          dados financeiros do mês selecionado."
-							/>
-						</Card>
-					)}
-				{!isPending && !isLoadingSavedInsights && error && (
-					<ErrorState
-						title="Erro ao gerar insights"
-						error={error}
-						onRetry={handleAnalyze}
-					/>
-				)}
-				{!isPending &&
-					!isLoadingSavedInsights &&
-					!error &&
-					savedInsightsError && (
+			{shouldShowAnalysisArea && (
+				<div className="min-h-[320px] scroll-mt-6" ref={analysisAreaRef}>
+					{(isPending || isLoadingSavedInsights) && <LoadingState />}
+					{!isPending && !isLoadingSavedInsights && error && (
 						<ErrorState
-							title="Erro ao carregar insights salvos"
-							error={savedInsightsError}
-							onRetry={() => void savedInsightsQuery.refetch()}
+							title="Erro ao gerar insights"
+							error={error}
+							onRetry={handleAnalyze}
 						/>
 					)}
-				{!isPending &&
-					!isLoadingSavedInsights &&
-					insights &&
-					!error &&
-					!savedInsightsError && <InsightsGrid insights={insights} />}
-			</div>
+					{!isPending &&
+						!isLoadingSavedInsights &&
+						!error &&
+						savedInsightsError && (
+							<ErrorState
+								title="Erro ao carregar insights salvos"
+								error={savedInsightsError}
+								onRetry={() => void savedInsightsQuery.refetch()}
+							/>
+						)}
+					{!isPending &&
+						!isLoadingSavedInsights &&
+						insights &&
+						!error &&
+						!savedInsightsError && (
+							<InsightsGrid
+								insights={insights}
+								action={
+									<div className="flex flex-col items-start sm:items-end">
+										<Button
+											onClick={isSaved ? handleDelete : handleSave}
+											disabled={isSaving || isPending || isLoadingSavedInsights}
+											variant={isSaved ? "destructive" : "secondary"}
+										>
+											{isSaved ? (
+												<>
+													<RiDeleteBinLine className="mr-2 size-4" />
+													{isSaving ? "Removendo..." : "Remover análise"}
+												</>
+											) : (
+												<>
+													<RiSaveLine className="mr-2 size-4" />
+													{isSaving ? "Salvando..." : "Salvar análise"}
+												</>
+											)}
+										</Button>
+										{isSaved && savedDate && (
+											<span className="text-muted-foreground text-xs">
+												Salva em{" "}
+												{format(new Date(savedDate), "dd/MM/yyyy 'às' HH:mm", {
+													locale: ptBR,
+												})}
+											</span>
+										)}
+									</div>
+								}
+							/>
+						)}
+				</div>
+			)}
 		</div>
 	);
 }

 function LoadingState() {
-	return (
-		<div className="space-y-6">
-			{/* Intro text skeleton */}
-			<div className="space-y-2 px-1">
-				<Skeleton className="h-5 w-full max-w-2xl" />
-				<Skeleton className="h-5 w-full max-w-md" />
-			</div>
+	const categories = [
+		{
+			label: "Comportamentos",
+			icon: RiEyeLine,
+			color: "text-orange-600 dark:text-orange-400",
+		},
+		{
+			label: "Gatilhos",
+			icon: RiFlashlightLine,
+			color: "text-amber-600 dark:text-amber-400",
+		},
+		{
+			label: "Recomendações",
+			icon: RiLightbulbLine,
+			color: "text-sky-600 dark:text-sky-400",
+		},
+		{
+			label: "Melhorias",
+			icon: RiRocketLine,
+			color: "text-emerald-600 dark:text-emerald-400",
+		},
+	];

-			{/* Grid de Cards */}
-			<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
-				{Array.from({ length: 4 }).map((_, i) => (
-					<Card key={i} className="relative overflow-hidden">
-						<CardHeader>
-							<div className="flex items-center gap-2">
-								<Skeleton className="size-5 rounded" />
-								<Skeleton className="h-5 w-32" />
+	return (
+		<div className="space-y-4">
+			<Card className="overflow-hidden border-primary/10 bg-linear-to-br from-primary/10 via-card to-card">
+				<CardContent className="px-4 py-1">
+					<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
+						<div className="flex gap-3">
+							<div className="flex size-11 shrink-0 items-center justify-center rounded-2xl bg-primary/10 text-primary">
+								<RiLoader4Line className="size-5 animate-spin" />
 							</div>
-						</CardHeader>
-						<CardContent>
-							{Array.from({ length: 4 }).map((_, j) => (
-								<div
-									key={j}
-									className="flex flex-1 border-b border-dashed py-2.5 gap-2 items-start last:border-0"
-								>
-									<Skeleton className="size-4 shrink-0 rounded" />
-									<div className="flex-1 space-y-2">
-										<Skeleton className="h-4 w-full" />
-										<Skeleton className="h-4 w-3/4" />
-									</div>
+							<div className="space-y-2">
+								<div className="space-y-1">
+									<p className="font-semibold text-lg tracking-tight">
+										Preparando sua análise
+									</p>
+									<p className="max-w-2xl text-muted-foreground text-sm leading-relaxed">
+										Estamos consolidando os dados do período e organizando os
+										achados em comportamentos, gatilhos, recomendações e
+										melhorias.
+									</p>
 								</div>
-							))}
-						</CardContent>
-					</Card>
-				))}
+							</div>
+						</div>
+					</div>
+				</CardContent>
+			</Card>
+
+			<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
+				{categories.map((category) => {
+					const Icon = category.icon;
+
+					return (
+						<Card
+							key={category.label}
+							className="relative min-h-[390px] overflow-hidden"
+						>
+							<CardHeader className="pb-3">
+								<div className="flex items-center gap-2">
+									<Icon className={`size-5 ${category.color}`} />
+									<span className={`font-semibold ${category.color}`}>
+										{category.label}
+									</span>
+								</div>
+							</CardHeader>
+							<CardContent className="pt-0">
+								<div className="space-y-4">
+									{Array.from({ length: 5 }).map((_, index) => (
+										<div className="space-y-2" key={index}>
+											<div className="flex items-start gap-2">
+												<Skeleton className="mt-0.5 size-4 shrink-0 rounded-full" />
+												<div className="flex-1 space-y-2">
+													<Skeleton className="h-3.5 w-full" />
+													<Skeleton className="h-3.5 w-[82%]" />
+												</div>
+											</div>
+											{(index === 1 || index === 3) && (
+												<Skeleton className="ml-6 h-10 w-[72%] rounded-xl" />
+											)}
+										</div>
+									))}
+								</div>
+							</CardContent>
+						</Card>
+					);
+				})}
 			</div>
 		</div>
 	);
--- a/src/features/insights/components/model-selection-card.tsx
+++ b/src/features/insights/components/model-selection-card.tsx
@@ -0,0 +1,154 @@
+import { RiExternalLinkLine, RiSparklingLine } from "@remixicon/react";
+import Link from "next/link";
+import type {
+	AIProvider,
+	AVAILABLE_MODELS,
+} from "@/features/insights/constants";
+import { Button } from "@/shared/components/ui/button";
+import { Card, CardContent } from "@/shared/components/ui/card";
+import { Input } from "@/shared/components/ui/input";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/shared/components/ui/select";
+
+interface ModelSelectionCardProps {
+	currentProvider: AIProvider;
+	providerModels: Array<(typeof AVAILABLE_MODELS)[number]>;
+	selectValue: string;
+	customModel: string;
+	isCustomModelActive: boolean;
+	canUseCustomModel: boolean;
+	canAnalyze: boolean;
+	disabled?: boolean;
+	onModelSelect: (modelId: string) => void;
+	onCustomModelChange: (modelName: string) => void;
+	onCancel?: () => void;
+	onAnalyze: () => void;
+}
+
+export const CUSTOM_MODEL_VALUE = "custom";
+
+export function ModelSelectionCard({
+	currentProvider,
+	providerModels,
+	selectValue,
+	customModel,
+	isCustomModelActive,
+	canUseCustomModel,
+	canAnalyze,
+	disabled,
+	onModelSelect,
+	onCustomModelChange,
+	onCancel,
+	onAnalyze,
+}: ModelSelectionCardProps) {
+	return (
+		<Card className="border-border/70 bg-card/95 shadow-sm">
+			<CardContent className="space-y-6">
+				<div className="space-y-3">
+					<div className="space-y-1">
+						<h3 className="font-semibold text-sm">2. Modelo específico</h3>
+						<p className="text-muted-foreground text-xs">
+							Escolha o modelo do provedor selecionado para esta análise.
+						</p>
+					</div>
+
+					<div className="flex flex-col gap-2 lg:flex-row lg:items-center">
+						<div className="flex min-w-0 flex-col gap-2 lg:flex-row">
+							<div className="w-full lg:w-72">
+								{currentProvider === "openrouter" ? (
+									<Input
+										value={customModel}
+										onChange={(event) =>
+											onCustomModelChange(event.target.value)
+										}
+										placeholder="anthropic/claude-opus-4.8-fast"
+										disabled={disabled}
+										className="h-9 w-full border-border/70 bg-background"
+									/>
+								) : (
+									<Select
+										value={selectValue}
+										onValueChange={onModelSelect}
+										disabled={disabled}
+									>
+										<SelectTrigger className="h-9 w-full border-border/70 bg-background">
+											<SelectValue placeholder="Selecione um modelo" />
+										</SelectTrigger>
+										<SelectContent>
+											{providerModels.map((model) => (
+												<SelectItem key={model.id} value={model.id}>
+													{model.name}
+													{model.id === "gpt-5.5" ? " (Recomendado)" : ""}
+												</SelectItem>
+											))}
+											{canUseCustomModel && (
+												<SelectItem value={CUSTOM_MODEL_VALUE}>
+													Modelo customizado
+												</SelectItem>
+											)}
+										</SelectContent>
+									</Select>
+								)}
+							</div>
+
+							{isCustomModelActive && currentProvider === "ollama" && (
+								<div className="w-full lg:w-72">
+									<Input
+										value={customModel}
+										onChange={(event) =>
+											onCustomModelChange(event.target.value)
+										}
+										placeholder="Ex: llama3.2"
+										disabled={disabled}
+										className="h-9 w-full border-border/70 bg-background"
+									/>
+								</div>
+							)}
+						</div>
+
+						<div className="flex min-h-9 shrink-0 items-center text-muted-foreground text-xs lg:max-w-none">
+							{currentProvider === "openrouter" && (
+								<Link
+									href="https://openrouter.ai/models"
+									target="_blank"
+									rel="noopener noreferrer"
+									className="inline-flex items-center gap-1.5 transition-colors hover:text-foreground"
+								>
+									<RiExternalLinkLine className="size-3" />
+									Ver modelos do OpenRouter
+								</Link>
+							)}
+
+							{currentProvider === "ollama" && (
+								<span>
+									O modelo precisa estar instalado na instância Ollama
+									configurada.
+								</span>
+							)}
+						</div>
+					</div>
+				</div>
+
+				<div className="flex items-center justify-between gap-3">
+					<Button
+						disabled={disabled}
+						onClick={onCancel}
+						type="button"
+						variant="outline"
+					>
+						Cancelar
+					</Button>
+					<Button onClick={onAnalyze} disabled={!canAnalyze}>
+						<RiSparklingLine className="size-4" />
+						{disabled ? "Analisando..." : "Gerar insights"}
+					</Button>
+				</div>
+			</CardContent>
+		</Card>
+	);
+}
--- a/src/features/insights/components/model-selector.tsx
+++ b/src/features/insights/components/model-selector.tsx
@@ -1,94 +1,96 @@
 "use client";

-import { RiExternalLinkLine } from "@remixicon/react";
-import Image from "next/image";
 import { useEffect, useMemo, useState } from "react";
 import {
 	type AIProvider,
 	AVAILABLE_MODELS,
 	DEFAULT_PROVIDER,
-	PROVIDERS,
 } from "@/features/insights/constants";
-import { Card } from "@/shared/components/ui/card";
-import { Input } from "@/shared/components/ui/input";
-import { Label } from "@/shared/components/ui/label";
-import { RadioGroup, RadioGroupItem } from "@/shared/components/ui/radio-group";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/shared/components/ui/select";
+import { AnalysisSummaryCard } from "./analysis-summary-card";
+import { CUSTOM_MODEL_VALUE, ModelSelectionCard } from "./model-selection-card";
+import { ProviderSelectionCard } from "./provider-selection-card";

 interface ModelSelectorProps {
 	value: string;
 	onValueChange: (value: string) => void;
+	period: string;
+	onAnalyze: () => void;
+	userInstructions: string;
+	onUserInstructionsChange: (value: string) => void;
+	onCancel?: () => void;
 	disabled?: boolean;
+	isLoadingSavedInsights?: boolean;
 }

-const PROVIDER_ICON_PATHS: Record<
-	AIProvider,
-	{ light: string; dark?: string }
-> = {
-	openai: {
-		light: "/providers/chatgpt.svg",
-		dark: "/providers/chatgpt_dark_mode.svg",
-	},
-	anthropic: {
-		light: "/providers/claude.svg",
-	},
-	google: {
-		light: "/providers/gemini.svg",
-	},
-	openrouter: {
-		light: "/providers/openrouter_light.svg",
-		dark: "/providers/openrouter_dark.svg",
-	},
-};
+const CUSTOM_MODEL_PROVIDERS = ["openrouter", "ollama"] as const;
+
+function isCustomModelProvider(
+	provider: AIProvider,
+): provider is (typeof CUSTOM_MODEL_PROVIDERS)[number] {
+	return CUSTOM_MODEL_PROVIDERS.includes(
+		provider as (typeof CUSTOM_MODEL_PROVIDERS)[number],
+	);
+}
+
+function getProviderFromValue(value: string): AIProvider | null {
+	if (value.startsWith("openrouter:")) {
+		return "openrouter";
+	}
+
+	if (value.startsWith("ollama:")) {
+		return "ollama";
+	}
+
+	if (value.includes("/")) {
+		return "openrouter";
+	}
+
+	return AVAILABLE_MODELS.find((model) => model.id === value)?.provider ?? null;
+}
+
+function stripCustomProviderPrefix(value: string, provider: AIProvider) {
+	if (!isCustomModelProvider(provider)) {
+		return value;
+	}
+
+	return value.startsWith(`${provider}:`)
+		? value.slice(`${provider}:`.length)
+		: value;
+}
+
+function getModelLabel(modelId: string) {
+	const model = AVAILABLE_MODELS.find((item) => item.id === modelId);
+	if (model) return model.name;
+
+	const provider = getProviderFromValue(modelId);
+	return provider ? stripCustomProviderPrefix(modelId, provider) : modelId;
+}

 export function ModelSelector({
 	value,
 	onValueChange,
+	period,
+	onAnalyze,
+	userInstructions,
+	onUserInstructionsChange,
+	onCancel,
 	disabled,
+	isLoadingSavedInsights,
 }: ModelSelectorProps) {
-	// Estado para armazenar o provider selecionado manualmente
-	const [selectedProvider, setSelectedProvider] = useState<AIProvider | null>(
-		null,
-	);
 	const [customModel, setCustomModel] = useState(value);

-	// Sincronizar customModel quando value mudar (importante para pré-carregamento)
 	useEffect(() => {
-		// Se o value tem "/" é um modelo OpenRouter customizado
-		if (value.includes("/")) {
-			setCustomModel(value);
-			setSelectedProvider("openrouter");
-		} else {
-			setCustomModel(value);
-			// Limpar selectedProvider para deixar o useMemo detectar automaticamente
-			setSelectedProvider(null);
+		const detectedProvider = getProviderFromValue(value);
+		if (detectedProvider && isCustomModelProvider(detectedProvider)) {
+			setCustomModel(stripCustomProviderPrefix(value, detectedProvider));
+			return;
 		}
+
+		setCustomModel(value);
 	}, [value]);

-	// Determinar provider atual baseado no modelo selecionado ou provider manual
-	const currentProvider = useMemo(() => {
-		// Se há um provider selecionado manualmente, use-o
-		if (selectedProvider) {
-			return selectedProvider;
-		}
+	const currentProvider = getProviderFromValue(value) ?? DEFAULT_PROVIDER;

-		// Se o modelo tem "/" é OpenRouter
-		if (value.includes("/")) {
-			return "openrouter";
-		}
-
-		// Caso contrário, tente detectar baseado no modelo
-		const model = AVAILABLE_MODELS.find((m) => m.id === value);
-		return model?.provider ?? DEFAULT_PROVIDER;
-	}, [value, selectedProvider]);
-
-	// Agrupar modelos por provider
 	const modelsByProvider = useMemo(() => {
 		const grouped: Record<
 			AIProvider,
@@ -97,7 +99,9 @@ export function ModelSelector({
 			openai: [],
 			anthropic: [],
 			google: [],
+			minimax: [],
 			openrouter: [],
+			ollama: [],
 		};

 		AVAILABLE_MODELS.forEach((model) => {
@@ -107,130 +111,88 @@ export function ModelSelector({
 		return grouped;
 	}, []);

-	// Atualizar provider (seleciona primeiro modelo daquele provider)
-	const handleProviderChange = (newProvider: AIProvider) => {
-		setSelectedProvider(newProvider);
+	const providerModels = modelsByProvider[currentProvider];
+	const selectedModelIsKnown = providerModels.some(
+		(model) => model.id === value,
+	);
+	const selectValue = selectedModelIsKnown ? value : CUSTOM_MODEL_VALUE;
+	const isCustomModelActive =
+		isCustomModelProvider(currentProvider) && !selectedModelIsKnown;
+	const selectedModelLabel = getModelLabel(value);
+	const canAnalyze =
+		!disabled &&
+		!isLoadingSavedInsights &&
+		selectedModelLabel.trim().length > 0;

+	const handleProviderChange = (newProvider: AIProvider) => {
 		if (newProvider === "openrouter") {
-			// Para OpenRouter, usa o modelo customizado ou limpa o valor
-			onValueChange(customModel || "");
+			setCustomModel("");
+			onValueChange("openrouter:");
 			return;
 		}

 		const firstModel = modelsByProvider[newProvider][0];
 		if (firstModel) {
 			onValueChange(firstModel.id);
+			return;
+		}
+
+		if (isCustomModelProvider(newProvider)) {
+			onValueChange(
+				customModel ? `${newProvider}:${customModel}` : `${newProvider}:`,
+			);
 		}
 	};

-	// Atualizar modelo customizado do OpenRouter
+	const handleModelSelect = (modelId: string) => {
+		if (modelId === CUSTOM_MODEL_VALUE) {
+			setCustomModel("");
+			onValueChange(`${currentProvider}:`);
+			return;
+		}
+
+		onValueChange(modelId);
+	};
+
 	const handleCustomModelChange = (modelName: string) => {
 		setCustomModel(modelName);
-		onValueChange(modelName);
+		onValueChange(`${currentProvider}:${modelName}`);
 	};

 	return (
-		<Card className="grid grid-cols-1 lg:grid-cols-[1fr,auto] gap-6 items-start p-6">
-			{/* Descrição */}
-			<div className="space-y-2">
-				<h3 className="text-lg font-semibold">Definir modelo de análise</h3>
-				<p className="text-sm text-muted-foreground leading-relaxed">
-					Escolha o provedor de IA e o modelo específico que será utilizado para
-					gerar insights sobre seus dados financeiros. <br />
-					Diferentes modelos podem oferecer perspectivas variadas na análise.
-				</p>
-			</div>
-
-			{/* Seletor */}
-			<div className="flex flex-col gap-4 min-w-xs">
-				<RadioGroup
-					value={currentProvider}
-					onValueChange={(v) => handleProviderChange(v as AIProvider)}
-					disabled={disabled}
-					className="gap-3"
-				>
-					{(Object.keys(PROVIDERS) as AIProvider[]).map((providerId) => {
-						const provider = PROVIDERS[providerId];
-						const iconPaths = PROVIDER_ICON_PATHS[providerId];
-
-						return (
-							<div key={providerId} className="flex items-center gap-3">
-								<RadioGroupItem
-									value={providerId}
-									id={`provider-${providerId}`}
-									disabled={disabled}
-								/>
-								<div className="size-6 relative">
-									<Image
-										src={iconPaths.light}
-										alt={provider.name}
-										width={22}
-										height={22}
-										className={iconPaths.dark ? "dark:hidden" : ""}
-									/>
-									{iconPaths.dark && (
-										<Image
-											src={iconPaths.dark}
-											alt={provider.name}
-											width={22}
-											height={22}
-											className="hidden dark:block"
-										/>
-									)}
-								</div>
-								<Label
-									htmlFor={`provider-${providerId}`}
-									className="text-sm font-medium cursor-pointer flex-1"
-								>
-									{provider.name}
-								</Label>
-							</div>
-						);
-					})}
-				</RadioGroup>
-
-				{/* Seletor de Modelo */}
-				{currentProvider === "openrouter" ? (
-					<div className="space-y-2">
-						<Input
-							value={customModel}
-							onChange={(e) => handleCustomModelChange(e.target.value)}
-							placeholder="Ex: anthropic/claude-3.5-sonnet"
-							disabled={disabled}
-							className="border-none bg-neutral-200 dark:bg-neutral-800"
-						/>
-						<a
-							href="https://openrouter.ai/models"
-							target="_blank"
-							rel="noopener noreferrer"
-							className="flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors"
-						>
-							<RiExternalLinkLine className="h-3 w-3" />
-							Ver modelos disponíveis no OpenRouter
-						</a>
-					</div>
-				) : (
-					<Select
-						value={value}
-						onValueChange={onValueChange}
+		<section className="space-y-4">
+			<div className="grid items-stretch gap-4 xl:grid-cols-[minmax(0,1fr)_340px]">
+				<div className="space-y-4">
+					<ProviderSelectionCard
+						currentProvider={currentProvider}
 						disabled={disabled}
-					>
-						<SelectTrigger
-							disabled={disabled}
-							className="border-none bg-neutral-200 dark:bg-neutral-800"
-						>
-							<SelectValue placeholder="Selecione um modelo" />
-						</SelectTrigger>
-						<SelectContent>
-							{modelsByProvider[currentProvider].map((model) => (
-								<SelectItem key={model.id} value={model.id}>
-									{model.name}
-								</SelectItem>
-							))}
-						</SelectContent>
-					</Select>
-				)}
+						onProviderChange={handleProviderChange}
+					/>
+
+					<ModelSelectionCard
+						currentProvider={currentProvider}
+						providerModels={providerModels}
+						selectValue={selectValue}
+						customModel={customModel}
+						isCustomModelActive={isCustomModelActive}
+						canUseCustomModel={isCustomModelProvider(currentProvider)}
+						canAnalyze={canAnalyze}
+						disabled={disabled}
+						onModelSelect={handleModelSelect}
+						onCustomModelChange={handleCustomModelChange}
+						onCancel={onCancel}
+						onAnalyze={onAnalyze}
+					/>
+				</div>
+
+				<AnalysisSummaryCard
+					period={period}
+					currentProvider={currentProvider}
+					selectedModelLabel={selectedModelLabel}
+					userInstructions={userInstructions}
+					onUserInstructionsChange={onUserInstructionsChange}
+				/>
 			</div>
-		</Card>
+		</section>
 	);
 }
--- a/src/features/insights/components/provider-icon.tsx
+++ b/src/features/insights/components/provider-icon.tsx
@@ -0,0 +1,59 @@
+import Image from "next/image";
+import { type AIProvider, PROVIDERS } from "@/features/insights/constants";
+
+const PROVIDER_ICON_PATHS: Partial<
+	Record<
+		AIProvider,
+		{ light: string; dark?: string; width?: number; height?: number }
+	>
+> = {
+	openai: {
+		light: "/providers/chatgpt.svg",
+		dark: "/providers/chatgpt_dark_mode.svg",
+	},
+	anthropic: {
+		light: "/providers/claude.svg",
+	},
+	google: {
+		light: "/providers/gemini.svg",
+	},
+	minimax: {
+		light: "/providers/minimax.svg",
+	},
+	openrouter: {
+		light: "/providers/openrouter_light.svg",
+		dark: "/providers/openrouter_dark.svg",
+	},
+	ollama: {
+		light: "/providers/ollama_light.svg",
+		dark: "/providers/ollama_dark.svg",
+		width: 17,
+		height: 22,
+	},
+};
+
+export function ProviderIcon({ provider }: { provider: AIProvider }) {
+	const iconPaths = PROVIDER_ICON_PATHS[provider];
+	if (!iconPaths) return null;
+
+	return (
+		<div className="relative flex size-10 items-center justify-center">
+			<Image
+				src={iconPaths.light}
+				alt={PROVIDERS[provider].name}
+				width={iconPaths.width ?? 32}
+				height={iconPaths.height ?? 32}
+				className={iconPaths.dark ? "dark:hidden" : ""}
+			/>
+			{iconPaths.dark && (
+				<Image
+					src={iconPaths.dark}
+					alt={PROVIDERS[provider].name}
+					width={iconPaths.width ?? 32}
+					height={iconPaths.height ?? 32}
+					className="hidden dark:block"
+				/>
+			)}
+		</div>
+	);
+}
--- a/src/features/insights/components/provider-selection-card.tsx
+++ b/src/features/insights/components/provider-selection-card.tsx
@@ -0,0 +1,109 @@
+import { RiCheckLine } from "@remixicon/react";
+import { type AIProvider, PROVIDERS } from "@/features/insights/constants";
+import { Card, CardContent } from "@/shared/components/ui/card";
+import { cn } from "@/shared/utils/ui";
+import { ProviderIcon } from "./provider-icon";
+
+const PROVIDER_DETAILS: Record<AIProvider, { description: string }> = {
+	openai: {
+		description: "Qualidade e equilíbrio entre análise e custo.",
+	},
+	anthropic: {
+		description: "Forte em raciocínio e análises profundas.",
+	},
+	google: {
+		description: "Ideal para integração e velocidade.",
+	},
+	minimax: {
+		description: "Eficiente para grandes volumes de dados.",
+	},
+	openrouter: {
+		description: "Acesso a múltiplos modelos via API.",
+	},
+	ollama: {
+		description: "Execução local com privacidade total.",
+	},
+};
+
+interface ProviderSelectionCardProps {
+	currentProvider: AIProvider;
+	disabled?: boolean;
+	onProviderChange: (provider: AIProvider) => void;
+}
+
+export function ProviderSelectionCard({
+	currentProvider,
+	disabled,
+	onProviderChange,
+}: ProviderSelectionCardProps) {
+	return (
+		<Card className="border-border/70 bg-card/95 shadow-sm">
+			<CardContent className="space-y-6">
+				<div className="space-y-2">
+					<h2 className="font-semibold text-2xl tracking-tight">
+						Definir modelo de análise
+					</h2>
+					<p className="max-w-2xl text-muted-foreground text-sm leading-relaxed">
+						Escolha o provedor de IA e o modelo específico que serão usados para
+						gerar insights sobre seus dados financeiros. Diferentes modelos
+						podem oferecer perspectivas variadas na análise.
+					</p>
+				</div>
+
+				<div className="space-y-3">
+					<div className="space-y-1">
+						<h3 className="font-semibold text-sm">1. Provedor de IA</h3>
+						<p className="text-muted-foreground text-xs">
+							Selecione o provedor que melhor atende às suas necessidades.
+						</p>
+					</div>
+
+					<div className="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
+						{(Object.keys(PROVIDERS) as AIProvider[]).map((providerId) => {
+							const provider = PROVIDERS[providerId];
+							const details = PROVIDER_DETAILS[providerId];
+							const isSelected = currentProvider === providerId;
+
+							return (
+								<button
+									type="button"
+									key={providerId}
+									onClick={() => onProviderChange(providerId)}
+									disabled={disabled}
+									className={cn(
+										"group relative rounded-2xl border p-4 text-left transition-all hover:border-primary/60 hover:bg-primary/5 disabled:cursor-not-allowed disabled:opacity-70",
+										isSelected &&
+											"border-primary bg-primary/10 shadow-sm ring-1 ring-primary/20",
+									)}
+								>
+									<div className="flex items-start gap-3">
+										<div
+											className={cn(
+												"mt-1 flex size-4 shrink-0 items-center justify-center rounded-full border text-transparent transition-colors",
+												isSelected &&
+													"border-primary bg-primary text-primary-foreground",
+											)}
+										>
+											<RiCheckLine className="size-3" />
+										</div>
+
+										<ProviderIcon provider={providerId} />
+
+										<div className="min-w-0 flex-1 space-y-2">
+											<span className="font-semibold text-sm leading-none">
+												{provider.name}
+											</span>
+											<p className="text-muted-foreground text-xs leading-relaxed">
+												{details.description}
+											</p>
+										</div>
+									</div>
+								</button>
+							);
+						})}
+					</div>
+				</div>
+			</CardContent>
+		</Card>
+	);
+}
--- a/src/features/insights/constants.ts
+++ b/src/features/insights/constants.ts
@@ -1,7 +1,13 @@
 /**
 * Tipos de providers disponíveis
 */
-export type AIProvider = "openai" | "anthropic" | "google" | "openrouter";
+export type AIProvider =
+	| "openai"
+	| "anthropic"
+	| "google"
+	| "minimax"
+	| "openrouter"
+	| "ollama";

 /**
 * Metadados dos providers
@@ -10,22 +16,26 @@ export const PROVIDERS = {
 	openai: {
 		id: "openai" as const,
 		name: "ChatGPT",
-		icon: "RiOpenaiLine",
 	},
 	anthropic: {
 		id: "anthropic" as const,
 		name: "Claude AI",
-		icon: "RiRobot2Line",
 	},
 	google: {
 		id: "google" as const,
 		name: "Gemini",
-		icon: "RiGoogleLine",
+	},
+	minimax: {
+		id: "minimax" as const,
+		name: "MiniMax",
 	},
 	openrouter: {
 		id: "openrouter" as const,
 		name: "OpenRouter",
-		icon: "RiRouterLine",
+	},
+	ollama: {
+		id: "ollama" as const,
+		name: "Ollama",
 	},
 } as const;

@@ -42,8 +52,8 @@ export const AVAILABLE_MODELS = [

 	// Anthropic
 	{
-		id: "claude-opus-4-7",
-		name: "Claude Opus 4.7",
+		id: "claude-opus-4-8",
+		name: "Claude Opus 4.8",
 		provider: "anthropic" as const,
 	},
 	{
@@ -73,6 +83,49 @@ export const AVAILABLE_MODELS = [
 		name: "Gemini 3.1 Flash Lite",
 		provider: "google" as const,
 	},
+
+	// MiniMax
+	{
+		id: "MiniMax-M2.7",
+		name: "MiniMax M2.7",
+		provider: "minimax" as const,
+	},
+	{
+		id: "MiniMax-M2.7-highspeed",
+		name: "MiniMax M2.7 Highspeed",
+		provider: "minimax" as const,
+	},
+	{
+		id: "MiniMax-M2.5",
+		name: "MiniMax M2.5",
+		provider: "minimax" as const,
+	},
+	{
+		id: "MiniMax-M2.5-highspeed",
+		name: "MiniMax M2.5 Highspeed",
+		provider: "minimax" as const,
+	},
+	{
+		id: "MiniMax-M2.1",
+		name: "MiniMax M2.1",
+		provider: "minimax" as const,
+	},
+	{
+		id: "MiniMax-M2.1-highspeed",
+		name: "MiniMax M2.1 Highspeed",
+		provider: "minimax" as const,
+	},
+	{
+		id: "MiniMax-M2",
+		name: "MiniMax M2",
+		provider: "minimax" as const,
+	},
+
+	// Ollama
+	{ id: "ollama:llama3.2", name: "Llama 3.2", provider: "ollama" as const },
+	{ id: "ollama:llama3.1", name: "Llama 3.1", provider: "ollama" as const },
+	{ id: "ollama:qwen2.5", name: "Qwen 2.5", provider: "ollama" as const },
+	{ id: "ollama:mistral", name: "Mistral", provider: "ollama" as const },
 ] as const;

 export const DEFAULT_MODEL = "gpt-5.5";
--- a/src/features/insights/lib/model-provider.ts
+++ b/src/features/insights/lib/model-provider.ts
@@ -0,0 +1,109 @@
+import { anthropic } from "@ai-sdk/anthropic";
+import { google } from "@ai-sdk/google";
+import { openai } from "@ai-sdk/openai";
+import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
+import { createOpenRouter } from "@openrouter/ai-sdk-provider";
+import type { LanguageModel } from "ai";
+import { minimax } from "vercel-minimax-ai-provider";
+import { AVAILABLE_MODELS } from "../constants";
+
+const OPENROUTER_MODEL_REGEX = /^[a-zA-Z0-9_-]+\/[a-zA-Z0-9._:-]+$/;
+
+type ResolveInsightsModelResult =
+	| { success: true; model: LanguageModel }
+	| { success: false; error: string };
+
+function stripProviderPrefix(
+	modelId: string,
+	provider: "openrouter" | "ollama",
+) {
+	return modelId.startsWith(`${provider}:`)
+		? modelId.slice(`${provider}:`.length).trim()
+		: modelId.trim();
+}
+
+export function resolveInsightsModel(
+	modelId: string,
+): ResolveInsightsModelResult {
+	const normalizedModelId = modelId.trim();
+	const selectedModel = AVAILABLE_MODELS.find(
+		(m) => m.id === normalizedModelId,
+	);
+	const isOpenRouterModel =
+		normalizedModelId.startsWith("openrouter:") ||
+		(!selectedModel && OPENROUTER_MODEL_REGEX.test(normalizedModelId));
+	const isOllamaModel = normalizedModelId.startsWith("ollama:");
+
+	if (!selectedModel && !isOpenRouterModel && !isOllamaModel) {
+		return {
+			success: false,
+			error: "Modelo inválido.",
+		};
+	}
+
+	if (isOpenRouterModel) {
+		const apiKey = process.env.OPENROUTER_API_KEY;
+		if (!apiKey) {
+			return {
+				success: false,
+				error:
+					"OPENROUTER_API_KEY não configurada. Adicione a chave no arquivo .env",
+			};
+		}
+
+		const openrouterModelId = stripProviderPrefix(
+			normalizedModelId,
+			"openrouter",
+		);
+
+		if (!openrouterModelId) {
+			return {
+				success: false,
+				error: "Informe um modelo válido do OpenRouter.",
+			};
+		}
+
+		const openrouter = createOpenRouter({ apiKey });
+		return { success: true, model: openrouter.chat(openrouterModelId) };
+	}
+
+	if (isOllamaModel || selectedModel?.provider === "ollama") {
+		const ollamaModelId = stripProviderPrefix(normalizedModelId, "ollama");
+		if (!ollamaModelId) {
+			return {
+				success: false,
+				error: "Informe um modelo válido do Ollama.",
+			};
+		}
+
+		const ollama = createOpenAICompatible({
+			name: "ollama",
+			baseURL: process.env.OLLAMA_BASE_URL ?? "http://localhost:11434/v1",
+			apiKey: process.env.OLLAMA_API_KEY || "ollama",
+			supportsStructuredOutputs: false,
+		});
+
+		return { success: true, model: ollama.chatModel(ollamaModelId) };
+	}
+
+	if (selectedModel?.provider === "openai") {
+		return { success: true, model: openai(normalizedModelId) };
+	}
+
+	if (selectedModel?.provider === "anthropic") {
+		return { success: true, model: anthropic(normalizedModelId) };
+	}
+
+	if (selectedModel?.provider === "google") {
+		return { success: true, model: google(normalizedModelId) };
+	}
+
+	if (selectedModel?.provider === "minimax") {
+		return { success: true, model: minimax(normalizedModelId) };
+	}
+
+	return {
+		success: false,
+		error: "Provider de modelo não suportado.",
+	};
+}
--- a/src/features/insights/lib/user-instructions.ts
+++ b/src/features/insights/lib/user-instructions.ts
@@ -0,0 +1 @@
+export const USER_INSTRUCTIONS_MAX_LENGTH = 1000;
--- a/src/features/landing/components/mobile-nav.tsx
+++ b/src/features/landing/components/mobile-nav.tsx
@@ -23,9 +23,14 @@ const navLinks = [
 interface MobileNavProps {
 	isPublicDomain: boolean;
 	isLoggedIn: boolean;
+	signupDisabled: boolean;
 }

-export function MobileNav({ isPublicDomain, isLoggedIn }: MobileNavProps) {
+export function MobileNav({
+	isPublicDomain,
+	isLoggedIn,
+	signupDisabled,
+}: MobileNavProps) {
 	const [open, setOpen] = useState(false);

 	return (
@@ -75,12 +80,14 @@ export function MobileNav({ isPublicDomain, isLoggedIn }: MobileNavProps) {
 											Entrar
 										</Button>
 									</Link>
-									<Link href="/signup" onClick={() => setOpen(false)}>
-										<Button className="w-full gap-2">
-											Começar
-											<RiArrowRightSLine size={16} />
-										</Button>
-									</Link>
+									{!signupDisabled && (
+										<Link href="/signup" onClick={() => setOpen(false)}>
+											<Button className="w-full gap-2">
+												Começar
+												<RiArrowRightSLine size={16} />
+											</Button>
+										</Link>
+									)}
 								</>
 							)}
 						</div>
--- a/src/features/payers/lib/build-readonly-option-sets.ts
+++ b/src/features/payers/lib/build-readonly-option-sets.ts
@@ -50,7 +50,9 @@ export function buildReadOnlyOptionSets(
 			categoriaOptionsMap.set(item.categoryId, {
 				value: item.categoryId,
 				label: normalizeOptionLabel(item.categoriaName, "Category"),
+				group: item.categoriaType,
 				slug: item.categoryId,
+				icon: item.categoriaIcon,
 			});
 		}
 	});
@@ -67,6 +69,8 @@ export function buildReadOnlyOptionSets(
 		(option) => ({
 			slug: option.value,
 			label: option.label,
+			type: option.group,
+			icon: option.icon,
 		}),
 	);

--- a/src/features/reports/components/category-report-filters.tsx
+++ b/src/features/reports/components/category-report-filters.tsx
@@ -31,8 +31,12 @@ import {
 	getCurrentPeriod,
 	periodToDate,
 } from "@/shared/utils/period";
+import { slugify } from "@/shared/utils/string";
 import type { CategoryReportFiltersProps } from "./types";

+const getCategorySearchValue = (name: string, id: string) =>
+	`${name} ${slugify(name)} ${id}`;
+
 /**
 * Category Report Filters Component
 * Provides filters for categories selection and date range
@@ -53,7 +57,14 @@ export function CategoryReportFilters({
 	const filteredCategories = useMemo(() => {
 		if (!searchValue) return categories;
 		const search = searchValue.toLowerCase();
-		return categories.filter((cat) => cat.name.toLowerCase().includes(search));
+		const normalizedSearch = slugify(searchValue);
+		return categories.filter((cat) => {
+			const categorySearchValue = getCategorySearchValue(cat.name, cat.id);
+			return (
+				categorySearchValue.toLowerCase().includes(search) ||
+				categorySearchValue.includes(normalizedSearch)
+			);
+		});
 	}, [categories, searchValue]);

 	// Get selected categories for display
@@ -76,15 +87,6 @@ export function CategoryReportFilters({
 		});
 	};

-	// Handle select all
-	const handleSelectAll = () => {
-		onFiltersChange({
-			...filters,
-			selectedCategories: categories.map((cat) => cat.id),
-		});
-		setOpen(false);
-	};
-
 	// Handle clear all
 	const handleClearAll = () => {
 		onFiltersChange({
@@ -130,11 +132,9 @@ export function CategoryReportFilters({
 	const selectedText =
 		selectedCategories.length === 0
 			? "Categoria"
-			: selectedCategories.length === categories.length
-				? "Todas"
-				: selectedCategories.length === 1
-					? selectedCategories[0].name
-					: `${selectedCategories.length} selecionadas`;
+			: selectedCategories.length === 1
+				? selectedCategories[0].name
+				: `${selectedCategories.length} selecionadas`;

 	return (
 		<div className="flex flex-col gap-4">
@@ -168,25 +168,18 @@ export function CategoryReportFilters({
 								<CommandList>
 									<CommandEmpty>Nenhuma categoria encontrada.</CommandEmpty>
 									<CommandGroup>
-										{/* Select All / Clear All */}
-										<div className="flex gap-1 p-2 border-b">
-											<Button
-												variant="ghost"
-												size="sm"
-												className="h-7 text-xs flex-1"
-												onClick={handleSelectAll}
-											>
-												Todas
-											</Button>
-											<Button
-												variant="ghost"
-												size="sm"
-												className="h-7 text-xs flex-1"
-												onClick={handleClearAll}
-											>
-												Limpar
-											</Button>
-										</div>
+										{filters.selectedCategories.length > 0 ? (
+											<div className="p-2 border-b">
+												<Button
+													variant="ghost"
+													size="sm"
+													className="h-7 w-full text-xs"
+													onClick={handleClearAll}
+												>
+													Limpar seleção
+												</Button>
+											</div>
+										) : null}

 										{/* Category List */}
 										{filteredCategories.map((category) => {
@@ -200,7 +193,10 @@ export function CategoryReportFilters({
 											return (
 												<CommandItem
 													key={category.id}
-													value={category.id}
+													value={getCategorySearchValue(
+														category.name,
+														category.id,
+													)}
 													onSelect={() => handleCategoryToggle(category.id)}
 													className="cursor-pointer"
 												>
--- a/src/features/reports/components/category-table.tsx
+++ b/src/features/reports/components/category-table.tsx
@@ -5,7 +5,6 @@ import Link from "next/link";
 import { useMemo } from "react";
 import { formatPeriodLabel } from "@/features/reports/lib/utils";
 import { CategoryIconBadge } from "@/shared/components/entity-avatar";
-import StatusDot from "@/shared/components/feedback/status-dot";
 import { Card } from "@/shared/components/ui/card";
 import {
 	Table,
@@ -37,6 +36,13 @@ export function CategoryTable({
 	categories,
 	periods,
 }: CategoryTableProps) {
+	const categoryColumnLabel =
+		title === "Despesas"
+			? "Categoria Despesa"
+			: title === "Receitas"
+				? "Categoria Receita"
+				: "Categoria";
+
 	// Calculate section totals
 	const sectionTotals = useMemo(() => {
 		const totalsMap = new Map<string, number>();
@@ -73,7 +79,7 @@ export function CategoryTable({
 				<TableHeader>
 					<TableRow>
 						<TableHead className="w-[240px] min-w-[240px] font-medium">
-							Categoria
+							{categoryColumnLabel}
 						</TableHead>
 						{periods.map((period) => (
 							<TableHead
@@ -114,14 +120,6 @@ export function CategoryTable({
 							<TableRow key={category.categoryId}>
 								<TableCell>
 									<div className="flex items-center gap-2">
-										<StatusDot
-											color={
-												category.type === "receita"
-													? "bg-success"
-													: "bg-destructive"
-											}
-										/>
-
 										<CategoryIconBadge
 											icon={category.icon}
 											name={category.name}
--- a/src/features/settings/components/delete-account-form.tsx
+++ b/src/features/settings/components/delete-account-form.tsx
@@ -169,7 +169,7 @@ export function DeleteAccountForm() {
 				>
 					<DialogHeader>
 						<DialogTitle>
-							{isResetAction ? "Zerar sua conta?" : "Você tem certeza?"}
+							{isResetAction ? "ZERAR sua conta?" : "Você tem certeza?"}
 						</DialogTitle>
 						<DialogDescription>
 							{isResetAction
--- a/src/features/transactions/actions/anticipation.ts
+++ b/src/features/transactions/actions/anticipation.ts
@@ -26,6 +26,7 @@ import type {
 import { uuidSchema } from "@/shared/lib/schemas/common";
 import type { ActionResult } from "@/shared/lib/types/actions";
 import { formatDecimalForDbRequired } from "@/shared/utils/currency";
+import { comparePeriods } from "@/shared/utils/period";

 /**
 * Schema de validação para criar antecipação
@@ -63,14 +64,18 @@ const cancelAnticipationSchema = z.object({
 */
 export async function getEligibleInstallmentsAction(
 	seriesId: string,
+	anticipationPeriod: string,
 ): Promise<ActionResult<EligibleInstallment[]>> {
 	try {
 		const user = await getUser();

 		// Validar seriesId
 		const validatedSeriesId = uuidSchema("Série").parse(seriesId);
+		const validatedAnticipationPeriod =
+			createAnticipationSchema.shape.anticipationPeriod.parse(
+				anticipationPeriod,
+			);

-		// Buscar todas as parcelas da série que estão elegíveis
 		const rows = await db.query.transactions.findMany({
 			where: and(
 				eq(transactions.seriesId, validatedSeriesId),
@@ -96,19 +101,23 @@ export async function getEligibleInstallmentsAction(
 			},
 		});

-		const eligibleInstallments: EligibleInstallment[] = rows.map((row) => ({
-			id: row.id,
-			name: row.name,
-			amount: row.amount,
-			period: row.period,
-			purchaseDate: row.purchaseDate,
-			dueDate: row.dueDate,
-			currentInstallment: row.currentInstallment,
-			installmentCount: row.installmentCount,
-			paymentMethod: row.paymentMethod,
-			categoryId: row.categoryId,
-			payerId: row.payerId,
-		}));
+		const eligibleInstallments: EligibleInstallment[] = rows
+			.filter(
+				(row) => comparePeriods(row.period, validatedAnticipationPeriod) > 0,
+			)
+			.map((row) => ({
+				id: row.id,
+				name: row.name,
+				amount: row.amount,
+				period: row.period,
+				purchaseDate: row.purchaseDate,
+				dueDate: row.dueDate,
+				currentInstallment: row.currentInstallment,
+				installmentCount: row.installmentCount,
+				paymentMethod: row.paymentMethod,
+				categoryId: row.categoryId,
+				payerId: row.payerId,
+			}));

 		return {
 			success: true,
@@ -195,6 +204,18 @@ export async function createInstallmentAnticipationAction(
 			};
 		}

+		const selectedIncludesCurrentOrPastPeriod = installments.some(
+			(installment) =>
+				comparePeriods(installment.period, data.anticipationPeriod) <= 0,
+		);
+
+		if (selectedIncludesCurrentOrPastPeriod) {
+			return {
+				success: false,
+				error: "Selecione apenas parcelas de períodos futuros para antecipar.",
+			};
+		}
+
 		// 2. Calcular valor total
 		const totalAmountCents = installments.reduce(
 			(sum, inst) => sum + Number(inst.amount) * 100,
--- a/src/features/transactions/actions/bulk-actions.ts
+++ b/src/features/transactions/actions/bulk-actions.ts
@@ -7,6 +7,7 @@ import {
 	TRANSACTION_CONDITIONS,
 	TRANSACTION_TYPES,
 } from "@/features/transactions/lib/constants";
+import { ACCOUNT_AUTO_INVOICE_NOTE_PREFIX } from "@/shared/lib/accounts/constants";
 import { handleActionError } from "@/shared/lib/actions/helpers";
 import { getUser } from "@/shared/lib/auth/server";
 import { db } from "@/shared/lib/db";
@@ -30,6 +31,7 @@ import {
 	fetchOwnedPayerIds,
 	formatPaidInvoicePeriods,
 	getPaidInvoicePeriods,
+	isInitialBalanceTransaction,
 	type MassAddInput,
 	massAddSchema,
 	resolvePeriod,
@@ -47,6 +49,19 @@ const getPeriodOffset = (basePeriod: string, targetPeriod: string) => {
 	return (target.year - base.year) * 12 + (target.month - base.month);
 };

+type ProtectedTransactionCandidate = {
+	note: string | null;
+	transactionType: string | null;
+	condition: string | null;
+	paymentMethod: string | null;
+};
+
+const isProtectedTransaction = (
+	record: ProtectedTransactionCandidate,
+): boolean =>
+	Boolean(record.note?.startsWith(ACCOUNT_AUTO_INVOICE_NOTE_PREFIX)) ||
+	isInitialBalanceTransaction(record);
+
 export async function deleteTransactionBulkAction(
 	input: DeleteBulkInput,
 ): Promise<ActionResult> {
@@ -61,6 +76,9 @@ export async function deleteTransactionBulkAction(
 				seriesId: true,
 				period: true,
 				condition: true,
+				transactionType: true,
+				paymentMethod: true,
+				note: true,
 			},
 			where: and(
 				eq(transactions.id, data.id),
@@ -79,6 +97,13 @@ export async function deleteTransactionBulkAction(
 			};
 		}

+		if (isProtectedTransaction(existing)) {
+			return {
+				success: false,
+				error: "Lançamentos protegidos não podem ser removidos em massa.",
+			};
+		}
+
 		let scopeFilter: ReturnType<typeof and>;
 		let successMessage: string;

@@ -171,6 +196,7 @@ export async function updateTransactionBulkAction(
 				purchaseDate: true,
 				payerId: true,
 				cardId: true,
+				note: true,
 			},
 			where: and(
 				eq(transactions.id, data.id),
@@ -189,6 +215,13 @@ export async function updateTransactionBulkAction(
 			};
 		}

+		if (isProtectedTransaction(existing)) {
+			return {
+				success: false,
+				error: "Lançamentos protegidos não podem ser atualizados em massa.",
+			};
+		}
+
 		const baseUpdatePayload: Record<string, unknown> = {
 			name: data.name,
 			categoryId: data.categoryId ?? null,
@@ -753,6 +786,13 @@ export async function deleteMultipleTransactionsAction(
 			return { success: false, error: "Nenhum lançamento encontrado." };
 		}

+		if (existing.some(isProtectedTransaction)) {
+			return {
+				success: false,
+				error: "Lançamentos protegidos não podem ser removidos em massa.",
+			};
+		}
+
 		const linkedAttachments = await db
 			.select({ id: attachments.id, fileKey: attachments.fileKey })
 			.from(transactionAttachments)
--- a/src/features/transactions/actions/core.ts
+++ b/src/features/transactions/actions/core.ts
@@ -155,14 +155,20 @@ export async function validateAllOwnership(
 	fields: {
 		payerId?: string | null;
 		secondaryPayerId?: string | null;
+		splitPayerIds?: Array<string | null | undefined>;
 		categoryId?: string | null;
 		accountId?: string | null;
 		cardId?: string | null;
 	},
 ): Promise<string | null> {
+	const payerIds = [
+		fields.payerId,
+		fields.secondaryPayerId,
+		...(fields.splitPayerIds ?? []),
+	];
 	const [ownedPayerIds, ownedCategoryIds, ownedAccountIds, ownedCardIds] =
 		await Promise.all([
-			fetchOwnedPayerIds(userId, [fields.payerId, fields.secondaryPayerId]),
+			fetchOwnedPayerIds(userId, payerIds),
 			fetchOwnedCategoryIds(userId, [fields.categoryId]),
 			fetchOwnedAccountIds(userId, [fields.accountId]),
 			fetchOwnedCardIds(userId, [fields.cardId]),
@@ -171,6 +177,7 @@ export async function validateAllOwnership(
 	const checks = [
 		!fields.payerId || ownedPayerIds.has(fields.payerId),
 		!fields.secondaryPayerId || ownedPayerIds.has(fields.secondaryPayerId),
+		(fields.splitPayerIds ?? []).every((id) => !id || ownedPayerIds.has(id)),
 		!fields.categoryId || ownedCategoryIds.has(fields.categoryId),
 		!fields.accountId || ownedAccountIds.has(fields.accountId),
 		!fields.cardId || ownedCardIds.has(fields.cardId),
@@ -178,7 +185,8 @@ export async function validateAllOwnership(

 	const errors = [
 		"Pessoa não encontrada ou sem permissão.",
-		"Pessoa secundário não encontrado ou sem permissão.",
+		"Pessoa secundária não encontrada ou sem permissão.",
+		"Uma das pessoas selecionadas não foi encontrada ou está sem permissão.",
 		"Categoria não encontrada.",
 		"Conta não encontrada.",
 		"Cartão não encontrado.",
@@ -322,6 +330,14 @@ const baseFields = z.object({
 	}),
 	payerId: uuidSchema("Payer").nullable().optional(),
 	secondaryPayerId: uuidSchema("Payer secundário").optional(),
+	splitShares: z
+		.array(
+			z.object({
+				payerId: uuidSchema("Pessoa"),
+				amount: z.coerce.number().min(0.01, "Informe um valor maior que zero."),
+			}),
+		)
+		.optional(),
 	isSplit: z.boolean().optional().default(false),
 	primarySplitAmount: z.coerce.number().min(0).optional(),
 	secondarySplitAmount: z.coerce.number().min(0).optional(),
@@ -335,6 +351,12 @@ const baseFields = z.object({
 		.min(1, "Selecione uma quantidade válida.")
 		.max(60, "Selecione uma quantidade válida.")
 		.optional(),
+	startInstallment: z.coerce
+		.number()
+		.int()
+		.min(1, "Selecione uma parcela válida.")
+		.max(60, "Selecione uma parcela válida.")
+		.optional(),
 	recurrenceCount: z.coerce
 		.number()
 		.int()
@@ -415,10 +437,21 @@ const refineLancamento = (
 				path: ["installmentCount"],
 				message: "Selecione pelo menos duas parcelas.",
 			});
+		} else if (
+			data.startInstallment &&
+			data.startInstallment > data.installmentCount
+		) {
+			ctx.addIssue({
+				code: z.ZodIssueCode.custom,
+				path: ["startInstallment"],
+				message: "A parcela inicial não pode ser maior que o total.",
+			});
 		}
 	}

 	if (data.isSplit) {
+		const shares = resolveSplitShares(data);
+
 		if (!data.payerId) {
 			ctx.addIssue({
 				code: z.ZodIssueCode.custom,
@@ -427,30 +460,38 @@ const refineLancamento = (
 			});
 		}

-		if (!data.secondaryPayerId) {
+		if (shares.length < 2) {
 			ctx.addIssue({
 				code: z.ZodIssueCode.custom,
-				path: ["secondaryPayerId"],
-				message: "Selecione a pessoa secundário para dividir o lançamento.",
-			});
-		} else if (data.payerId && data.secondaryPayerId === data.payerId) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				path: ["secondaryPayerId"],
-				message: "Escolha uma pessoa diferente para dividir o lançamento.",
+				path: ["splitShares"],
+				message: "Selecione pelo menos uma pessoa para dividir o lançamento.",
 			});
 		}

-		if (
-			data.primarySplitAmount !== undefined &&
-			data.secondarySplitAmount !== undefined
-		) {
-			const sum = data.primarySplitAmount + data.secondarySplitAmount;
+		const uniquePayerIds = new Set(shares.map((share) => share.payerId));
+		if (uniquePayerIds.size !== shares.length) {
+			ctx.addIssue({
+				code: z.ZodIssueCode.custom,
+				path: ["splitShares"],
+				message: "Escolha pessoas diferentes para dividir o lançamento.",
+			});
+		}
+
+		if (shares.some((share) => share.amount <= 0)) {
+			ctx.addIssue({
+				code: z.ZodIssueCode.custom,
+				path: ["splitShares"],
+				message: "Informe um valor maior que zero para cada pessoa.",
+			});
+		}
+
+		if (shares.length > 0) {
+			const sum = shares.reduce((total, share) => total + share.amount, 0);
 			const total = Math.abs(data.amount);
 			if (Math.abs(sum - total) > 0.01) {
 				ctx.addIssue({
 					code: z.ZodIssueCode.custom,
-					path: ["primarySplitAmount"],
+					path: ["splitShares"],
 					message: "A soma das divisões deve ser igual ao valor total.",
 				});
 			}
@@ -546,11 +587,41 @@ type Share = {
 	amountCents: number;
 };

+type SplitShareInput = {
+	payerId: string;
+	amount: number;
+};
+
+export const resolveSplitShares = (data: {
+	payerId?: string | null;
+	secondaryPayerId?: string | null;
+	splitShares?: SplitShareInput[];
+	primarySplitAmount?: number;
+	secondarySplitAmount?: number;
+}): SplitShareInput[] => {
+	if (data.splitShares && data.splitShares.length > 0) {
+		return data.splitShares;
+	}
+
+	if (!data.payerId || !data.secondaryPayerId) {
+		return [];
+	}
+
+	return [
+		{ payerId: data.payerId, amount: data.primarySplitAmount ?? 0 },
+		{
+			payerId: data.secondaryPayerId,
+			amount: data.secondarySplitAmount ?? 0,
+		},
+	];
+};
+
 export const buildShares = ({
 	totalCents,
 	payerId,
 	isSplit,
 	secondaryPayerId,
+	splitShares,
 	primarySplitAmountCents,
 	secondarySplitAmountCents,
 }: {
@@ -558,10 +629,18 @@ export const buildShares = ({
 	payerId: string | null;
 	isSplit: boolean;
 	secondaryPayerId?: string;
+	splitShares?: SplitShareInput[];
 	primarySplitAmountCents?: number;
 	secondarySplitAmountCents?: number;
 }): Share[] => {
 	if (isSplit) {
+		if (splitShares && splitShares.length > 0) {
+			return splitShares.map((share) => ({
+				payerId: share.payerId,
+				amountCents: Math.round(share.amount * 100),
+			}));
+		}
+
 		if (!payerId || !secondaryPayerId) {
 			throw new Error("Configuração de divisão inválida para o lançamento.");
 		}
@@ -651,24 +730,27 @@ export const buildTransactionRecords = ({

 	if (data.condition === "Parcelado") {
 		const installmentTotal = data.installmentCount ?? 0;
+		const startInstallment = data.startInstallment ?? 1;
 		const amountsByShare = shares.map((share) =>
 			splitAmount(share.amountCents, installmentTotal),
 		);

 		for (
-			let installment = 0;
-			installment < installmentTotal;
-			installment += 1
+			let index = 0;
+			index <= installmentTotal - startInstallment;
+			index += 1
 		) {
-			const installmentPeriod = addMonthsToPeriod(period, installment);
+			const currentInstallment = startInstallment + index;
+			const installmentPeriod = addMonthsToPeriod(period, index);
 			const installmentDueDate = dueDate
-				? addMonthsToDate(dueDate, installment)
+				? addMonthsToDate(dueDate, index)
 				: null;
 			const splitGroupId = cycleSplitGroupId();

 			shares.forEach((share, shareIndex) => {
-				const amountCents = amountsByShare[shareIndex]?.[installment] ?? 0;
-				const settled = resolveSettledValue(installment);
+				const amountCents =
+					amountsByShare[shareIndex]?.[currentInstallment - 1] ?? 0;
+				const settled = resolveSettledValue(index);
 				records.push({
 					...basePayload,
 					amount: centsToDecimalString(amountCents * amountSign),
@@ -677,7 +759,7 @@ export const buildTransactionRecords = ({
 					period: installmentPeriod,
 					isSettled: settled,
 					installmentCount: installmentTotal,
-					currentInstallment: installment + 1,
+					currentInstallment,
 					recurrenceCount: null,
 					dueDate: installmentDueDate,
 					splitGroupId,
--- a/src/features/transactions/actions/export-actions.ts
+++ b/src/features/transactions/actions/export-actions.ts
@@ -36,6 +36,14 @@ const exportTransactionsSchema: z.ZodType<TransactionsExportContext> = z.object(
 			dividedFilter: z.string().nullable(),
 			amountMinFilter: z.number().nullable(),
 			amountMaxFilter: z.number().nullable(),
+			dateStartFilter: z
+				.string()
+				.regex(/^\d{4}-\d{2}-\d{2}$/)
+				.nullable(),
+			dateEndFilter: z
+				.string()
+				.regex(/^\d{4}-\d{2}-\d{2}$/)
+				.nullable(),
 		}),
 		accountId: z.string().min(1).nullable().optional(),
 		cardId: z.string().min(1).nullable().optional(),
--- a/src/features/transactions/actions/import-action.ts
+++ b/src/features/transactions/actions/import-action.ts
@@ -4,9 +4,10 @@ import { and, eq, inArray } from "drizzle-orm";
 import { z } from "zod";
 import { transactions } from "@/db/schema";
 import {
+	fetchOwnedCategoryIds,
+	fetchOwnedPayerIds,
 	validateCartaoOwnership,
 	validateContaOwnership,
-	validatePayerOwnership,
 } from "@/features/transactions/actions/core";
 import { revalidateForEntity } from "@/shared/lib/actions/helpers";
 import { getUserId } from "@/shared/lib/auth/server";
@@ -21,6 +22,7 @@ const importRowSchema = z.object({
 	description: z.string().min(1, "Descrição obrigatória."),
 	transactionType: z.enum(["income", "expense"]),
 	categoryId: uuidSchema("Category").nullable().optional(),
+	payerId: uuidSchema("Payer").nullable().optional(),
 });

 const importSchema = z.object({
@@ -76,14 +78,34 @@ export async function importTransactionsAction(
 	const { rows, payerId, accountId, cardId, paymentMethod, invoicePeriod } =
 		parsed.data;

-	// Valida ownership
-	const [payerOk, accountOk, cardOk] = await Promise.all([
-		validatePayerOwnership(userId, payerId),
-		validateContaOwnership(userId, accountId),
-		validateCartaoOwnership(userId, cardId),
-	]);
+	const payerIdsByRow = rows.map((row) => row.payerId ?? payerId ?? null);
+
+	if (payerIdsByRow.some((id) => !id)) {
+		return { success: false, error: "Pessoa obrigatória." };
+	}
+
+	// Valida ownership
+	const [ownedPayerIds, ownedCategoryIds, accountOk, cardOk] =
+		await Promise.all([
+			fetchOwnedPayerIds(userId, payerIdsByRow),
+			fetchOwnedCategoryIds(
+				userId,
+				rows.map((row) => row.categoryId),
+			),
+			validateContaOwnership(userId, accountId),
+			validateCartaoOwnership(userId, cardId),
+		]);
+
+	if (payerIdsByRow.some((id) => id && !ownedPayerIds.has(id))) {
+		return { success: false, error: "Pessoa não encontrada." };
+	}
+
+	if (
+		rows.some((row) => row.categoryId && !ownedCategoryIds.has(row.categoryId))
+	) {
+		return { success: false, error: "Categoria não encontrada." };
+	}

-	if (!payerOk) return { success: false, error: "Pessoa não encontrada." };
 	if (!accountOk) return { success: false, error: "Conta não encontrada." };
 	if (!cardOk) return { success: false, error: "Cartão não encontrado." };

@@ -96,7 +118,7 @@ export async function importTransactionsAction(
 	// Cartão de crédito: fatura pode ainda não ter sido paga
 	const isSettled = paymentMethod !== "Cartão de crédito";

-	const records = rows.map((row) => {
+	const records = rows.map((row, index) => {
 		const purchaseDate = parseLocalDateString(row.date);
 		const period =
 			invoicePeriod ??
@@ -115,7 +137,7 @@ export async function importTransactionsAction(
 			period,
 			isSettled,
 			userId,
-			payerId: payerId ?? null,
+			payerId: payerIdsByRow[index],
 			accountId: accountId ?? null,
 			cardId: cardId ?? null,
 			categoryId: row.categoryId ?? null,
--- a/src/features/transactions/actions/single-actions.ts
+++ b/src/features/transactions/actions/single-actions.ts
@@ -8,6 +8,7 @@ import {
 	transactionAttachments,
 	transactions,
 } from "@/db/schema";
+import { ACCOUNT_AUTO_INVOICE_NOTE_PREFIX } from "@/shared/lib/accounts/constants";
 import { handleActionError } from "@/shared/lib/actions/helpers";
 import { getUser } from "@/shared/lib/auth/server";
 import { db } from "@/shared/lib/db";
@@ -55,6 +56,7 @@ export async function createTransactionAction(
 		const ownershipError = await validateAllOwnership(user.id, {
 			payerId: data.payerId,
 			secondaryPayerId: data.secondaryPayerId,
+			splitPayerIds: data.splitShares?.map((share) => share.payerId),
 			categoryId: data.categoryId,
 			accountId: data.accountId,
 			cardId: data.cardId,
@@ -83,6 +85,7 @@ export async function createTransactionAction(
 			payerId: data.payerId ?? null,
 			isSplit: data.isSplit ?? false,
 			secondaryPayerId: data.secondaryPayerId,
+			splitShares: data.splitShares,
 			primarySplitAmountCents: data.primarySplitAmount
 				? Math.round(data.primarySplitAmount * 100)
 				: undefined,
@@ -206,6 +209,7 @@ export async function updateTransactionAction(
 		const ownershipError = await validateAllOwnership(user.id, {
 			payerId: data.payerId,
 			secondaryPayerId: data.secondaryPayerId,
+			splitPayerIds: data.splitShares?.map((share) => share.payerId),
 			categoryId: data.categoryId,
 			accountId: data.accountId,
 			cardId: data.cardId,
@@ -230,13 +234,6 @@ export async function updateTransactionAction(
 				eq(transactions.id, data.id),
 				eq(transactions.userId, user.id),
 			),
-			with: {
-				category: {
-					columns: {
-						name: true,
-					},
-				},
-			},
 		})) as
 			| {
 					id: string;
@@ -248,7 +245,6 @@ export async function updateTransactionAction(
 					accountId: string | null;
 					cardId: string | null;
 					categoryId: string | null;
-					category: { name: string } | null;
 			  }
 			| undefined;

@@ -256,14 +252,17 @@ export async function updateTransactionAction(
 			return { success: false, error: "Lançamento não encontrado." };
 		}

-		const categoriasProtegidasEdicao = ["Saldo inicial", "Pagamentos"];
-		if (
-			existing.category?.name &&
-			categoriasProtegidasEdicao.includes(existing.category.name)
-		) {
+		if (existing.note?.startsWith(ACCOUNT_AUTO_INVOICE_NOTE_PREFIX)) {
 			return {
 				success: false,
-				error: `Lançamentos com a categoria '${existing.category.name}' não podem ser editados.`,
+				error: "Pagamentos automáticos de fatura não podem ser editados.",
+			};
+		}
+
+		if (isInitialBalanceTransaction(existing)) {
+			return {
+				success: false,
+				error: "Lançamentos de saldo inicial não podem ser editados.",
 			};
 		}

@@ -391,13 +390,6 @@ export async function deleteTransactionAction(
 				eq(transactions.id, data.id),
 				eq(transactions.userId, user.id),
 			),
-			with: {
-				category: {
-					columns: {
-						name: true,
-					},
-				},
-			},
 		})) as
 			| {
 					id: string;
@@ -411,7 +403,6 @@ export async function deleteTransactionAction(
 					period: string;
 					note: string | null;
 					categoryId: string | null;
-					category: { name: string } | null;
 			  }
 			| undefined;

@@ -419,14 +410,17 @@ export async function deleteTransactionAction(
 			return { success: false, error: "Lançamento não encontrado." };
 		}

-		const categoriasProtegidasRemocao = ["Saldo inicial", "Pagamentos"];
-		if (
-			existing.category?.name &&
-			categoriasProtegidasRemocao.includes(existing.category.name)
-		) {
+		if (existing.note?.startsWith(ACCOUNT_AUTO_INVOICE_NOTE_PREFIX)) {
 			return {
 				success: false,
-				error: `Lançamentos com a categoria '${existing.category.name}' não podem ser removidos.`,
+				error: "Pagamentos automáticos de fatura não podem ser removidos.",
+			};
+		}
+
+		if (isInitialBalanceTransaction(existing)) {
+			return {
+				success: false,
+				error: "Lançamentos de saldo inicial não podem ser removidos.",
 			};
 		}

@@ -486,6 +480,7 @@ export async function updateTransactionSplitPairAction(

 		const ownershipError = await validateAllOwnership(user.id, {
 			payerId: data.payerId,
+			splitPayerIds: data.splitShares?.map((share) => share.payerId),
 			categoryId: data.categoryId,
 			accountId: data.accountId,
 			cardId: data.cardId,
--- a/src/features/transactions/components/dialogs/anticipate-installments-dialog/anticipate-installments-dialog.tsx
+++ b/src/features/transactions/components/dialogs/anticipate-installments-dialog/anticipate-installments-dialog.tsx
@@ -1,6 +1,7 @@
 "use client";

 import { RiLoader4Line } from "@remixicon/react";
+import { useQueryClient } from "@tanstack/react-query";
 import { useEffect, useMemo, useState, useTransition } from "react";
 import { toast } from "sonner";
 import { CategoryIcon } from "@/features/categories/components/category-icon";
@@ -8,6 +9,7 @@ import {
 	createInstallmentAnticipationAction,
 	getEligibleInstallmentsAction,
 } from "@/features/transactions/actions/anticipation";
+import { installmentAnticipationsQueryKey } from "@/features/transactions/hooks/use-installment-anticipations";
 import MoneyValues from "@/shared/components/money-values";
 import { PeriodPicker } from "@/shared/components/period-picker";
 import { Button } from "@/shared/components/ui/button";
@@ -70,6 +72,7 @@ export function AnticipateInstallmentsDialog({
 	open,
 	onOpenChange,
 }: AnticipateInstallmentsDialogProps) {
+	const queryClient = useQueryClient();
 	const [errorMessage, setErrorMessage] = useState<string | null>(null);
 	const [isPending, startTransition] = useTransition();
 	const [isLoadingInstallments, setIsLoadingInstallments] = useState(false);
@@ -86,7 +89,7 @@ export function AnticipateInstallmentsDialog({
 	);

 	// Use form state hook for form management
-	const { formState, replaceForm, updateField } =
+	const { formState, replaceForm, updateField, updateFields } =
 		useFormState<AnticipationFormValues>({
 			anticipationPeriod: defaultPeriod,
 			discount: "0",
@@ -95,15 +98,34 @@ export function AnticipateInstallmentsDialog({
 			note: "",
 		});

-	// Buscar parcelas elegíveis ao abrir o dialog
+	// Resetar formulário ao abrir o dialog
 	useEffect(() => {
 		if (dialogOpen) {
+			setSelectedIds([]);
+			setErrorMessage(null);
+			replaceForm({
+				anticipationPeriod: defaultPeriod,
+				discount: "0",
+				payerId: "",
+				categoryId: "",
+				note: "",
+			});
+		}
+	}, [defaultPeriod, dialogOpen, replaceForm]);
+
+	// Buscar parcelas elegíveis ao abrir o dialog e ao trocar o período
+	useEffect(() => {
+		if (dialogOpen) {
+			let shouldUpdate = true;
+
 			setIsLoadingInstallments(true);
 			setSelectedIds([]);
 			setErrorMessage(null);

-			getEligibleInstallmentsAction(seriesId)
+			getEligibleInstallmentsAction(seriesId, formState.anticipationPeriod)
 				.then((result) => {
+					if (!shouldUpdate) return;
+
 					if (!result.success) {
 						toast.error(result.error || "Erro ao carregar parcelas");
 						setEligibleInstallments([]);
@@ -116,25 +138,30 @@ export function AnticipateInstallmentsDialog({
 					// Pré-preencher pagador e categoria da primeira parcela
 					if (installments.length > 0) {
 						const first = installments[0];
-						replaceForm({
-							anticipationPeriod: defaultPeriod,
-							discount: "0",
+						updateFields({
 							payerId: first.payerId ?? "",
 							categoryId: first.categoryId ?? "",
-							note: "",
 						});
 					}
 				})
 				.catch((error) => {
+					if (!shouldUpdate) return;
+
 					console.error("Erro ao buscar parcelas:", error);
 					toast.error("Erro ao carregar parcelas elegíveis");
 					setEligibleInstallments([]);
 				})
 				.finally(() => {
+					if (!shouldUpdate) return;
+
 					setIsLoadingInstallments(false);
 				});
+
+			return () => {
+				shouldUpdate = false;
+			};
 		}
-	}, [defaultPeriod, dialogOpen, replaceForm, seriesId]);
+	}, [dialogOpen, formState.anticipationPeriod, seriesId, updateFields]);

 	const totalAmount = useMemo(() => {
 		return eligibleInstallments
@@ -189,6 +216,9 @@ export function AnticipateInstallmentsDialog({

 			if (result.success) {
 				toast.success(result.message);
+				void queryClient.invalidateQueries({
+					queryKey: installmentAnticipationsQueryKey(seriesId),
+				});
 				setDialogOpen(false);
 			} else {
 				const errorMsg = result.error || "Erro ao criar antecipação";
--- a/src/features/transactions/components/dialogs/anticipate-installments-dialog/anticipation-history-dialog.tsx
+++ b/src/features/transactions/components/dialogs/anticipate-installments-dialog/anticipation-history-dialog.tsx
@@ -1,16 +1,21 @@
 "use client";
-
 import { RiCalendarCheckLine, RiLoader4Line } from "@remixicon/react";
 import { useQueryClient } from "@tanstack/react-query";
+import { useEffect } from "react";
+import { toast } from "sonner";
+import { cancelInstallmentAnticipationAction } from "@/features/transactions/actions/anticipation";
 import {
 	installmentAnticipationsQueryKey,
 	useInstallmentAnticipations,
 } from "@/features/transactions/hooks/use-installment-anticipations";
+import { ConfirmActionDialog } from "@/shared/components/confirm-action-dialog";
 import { Button } from "@/shared/components/ui/button";
 import {
 	Dialog,
+	DialogClose,
 	DialogContent,
 	DialogDescription,
+	DialogFooter,
 	DialogHeader,
 	DialogTitle,
 	DialogTrigger,
@@ -31,7 +36,6 @@ interface AnticipationHistoryDialogProps {
 	lancamentoName: string;
 	open?: boolean;
 	onOpenChange?: (open: boolean) => void;
-	onViewLancamento?: (transactionId: string) => void;
 }

 export function AnticipationHistoryDialog({
@@ -40,7 +44,6 @@ export function AnticipationHistoryDialog({
 	lancamentoName,
 	open,
 	onOpenChange,
-	onViewLancamento,
 }: AnticipationHistoryDialogProps) {
 	const queryClient = useQueryClient();
 	const [dialogOpen, setDialogOpen] = useControlledState(
@@ -51,87 +54,152 @@ export function AnticipationHistoryDialog({
 	const {
 		data: anticipations = [],
 		isLoading,
+		isFetching,
 		isError,
 		refetch,
 	} = useInstallmentAnticipations(seriesId, dialogOpen);

-	const handleCanceled = () => {
+	useEffect(() => {
+		if (dialogOpen) {
+			void refetch();
+		}
+	}, [dialogOpen, refetch]);
+
+	const cancelableAnticipation = anticipations.find(
+		(anticipation) => anticipation.transaction?.isSettled !== true,
+	);
+	const anticipationCountLabel =
+		anticipations.length === 1
+			? "1 registro de antecipação encontrada"
+			: `${anticipations.length} registros de antecipações encontradas`;
+
+	const refreshHistory = () => {
 		void queryClient.invalidateQueries({
 			queryKey: installmentAnticipationsQueryKey(seriesId),
 		});
 	};

+	const handleCancelAnticipation = async () => {
+		if (!cancelableAnticipation) return;
+
+		const result = await cancelInstallmentAnticipationAction({
+			anticipationId: cancelableAnticipation.id,
+		});
+
+		if (result.success) {
+			toast.success(result.message);
+			refreshHistory();
+			return;
+		}
+
+		toast.error(result.error || "Erro ao cancelar antecipação");
+	};
+
 	return (
 		<Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-			{trigger && <DialogTrigger asChild>{trigger}</DialogTrigger>}
-			<DialogContent className="max-w-3xl px-6 py-5 sm:px-8 sm:py-6">
-				<DialogHeader>
+			{trigger ? <DialogTrigger asChild>{trigger}</DialogTrigger> : null}
+			<DialogContent className="min-w-0 overflow-x-hidden">
+				<DialogHeader className="text-left">
 					<DialogTitle>Histórico de Antecipações</DialogTitle>
 					<DialogDescription>{lancamentoName}</DialogDescription>
 				</DialogHeader>

-				<div className="max-h-[60vh] space-y-4 overflow-y-auto pr-2">
-					{isLoading ? (
-						<div className="flex items-center justify-center rounded-lg border border-dashed p-12">
-							<RiLoader4Line className="size-6 animate-spin text-muted-foreground" />
-							<span className="ml-2 text-sm text-muted-foreground">
-								Carregando histórico...
-							</span>
-						</div>
+				<div className="min-w-0 max-h-[60vh] overflow-x-hidden overflow-y-auto text-sm">
+					{isLoading || isFetching ? (
+						<LoadingState />
 					) : isError ? (
-						<Empty>
-							<EmptyHeader>
-								<EmptyMedia variant="icon">
-									<RiCalendarCheckLine className="size-6 text-muted-foreground" />
-								</EmptyMedia>
-								<EmptyTitle>Não foi possível carregar</EmptyTitle>
-								<EmptyDescription>
-									O histórico de antecipações não pôde ser carregado agora.
-								</EmptyDescription>
-							</EmptyHeader>
-							<Button
-								type="button"
-								variant="outline"
-								className="mx-auto"
-								onClick={() => void refetch()}
-							>
-								Tentar novamente
-							</Button>
-						</Empty>
+						<ErrorState onRetry={() => void refetch()} />
 					) : anticipations.length === 0 ? (
-						<Empty>
-							<EmptyHeader>
-								<EmptyMedia variant="icon">
-									<RiCalendarCheckLine className="size-6 text-muted-foreground" />
-								</EmptyMedia>
-								<EmptyTitle>Nenhuma antecipação registrada</EmptyTitle>
-								<EmptyDescription>
-									As antecipações realizadas para esta compra parcelada
-									aparecerão aqui.
-								</EmptyDescription>
-							</EmptyHeader>
-						</Empty>
+						<EmptyState />
 					) : (
-						anticipations.map((anticipation) => (
-							<AnticipationCard
-								key={anticipation.id}
-								anticipation={anticipation}
-								onViewLancamento={onViewLancamento}
-								onCanceled={handleCanceled}
-							/>
-						))
+						<div className="min-w-0 space-y-3">
+							<p className="text-left text-muted-foreground text-primary">
+								{anticipationCountLabel}
+							</p>
+							{anticipations.map((anticipation) => (
+								<AnticipationCard
+									key={anticipation.id}
+									anticipation={anticipation}
+								/>
+							))}
+						</div>
 					)}
 				</div>

-				{!isLoading && anticipations.length > 0 && (
-					<div className="border-t pt-4 text-center text-sm text-muted-foreground">
-						{anticipations.length}{" "}
-						{anticipations.length === 1
-							? "antecipação encontrada"
-							: "antecipações encontradas"}
-					</div>
-				)}
+				<DialogFooter>
+					<DialogClose asChild>
+						<Button type="button" variant="outline">
+							Fechar
+						</Button>
+					</DialogClose>
+					{cancelableAnticipation ? (
+						<ConfirmActionDialog
+							trigger={
+								<Button type="button" variant="destructive">
+									Desfazer Antecipação
+								</Button>
+							}
+							title="Cancelar antecipação?"
+							description="Esta ação irá reverter a antecipação e restaurar as parcelas originais. O lançamento de antecipação será removido."
+							confirmLabel="Cancelar Antecipação"
+							confirmVariant="destructive"
+							pendingLabel="Cancelando..."
+							onConfirm={handleCancelAnticipation}
+						/>
+					) : null}
+				</DialogFooter>
 			</DialogContent>
 		</Dialog>
 	);
 }
+
+function LoadingState() {
+	return (
+		<div className="flex min-h-48 items-center justify-center rounded-lg border border-dashed">
+			<RiLoader4Line className="size-6 animate-spin text-muted-foreground" />
+			<span className="ml-2 text-sm text-muted-foreground">
+				Carregando histórico...
+			</span>
+		</div>
+	);
+}
+
+function ErrorState({ onRetry }: { onRetry: () => void }) {
+	return (
+		<Empty>
+			<EmptyHeader>
+				<EmptyMedia variant="icon">
+					<RiCalendarCheckLine className="size-6 text-muted-foreground" />
+				</EmptyMedia>
+				<EmptyTitle>Não foi possível carregar</EmptyTitle>
+				<EmptyDescription>
+					O histórico de antecipações não pôde ser carregado agora.
+				</EmptyDescription>
+			</EmptyHeader>
+			<Button
+				type="button"
+				variant="outline"
+				className="mx-auto"
+				onClick={onRetry}
+			>
+				Tentar novamente
+			</Button>
+		</Empty>
+	);
+}
+
+function EmptyState() {
+	return (
+		<Empty>
+			<EmptyHeader>
+				<EmptyMedia variant="icon">
+					<RiCalendarCheckLine className="size-6 text-muted-foreground" />
+				</EmptyMedia>
+				<EmptyTitle>Nenhuma antecipação registrada</EmptyTitle>
+				<EmptyDescription>
+					As antecipações realizadas para esta compra parcelada aparecerão aqui.
+				</EmptyDescription>
+			</EmptyHeader>
+		</Empty>
+	);
+}
--- a/src/features/transactions/components/dialogs/anticipate-installments-dialog/installment-selection-table.tsx
+++ b/src/features/transactions/components/dialogs/anticipate-installments-dialog/installment-selection-table.tsx
@@ -49,7 +49,8 @@ export function InstallmentSelectionTable({
 					Nenhuma parcela elegível para antecipação encontrada.
 				</p>
 				<p className="mt-1 text-xs text-muted-foreground">
-					Todas as parcelas desta compra já foram pagas ou antecipadas.
+					Apenas parcelas futuras, ainda não pagas ou antecipadas, aparecem
+					aqui.
 				</p>
 			</div>
 		);
--- a/src/features/transactions/components/dialogs/mass-add-dialog.tsx
+++ b/src/features/transactions/components/dialogs/mass-add-dialog.tsx
@@ -8,6 +8,7 @@ import {
 	PAYMENT_METHODS,
 	type TRANSACTION_TYPES,
 } from "@/features/transactions/lib/constants";
+import { ConfirmActionDialog } from "@/shared/components/confirm-action-dialog";
 import { Button } from "@/shared/components/ui/button";
 import { CurrencyInput } from "@/shared/components/ui/currency-input";
 import { DatePicker } from "@/shared/components/ui/date-picker";
@@ -123,10 +124,11 @@ interface TransactionRow {

 function createEmptyTransactionRow(
 	defaultPayerId?: string | null,
+	lastPurchaseDate?: string,
 ): TransactionRow {
 	return {
 		id: createClientSafeId(),
-		purchaseDate: getTodayDateString(),
+		purchaseDate: lastPurchaseDate ?? getTodayDateString(),
 		name: "",
 		amount: "",
 		categoryId: undefined,
@@ -148,6 +150,9 @@ export function MassAddDialog({
 	defaultCardId,
 }: MassAddDialogProps) {
 	const [loading, setLoading] = useState(false);
+	const [isDirty, setIsDirty] = useState(false);
+	const [confirmCloseOpen, setConfirmCloseOpen] = useState(false);
+	const [cancelConfirmOpen, setCancelConfirmOpen] = useState(false);

 	// Fixed fields state (sempre ativos, sem checkboxes)
 	const [transactionType, setTransactionType] =
@@ -179,11 +184,23 @@ export function MassAddDialog({
 		return groupAndSortCategories(filtered);
 	}, [categoryOptions, transactionType]);

+	const resetForm = () => {
+		setTransactionType("Despesa");
+		setPaymentMethod(PAYMENT_METHODS[0]);
+		setPeriod(selectedPeriod);
+		setContaId(undefined);
+		setCartaoId(defaultCardId ?? undefined);
+		setTransactions([createEmptyTransactionRow(defaultPayerId)]);
+		setIsDirty(false);
+	};
+
 	const addTransaction = () => {
+		const lastTransaction = transactions[transactions.length - 1];
 		setTransactions([
 			...transactions,
-			createEmptyTransactionRow(defaultPayerId),
+			createEmptyTransactionRow(defaultPayerId, lastTransaction?.purchaseDate),
 		]);
+		setIsDirty(true);
 	};

 	const removeTransaction = (id: string) => {
@@ -192,6 +209,7 @@ export function MassAddDialog({
 			return;
 		}
 		setTransactions(transactions.filter((t) => t.id !== id));
+		setIsDirty(true);
 	};

 	const updateTransaction = (
@@ -202,6 +220,7 @@ export function MassAddDialog({
 		setTransactions(
 			transactions.map((t) => (t.id === id ? { ...t, [field]: value } : t)),
 		);
+		setIsDirty(true);
 	};

 	const handleSubmit = async () => {
@@ -250,13 +269,7 @@ export function MassAddDialog({
 		try {
 			await onSubmit(formData);
 			onOpenChange(false);
-			// Reset form
-			setTransactionType("Despesa");
-			setPaymentMethod(PAYMENT_METHODS[0]);
-			setPeriod(selectedPeriod);
-			setContaId(undefined);
-			setCartaoId(defaultCardId ?? undefined);
-			setTransactions([createEmptyTransactionRow(defaultPayerId)]);
+			resetForm();
 		} catch (_error) {
 			// Error is handled by the onSubmit function
 		} finally {
@@ -265,7 +278,19 @@ export function MassAddDialog({
 	};

 	return (
-		<Dialog open={open} onOpenChange={onOpenChange}>
+		<Dialog
+			open={open}
+			onOpenChange={(newOpen) => {
+				if (!newOpen && isDirty) {
+					setConfirmCloseOpen(true);
+				} else {
+					onOpenChange(newOpen);
+					if (newOpen === false) {
+						resetForm();
+					}
+				}
+			}}
+		>
 			<DialogContent className="sm:max-w-3xl max-h-[90vh] overflow-y-auto p-6 sm:px-8">
 				<DialogHeader>
 					<DialogTitle>Adicionar múltiplos lançamentos</DialogTitle>
@@ -286,9 +311,10 @@ export function MassAddDialog({
 								<Label htmlFor="transaction-type">Tipo de Transação</Label>
 								<Select
 									value={transactionType}
-									onValueChange={(value) =>
-										setTransactionType(value as MassAddTransactionType)
-									}
+									onValueChange={(value) => {
+										setTransactionType(value as MassAddTransactionType);
+										setIsDirty(true);
+									}}
 								>
 									<SelectTrigger id="transaction-type" className="w-full">
 										<SelectValue>
@@ -315,6 +341,7 @@ export function MassAddDialog({
 									value={paymentMethod}
 									onValueChange={(value) => {
 										setPaymentMethod(value as MassAddPaymentMethod);
+										setIsDirty(true);
 										// Reset conta/cartao when changing payment method
 										if (value === "Cartão de crédito") {
 											setContaId(undefined);
@@ -346,7 +373,10 @@ export function MassAddDialog({
 									<Label htmlFor="cartao">Cartão</Label>
 									<Select
 										value={cardId}
-										onValueChange={setCartaoId}
+										onValueChange={(value) => {
+											setCartaoId(value);
+											setIsDirty(true);
+										}}
 										disabled={isLockedToCartao}
 									>
 										<SelectTrigger id="cartao" className="w-full">
@@ -395,7 +425,10 @@ export function MassAddDialog({
 									{cardId ? (
 										<InlinePeriodPicker
 											period={period}
-											onPeriodChange={setPeriod}
+											onPeriodChange={(value) => {
+												setPeriod(value);
+												setIsDirty(true);
+											}}
 										/>
 									) : null}
 								</div>
@@ -405,7 +438,13 @@ export function MassAddDialog({
 							{!isCartaoSelected ? (
 								<div className="space-y-2">
 									<Label htmlFor="conta">Conta</Label>
-									<Select value={accountId} onValueChange={setContaId}>
+									<Select
+										value={accountId}
+										onValueChange={(value) => {
+											setContaId(value);
+											setIsDirty(true);
+										}}
+									>
 										<SelectTrigger id="conta" className="w-full">
 											<SelectValue placeholder="Selecione">
 												{accountId &&
@@ -635,7 +674,13 @@ export function MassAddDialog({
 				<DialogFooter>
 					<Button
 						variant="outline"
-						onClick={() => onOpenChange(false)}
+						onClick={() => {
+							if (isDirty) {
+								setCancelConfirmOpen(true);
+							} else {
+								onOpenChange(false);
+							}
+						}}
 						disabled={loading}
 					>
 						Cancelar
@@ -646,6 +691,36 @@ export function MassAddDialog({
 						{transactions.length === 1 ? "lançamento" : "lançamentos"}
 					</Button>
 				</DialogFooter>
+
+				<ConfirmActionDialog
+					open={confirmCloseOpen}
+					onOpenChange={setConfirmCloseOpen}
+					title="Descartar alterações?"
+					description="Há lançamentos não salvos. Se fechar agora, todos os dados serão perdidos."
+					confirmLabel="Descartar"
+					cancelLabel="Continuar editando"
+					confirmVariant="destructive"
+					onConfirm={() => {
+						setConfirmCloseOpen(false);
+						onOpenChange(false);
+						resetForm();
+					}}
+				/>
+
+				<ConfirmActionDialog
+					open={cancelConfirmOpen}
+					onOpenChange={setCancelConfirmOpen}
+					title="Cancelar adição de lançamentos?"
+					description="Há lançamentos não salvos. Se cancelar, todos os dados serão perdidos."
+					confirmLabel="Cancelar"
+					cancelLabel="Continuar editando"
+					confirmVariant="destructive"
+					onConfirm={() => {
+						setCancelConfirmOpen(false);
+						onOpenChange(false);
+						resetForm();
+					}}
+				/>
 			</DialogContent>
 		</Dialog>
 	);
--- a/src/features/transactions/components/dialogs/split-pair-dialog.tsx
+++ b/src/features/transactions/components/dialogs/split-pair-dialog.tsx
@@ -39,8 +39,8 @@ export function SplitPairDialog({
 				<DialogHeader>
 					<DialogTitle>Editar lançamento dividido</DialogTitle>
 					<DialogDescription>
-						Este lançamento está dividido com outra pessoa. Escolha o que deseja
-						editar:
+						Este lançamento está dividido com outras pessoas. Escolha o que
+						deseja editar:
 					</DialogDescription>
 				</DialogHeader>

@@ -63,7 +63,7 @@ export function SplitPairDialog({
 									Apenas este lançamento
 								</Label>
 								<p className="text-xs text-muted-foreground">
-									Aplica a alteração somente neste lado da divisão
+									Aplica a alteração somente nesta parte da divisão
 								</p>
 							</div>
 						</div>
@@ -75,11 +75,11 @@ export function SplitPairDialog({
 									htmlFor="split-both"
 									className="text-sm cursor-pointer font-medium"
 								>
-									Atualizar os dois lançamentos
+									Atualizar toda a divisão
 								</Label>
 								<p className="text-xs text-muted-foreground">
-									Aplica nome, data, categoria e outros campos compartilhados
-									nos dois lados da divisão
+									Aplica nome, data, categoria e outros campos compartilhados em
+									todo o grupo da divisão
 								</p>
 							</div>
 						</div>
--- a/src/features/transactions/components/dialogs/transaction-dialog/condition-section.tsx
+++ b/src/features/transactions/components/dialogs/transaction-dialog/condition-section.tsx
@@ -1,7 +1,13 @@
 "use client";

+import { useState } from "react";
 import { TRANSACTION_CONDITIONS } from "@/features/transactions/lib/constants";
 import { Label } from "@/shared/components/ui/label";
+import {
+	Popover,
+	PopoverContent,
+	PopoverTrigger,
+} from "@/shared/components/ui/popover";
 import {
 	Select,
 	SelectContent,
@@ -14,6 +20,61 @@ import { cn } from "@/shared/utils/ui";
 import { ConditionSelectContent } from "../../select-items";
 import type { ConditionSectionProps } from "./transaction-dialog-types";

+function InlineStartInstallmentPicker({
+	value,
+	options,
+	onChange,
+}: {
+	value: string;
+	options: number[];
+	onChange: (value: string) => void;
+}) {
+	const [open, setOpen] = useState(false);
+	const selected = Number(value || "1");
+	const selectedLabel =
+		!Number.isNaN(selected) && selected > 0
+			? `${selected}ª parcela`
+			: "1ª parcela";
+	const disabled = options.length === 0;
+
+	return (
+		<div className="ml-1">
+			<span className="text-xs text-muted-foreground">Começar em </span>
+			<Popover modal open={open} onOpenChange={setOpen}>
+				<PopoverTrigger asChild>
+					<button
+						type="button"
+						className="cursor-pointer text-xs text-primary underline-offset-2 hover:underline disabled:cursor-not-allowed disabled:text-muted-foreground disabled:hover:no-underline"
+						disabled={disabled}
+					>
+						{selectedLabel}
+					</button>
+				</PopoverTrigger>
+				<PopoverContent className="w-40 p-1" align="start">
+					<div className="max-h-56 overflow-y-auto">
+						{options.map((option) => (
+							<button
+								key={option}
+								type="button"
+								className={cn(
+									"flex w-full items-center rounded-sm px-2 py-1.5 text-left text-sm hover:bg-accent hover:text-accent-foreground",
+									option === selected && "font-medium text-primary",
+								)}
+								onClick={() => {
+									onChange(String(option));
+									setOpen(false);
+								}}
+							>
+								{option}ª parcela
+							</button>
+						))}
+					</div>
+				</PopoverContent>
+			</Popover>
+		</div>
+	);
+}
+
 export function ConditionSection({
 	formState,
 	onFieldChange,
@@ -37,11 +98,17 @@ export function ConditionSection({
 	const installmentSummary =
 		showInstallments &&
 		formState.installmentCount &&
-		amount &&
 		!Number.isNaN(installmentCount) &&
 		installmentCount > 0
 			? getInstallmentLabel(installmentCount)
 			: null;
+	const startInstallmentOptions =
+		showInstallments &&
+		formState.installmentCount &&
+		!Number.isNaN(installmentCount) &&
+		installmentCount > 0
+			? Array.from({ length: installmentCount }, (_, index) => index + 1)
+			: [];

 	return (
 		<div className="flex w-full flex-col gap-2 md:flex-row">
@@ -96,6 +163,11 @@ export function ConditionSection({
 							})}
 						</SelectContent>
 					</Select>
+					<InlineStartInstallmentPicker
+						value={formState.startInstallment}
+						options={startInstallmentOptions}
+						onChange={(value) => onFieldChange("startInstallment", value)}
+					/>
 				</div>
 			) : null}

--- a/src/features/transactions/components/dialogs/transaction-dialog/payer-section.tsx
+++ b/src/features/transactions/components/dialogs/transaction-dialog/payer-section.tsx
@@ -3,8 +3,12 @@
 import * as CheckboxPrimitive from "@radix-ui/react-checkbox";
 import { RiSliceFill } from "@remixicon/react";
 import { useState } from "react";
-import { CurrencyInput } from "@/shared/components/ui/currency-input";
-import { Input } from "@/shared/components/ui/input";
+import {
+	Avatar,
+	AvatarFallback,
+	AvatarImage,
+} from "@/shared/components/ui/avatar";
+import { Button } from "@/shared/components/ui/button";
 import { Label } from "@/shared/components/ui/label";
 import {
 	Select,
@@ -13,120 +17,48 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/shared/components/ui/select";
-import {
-	ToggleGroup,
-	ToggleGroupItem,
-} from "@/shared/components/ui/toggle-group";
-import {
-	formatCurrency,
-	formatDecimalForDbRequired,
-	normalizeDecimalInput,
-} from "@/shared/utils/currency";
-import { safeToNumber } from "@/shared/utils/number";
+import { getAvatarSrc } from "@/shared/lib/payers/utils";
 import { cn } from "@/shared/utils/ui";
 import { PayerSelectContent } from "../../select-items";
+import { getSplitSummaryData, SplitConfigDialog } from "./split-config-dialog";
 import type { PayerSectionProps } from "./transaction-dialog-types";

-type SplitInputMode = "currency" | "percentage";
+type SplitSummary = ReturnType<typeof getSplitSummaryData>;

-const SPLIT_MODE_OPTIONS = [
-	{ value: "currency", label: "R$" },
-	{ value: "percentage", label: "%" },
-] as const satisfies ReadonlyArray<{ value: SplitInputMode; label: string }>;
-
-const amountToPercent = (amount: string, total: number): string => {
-	if (total <= 0) return "";
-	const numeric = safeToNumber(normalizeDecimalInput(amount), Number.NaN);
-	if (!Number.isFinite(numeric)) return "";
-	const pct = (numeric / total) * 100;
-	return (Math.round(pct * 10) / 10).toString();
-};
-
-const percentToAmount = (percent: string, total: number): string => {
-	const pct = safeToNumber(normalizeDecimalInput(percent), Number.NaN);
-	if (!Number.isFinite(pct) || total <= 0) return "0.00";
-	const clamped = Math.min(100, Math.max(0, pct));
-	return formatDecimalForDbRequired((total * clamped) / 100);
-};
-
-function SplitModeToggle({
-	mode,
-	onModeChange,
-}: {
-	mode: SplitInputMode;
-	onModeChange: (mode: SplitInputMode) => void;
-}) {
-	return (
-		<ToggleGroup
-			type="single"
-			size="sm"
-			variant="outline"
-			value={mode}
-			onValueChange={(value) => {
-				if (value) onModeChange(value as SplitInputMode);
-			}}
-			aria-label="Modo de entrada do split"
-			className="h-7 text-xs"
-		>
-			{SPLIT_MODE_OPTIONS.map((option) => (
-				<ToggleGroupItem
-					key={option.value}
-					value={option.value}
-					className="px-2 py-0 h-7 text-xs"
-				>
-					{option.label}
-				</ToggleGroupItem>
-			))}
-		</ToggleGroup>
-	);
-}
-
-function SplitAmountField({
-	mode,
-	value,
-	totalAmount,
-	onAmountChange,
-	ariaLabel,
-}: {
-	mode: SplitInputMode;
-	value: string;
-	totalAmount: number;
-	onAmountChange: (amount: string) => void;
-	ariaLabel: string;
-}) {
-	if (mode === "currency") {
-		return (
-			<CurrencyInput
-				value={value}
-				onValueChange={onAmountChange}
-				placeholder="R$ 0,00"
-				className="h-9 w-[45%] text-sm"
-			/>
-		);
+function SplitSummaryContent({ summary }: { summary: SplitSummary }) {
+	if (summary.type === "text") {
+		return <p className="text-xs text-muted-foreground">{summary.label}</p>;
 	}

 	return (
-		<div className="w-[45%] space-y-1">
-			<div className="relative">
-				<Input
-					type="text"
-					inputMode="decimal"
-					value={amountToPercent(value, totalAmount)}
-					onChange={(event) => {
-						const sanitized = event.target.value.replace(/[^\d.,]/g, "");
-						onAmountChange(percentToAmount(sanitized, totalAmount));
-					}}
-					placeholder="0"
-					aria-label={ariaLabel}
-					className="h-9 w-full pr-7 text-sm"
-				/>
-				<span className="pointer-events-none absolute top-1/2 right-2 -translate-y-1/2 text-xs text-muted-foreground">
-					%
-				</span>
-			</div>
-			<p className="ml-1 text-xs text-muted-foreground">
-				{formatCurrency(safeToNumber(value))}
-			</p>
+		<div className="flex flex-wrap items-center gap-x-2 gap-y-1 text-xs text-muted-foreground">
+			<span>{summary.count} pessoas:</span>
+			{summary.participants.map((participant, index) => {
+				const initial = participant.label.charAt(0).toUpperCase() || "?";
+
+				return (
+					<span
+						key={`${participant.label}-${index}`}
+						className="inline-flex min-w-0 items-center gap-0.5"
+					>
+						<Avatar className="size-4 border border-border/60 bg-background">
+							<AvatarImage
+								src={getAvatarSrc(participant.avatarUrl)}
+								alt={`Avatar de ${participant.label}`}
+							/>
+							<AvatarFallback className="text-[0.55rem] font-medium uppercase">
+								{initial}
+							</AvatarFallback>
+						</Avatar>
+						<span>{participant.firstName}</span>
+					</span>
+				);
+			})}
+			{summary.remainingCount > 0 ? (
+				<span>+{summary.remainingCount}</span>
+			) : null}
+			<span aria-hidden>·</span>
+			<span>{summary.totalLabel}</span>
 		</div>
 	);
 }
@@ -135,53 +67,93 @@ export function PayerSection({
 	formState,
 	onFieldChange,
 	payerOptions,
-	secondaryPayerOptions,
+	splitPayerOptions,
 	totalAmount,
 }: PayerSectionProps) {
-	const [splitMode, setSplitMode] = useState<SplitInputMode>("currency");
+	const [splitConfigOpen, setSplitConfigOpen] = useState(false);
+	const splitSummary = getSplitSummaryData(
+		formState,
+		payerOptions,
+		totalAmount,
+	);

-	const handlePrimaryAmountChange = (value: string) => {
-		onFieldChange("primarySplitAmount", value);
-		const remaining = Math.max(0, totalAmount - safeToNumber(value));
-		onFieldChange("secondarySplitAmount", remaining.toFixed(2));
+	const handleSplitToggle = (checked: boolean) => {
+		onFieldChange("isSplit", checked);
+
+		if (checked) {
+			setSplitConfigOpen(true);
+		}
 	};

-	const handleSecondaryAmountChange = (value: string) => {
-		onFieldChange("secondarySplitAmount", value);
-		const remaining = Math.max(0, totalAmount - safeToNumber(value));
-		onFieldChange("primarySplitAmount", remaining.toFixed(2));
+	const handleSplitCardClick = () => {
+		if (formState.isSplit) {
+			setSplitConfigOpen(true);
+			return;
+		}
+
+		handleSplitToggle(true);
 	};

 	return (
 		<div className="space-y-3">
+			<div className="space-y-1">
+				<Label htmlFor="payer">Pessoa</Label>
+				<Select
+					value={formState.payerId ?? ""}
+					onValueChange={(value) => onFieldChange("payerId", value)}
+				>
+					<SelectTrigger id="payer" className="w-full">
+						<SelectValue placeholder="Selecione">
+							{formState.payerId &&
+								(() => {
+									const selectedOption = payerOptions.find(
+										(opt) => opt.value === formState.payerId,
+									);
+									return selectedOption ? (
+										<PayerSelectContent
+											label={selectedOption.label}
+											avatarUrl={selectedOption.avatarUrl}
+										/>
+									) : null;
+								})()}
+						</SelectValue>
+					</SelectTrigger>
+					<SelectContent>
+						{payerOptions.map((option) => (
+							<SelectItem key={option.value} value={option.value}>
+								<PayerSelectContent
+									label={option.label}
+									avatarUrl={option.avatarUrl}
+								/>
+							</SelectItem>
+						))}
+					</SelectContent>
+				</Select>
+			</div>
+
 			<div
 				className={cn(
-					"flex items-center justify-between rounded-lg border px-3 py-2.5 transition-colors",
+					"rounded-lg border px-3 py-2.5 transition-colors",
 					formState.isSplit
 						? "border-primary/20 bg-primary/5"
 						: "border-border bg-transparent",
 				)}
 			>
-				<div className="flex items-center gap-2">
-					<div>
+				<div className="flex items-start justify-between gap-3">
+					<button
+						type="button"
+						className="min-w-0 flex-1 space-y-0.5 text-left"
+						onClick={handleSplitCardClick}
+					>
 						<p className="text-sm text-foreground">Dividir lançamento</p>
-						<p className="text-xs text-muted-foreground">
-							Atribuir parte do valor a outra pessoa.
-						</p>
-					</div>
-				</div>
-				<div className="flex items-center gap-2">
-					{formState.isSplit ? (
-						<SplitModeToggle mode={splitMode} onModeChange={setSplitMode} />
-					) : null}
+						<SplitSummaryContent summary={splitSummary} />
+					</button>
 					<CheckboxPrimitive.Root
 						checked={formState.isSplit}
-						onCheckedChange={(checked) =>
-							onFieldChange("isSplit", Boolean(checked))
-						}
+						onCheckedChange={(checked) => handleSplitToggle(Boolean(checked))}
 						aria-label="Dividir lançamento"
 						className={cn(
-							"peer size-4 shrink-0 rounded-lg border shadow-xs transition-shadow outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
+							"peer mt-0.5 size-4 shrink-0 rounded-lg border shadow-xs transition-shadow outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
 							formState.isSplit
 								? "border-primary bg-primary text-primary-foreground"
 								: "border-input dark:bg-input/30",
@@ -192,110 +164,29 @@ export function PayerSection({
 						</CheckboxPrimitive.Indicator>
 					</CheckboxPrimitive.Root>
 				</div>
-			</div>
-
-			<div className="flex w-full flex-col gap-2 md:flex-row">
-				<div className="w-full space-y-1">
-					<Label htmlFor="payer">Pessoa</Label>
-					<div className="flex gap-2">
-						<Select
-							value={formState.payerId ?? ""}
-							onValueChange={(value) => onFieldChange("payerId", value)}
-						>
-							<SelectTrigger
-								id="payer"
-								className={formState.isSplit ? "min-w-0 flex-1" : "w-full"}
-							>
-								<SelectValue placeholder="Selecione">
-									{formState.payerId &&
-										(() => {
-											const selectedOption = payerOptions.find(
-												(opt) => opt.value === formState.payerId,
-											);
-											return selectedOption ? (
-												<PayerSelectContent
-													label={selectedOption.label}
-													avatarUrl={selectedOption.avatarUrl}
-												/>
-											) : null;
-										})()}
-								</SelectValue>
-							</SelectTrigger>
-							<SelectContent>
-								{payerOptions.map((option) => (
-									<SelectItem key={option.value} value={option.value}>
-										<PayerSelectContent
-											label={option.label}
-											avatarUrl={option.avatarUrl}
-										/>
-									</SelectItem>
-								))}
-							</SelectContent>
-						</Select>
-						{formState.isSplit ? (
-							<SplitAmountField
-								mode={splitMode}
-								value={formState.primarySplitAmount}
-								totalAmount={totalAmount}
-								onAmountChange={handlePrimaryAmountChange}
-								ariaLabel="Porcentagem da pessoa"
-							/>
-						) : null}
-					</div>
-				</div>

 				{formState.isSplit ? (
-					<div className="w-full space-y-1 mb-1">
-						<Label htmlFor="secondaryPayer">Dividir com</Label>
-						<div className="flex gap-2">
-							<Select
-								value={formState.secondaryPayerId ?? ""}
-								onValueChange={(value) =>
-									onFieldChange("secondaryPayerId", value)
-								}
-							>
-								<SelectTrigger
-									id="secondaryPayer"
-									disabled={secondaryPayerOptions.length === 0}
-									className="w-[55%]"
-								>
-									<SelectValue placeholder="Selecione">
-										{formState.secondaryPayerId &&
-											(() => {
-												const selectedOption = secondaryPayerOptions.find(
-													(opt) => opt.value === formState.secondaryPayerId,
-												);
-												return selectedOption ? (
-													<PayerSelectContent
-														label={selectedOption.label}
-														avatarUrl={selectedOption.avatarUrl}
-													/>
-												) : null;
-											})()}
-									</SelectValue>
-								</SelectTrigger>
-								<SelectContent>
-									{secondaryPayerOptions.map((option) => (
-										<SelectItem key={option.value} value={option.value}>
-											<PayerSelectContent
-												label={option.label}
-												avatarUrl={option.avatarUrl}
-											/>
-										</SelectItem>
-									))}
-								</SelectContent>
-							</Select>
-							<SplitAmountField
-								mode={splitMode}
-								value={formState.secondarySplitAmount}
-								totalAmount={totalAmount}
-								onAmountChange={handleSecondaryAmountChange}
-								ariaLabel="Porcentagem do segundo pagador"
-							/>
-						</div>
-					</div>
+					<Button
+						type="button"
+						variant="outline"
+						size="sm"
+						className="mt-3 w-full"
+						onClick={() => setSplitConfigOpen(true)}
+					>
+						Editar divisão
+					</Button>
 				) : null}
 			</div>
+
+			<SplitConfigDialog
+				open={splitConfigOpen}
+				onOpenChange={setSplitConfigOpen}
+				formState={formState}
+				onFieldChange={onFieldChange}
+				payerOptions={payerOptions}
+				splitPayerOptions={splitPayerOptions}
+				totalAmount={totalAmount}
+			/>
 		</div>
 	);
 }
--- a/src/features/transactions/components/dialogs/transaction-dialog/split-config-dialog.tsx
+++ b/src/features/transactions/components/dialogs/transaction-dialog/split-config-dialog.tsx
@@ -0,0 +1,412 @@
+"use client";
+
+import { Button } from "@/shared/components/ui/button";
+import { Checkbox } from "@/shared/components/ui/checkbox";
+import { CurrencyInput } from "@/shared/components/ui/currency-input";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+} from "@/shared/components/ui/dialog";
+import { Input } from "@/shared/components/ui/input";
+import { formatCurrency } from "@/shared/utils/currency";
+import { safeToNumber } from "@/shared/utils/number";
+import { cn } from "@/shared/utils/ui";
+import { PayerSelectContent } from "../../select-items";
+import type { FormState } from "./transaction-dialog-types";
+
+const splitRowClassName =
+	"grid min-h-[2rem] items-center gap-2 rounded-lg border p-1.5 transition-colors sm:grid-cols-[minmax(0,1fr)_7rem_5.5rem]";
+const splitDisabledFieldClassName =
+	"hidden h-9 rounded-md border border-transparent sm:block";
+
+type SplitConfigDialogProps = {
+	open: boolean;
+	onOpenChange: (open: boolean) => void;
+	formState: FormState;
+	onFieldChange: <Key extends keyof FormState>(
+		key: Key,
+		value: FormState[Key],
+	) => void;
+	payerOptions: Array<{
+		value: string;
+		label: string;
+		role?: string | null;
+		avatarUrl?: string | null;
+	}>;
+	splitPayerOptions: Array<{
+		value: string;
+		label: string;
+		avatarUrl?: string | null;
+	}>;
+	totalAmount: number;
+};
+
+const getPercentValue = (amount: string, totalAmount: number) => {
+	if (totalAmount <= 0) return "0%";
+	const percentage = (safeToNumber(amount) / totalAmount) * 100;
+	return percentage.toLocaleString("pt-BR", {
+		maximumFractionDigits: 1,
+	});
+};
+
+const percentToAmount = (percent: string, totalAmount: number) => {
+	const normalized = percent.replace(/[^\d.,]/g, "").replace(",", ".");
+	const percentage = Number(normalized);
+
+	if (!Number.isFinite(percentage) || totalAmount <= 0) return "0.00";
+
+	const clamped = Math.min(100, Math.max(0, percentage));
+	return ((totalAmount * clamped) / 100).toFixed(2);
+};
+
+const getEqualAmounts = (count: number, totalAmount: number) => {
+	if (count <= 0 || totalAmount <= 0) return [];
+
+	const centsTotal = Math.round(totalAmount * 100);
+	const baseCents = Math.floor(centsTotal / count);
+	let remainder = centsTotal - baseCents * count;
+
+	return Array.from({ length: count }, () => {
+		const cents = baseCents + (remainder > 0 ? 1 : 0);
+		remainder -= 1;
+		return (cents / 100).toFixed(2);
+	});
+};
+
+type SplitSummaryPayerOption = {
+	value: string;
+	label: string;
+	avatarUrl?: string | null;
+};
+
+export function getSplitSummaryData(
+	formState: FormState,
+	payerOptions: SplitSummaryPayerOption[],
+	totalAmount: number,
+) {
+	if (!formState.isSplit) {
+		return {
+			type: "text" as const,
+			label: "Atribuir partes do valor a outras pessoas.",
+		};
+	}
+
+	const participants = [
+		formState.payerId,
+		...formState.splitShares.map((share) => share.payerId),
+	].filter(Boolean);
+
+	if (participants.length <= 1) {
+		return {
+			type: "text" as const,
+			label: "Configure as pessoas e os valores da divisão.",
+		};
+	}
+
+	const total =
+		safeToNumber(formState.primarySplitAmount) +
+		formState.splitShares.reduce(
+			(sum, share) => sum + safeToNumber(share.amount),
+			0,
+		);
+	const displayedParticipants = participants
+		.slice(0, 3)
+		.map((payerId) => payerOptions.find((option) => option.value === payerId))
+		.filter(Boolean)
+		.map((option) => ({
+			label: option?.label ?? "",
+			firstName: option?.label.split(/\s+/)[0] ?? "",
+			avatarUrl: option?.avatarUrl ?? null,
+		}));
+	const remainingCount = Math.max(0, participants.length - 3);
+	const totalLabel =
+		Math.abs(total - totalAmount) <= 0.01
+			? formatCurrency(totalAmount)
+			: `${formatCurrency(total)} de ${formatCurrency(totalAmount)}`;
+
+	return {
+		type: "split" as const,
+		count: participants.length,
+		participants: displayedParticipants,
+		remainingCount,
+		totalLabel,
+	};
+}
+
+export function getSplitSummaryLabel(
+	formState: FormState,
+	payerOptions: SplitSummaryPayerOption[],
+	totalAmount: number,
+) {
+	const summary = getSplitSummaryData(formState, payerOptions, totalAmount);
+
+	if (summary.type === "text") return summary.label;
+
+	const namesLabel = summary.participants
+		.map((participant) => participant.firstName)
+		.join(" ");
+	const remainingLabel =
+		summary.remainingCount > 0 ? ` +${summary.remainingCount}` : "";
+
+	return `${summary.count} pessoas: ${namesLabel}${remainingLabel} · ${summary.totalLabel}`;
+}
+
+export function SplitConfigDialog({
+	open,
+	onOpenChange,
+	formState,
+	onFieldChange,
+	payerOptions,
+	splitPayerOptions,
+	totalAmount,
+}: SplitConfigDialogProps) {
+	const selectedSplitIds = new Set(
+		formState.splitShares.map((share) => share.payerId),
+	);
+	const availableSplitOptions = splitPayerOptions.filter(
+		(option) => option.value !== formState.payerId,
+	);
+	const primaryPayerOption =
+		payerOptions.find((option) => option.value === formState.payerId) ??
+		payerOptions.find((option) => option.role === "admin") ??
+		null;
+	const splitTotal =
+		safeToNumber(formState.primarySplitAmount) +
+		formState.splitShares.reduce(
+			(total, share) => total + safeToNumber(share.amount),
+			0,
+		);
+	const splitDifference = totalAmount - splitTotal;
+	const hasSplitDifference = Math.abs(splitDifference) > 0.01;
+	const splitDifferenceLabel =
+		splitDifference > 0
+			? `Faltam ${formatCurrency(splitDifference)}`
+			: `Sobram ${formatCurrency(Math.abs(splitDifference))}`;
+
+	const applyEqualSplit = (shares = formState.splitShares) => {
+		const participantCount = (formState.payerId ? 1 : 0) + shares.length;
+		const amounts = getEqualAmounts(participantCount, totalAmount);
+
+		if (amounts.length === 0) return;
+
+		onFieldChange("primarySplitAmount", amounts[0] ?? "0.00");
+		onFieldChange(
+			"splitShares",
+			shares.map((share, index) => ({
+				...share,
+				amount: amounts[index + 1] ?? "0.00",
+			})),
+		);
+	};
+
+	const toggleSplitPayer = (payerId: string, checked: boolean) => {
+		const nextShares = checked
+			? [...formState.splitShares, { payerId, amount: "0.00" }]
+			: formState.splitShares.filter((share) => share.payerId !== payerId);
+
+		applyEqualSplit(nextShares);
+	};
+
+	const handleSecondaryAmountChange = (payerId: string, value: string) => {
+		const nextShares = formState.splitShares.map((share) =>
+			share.payerId === payerId ? { ...share, amount: value } : share,
+		);
+		const othersTotal = nextShares.reduce(
+			(total, share) => total + safeToNumber(share.amount),
+			0,
+		);
+
+		onFieldChange("splitShares", nextShares);
+		onFieldChange(
+			"primarySplitAmount",
+			Math.max(0, totalAmount - othersTotal).toFixed(2),
+		);
+	};
+
+	const handleSecondaryPercentChange = (payerId: string, percent: string) => {
+		handleSecondaryAmountChange(payerId, percentToAmount(percent, totalAmount));
+	};
+
+	const handleDisableSplit = () => {
+		onFieldChange("isSplit", false);
+		onOpenChange(false);
+	};
+
+	const renderPercentInput = (
+		amount: string,
+		onPercentChange: (percent: string) => void,
+		ariaLabel: string,
+	) => (
+		<div className="relative">
+			<Input
+				type="text"
+				inputMode="decimal"
+				value={getPercentValue(amount, totalAmount)}
+				onChange={(event) => onPercentChange(event.target.value)}
+				placeholder="0"
+				aria-label={ariaLabel}
+				className="h-9 pr-7 text-sm"
+			/>
+			<span className="pointer-events-none absolute top-1/2 right-2 -translate-y-1/2 text-xs text-muted-foreground">
+				%
+			</span>
+		</div>
+	);
+
+	return (
+		<Dialog open={open} onOpenChange={onOpenChange}>
+			<DialogContent className="flex max-h-[90vh] min-w-0 flex-col overflow-hidden sm:max-w-lg">
+				<DialogHeader>
+					<DialogTitle>Dividir lançamento</DialogTitle>
+					<DialogDescription>
+						Marque as pessoas e ajuste os valores se precisar.
+					</DialogDescription>
+				</DialogHeader>
+
+				<div className="min-h-0 space-y-2 overflow-y-auto pr-1">
+					<div
+						className={cn(
+							"flex flex-wrap items-center justify-between gap-2 rounded-lg border px-3 py-2.5",
+							hasSplitDifference
+								? "border-destructive/30 bg-destructive/5"
+								: "border-primary/20 bg-primary/5",
+						)}
+					>
+						<div>
+							<p className="text-sm font-medium">
+								{formatCurrency(splitTotal)} de {formatCurrency(totalAmount)}
+							</p>
+							<p
+								className={cn(
+									"text-xs",
+									hasSplitDifference
+										? "text-destructive"
+										: "text-muted-foreground",
+								)}
+							>
+								{hasSplitDifference ? splitDifferenceLabel : "Tudo certo"}
+							</p>
+						</div>
+						<Button
+							type="button"
+							variant="outline"
+							size="sm"
+							onClick={() => applyEqualSplit()}
+							disabled={
+								totalAmount <= 0 ||
+								!formState.payerId ||
+								formState.splitShares.length === 0
+							}
+							className="border-primary/30 bg-primary/10 text-primary hover:bg-primary/15 hover:text-primary"
+						>
+							Dividir igualmente
+						</Button>
+					</div>
+
+					<div className="space-y-2">
+						{primaryPayerOption ? (
+							<div className={cn(splitRowClassName, "bg-background")}>
+								<div className="flex min-w-0 items-center gap-2 text-sm">
+									<Checkbox checked disabled aria-hidden />
+									<PayerSelectContent
+										label={primaryPayerOption.label}
+										avatarUrl={primaryPayerOption.avatarUrl}
+									/>
+								</div>
+								<CurrencyInput
+									value={formState.primarySplitAmount}
+									onValueChange={(value) =>
+										onFieldChange("primarySplitAmount", value)
+									}
+									placeholder="R$ 0,00"
+									aria-label={`Valor de ${primaryPayerOption.label}`}
+									className="h-9 text-sm"
+								/>
+								{renderPercentInput(
+									formState.primarySplitAmount,
+									(percent) =>
+										onFieldChange(
+											"primarySplitAmount",
+											percentToAmount(percent, totalAmount),
+										),
+									`Percentual de ${primaryPayerOption.label}`,
+								)}
+							</div>
+						) : null}
+
+						{availableSplitOptions.map((option) => {
+							const isSelected = selectedSplitIds.has(option.value);
+							const share = formState.splitShares.find(
+								(item) => item.payerId === option.value,
+							);
+
+							return (
+								<div
+									key={option.value}
+									className={cn(
+										splitRowClassName,
+										isSelected
+											? "bg-background"
+											: "border-border/60 bg-muted/20 opacity-60",
+									)}
+								>
+									<label className="flex min-w-0 cursor-pointer items-center gap-2 text-sm">
+										<Checkbox
+											checked={isSelected}
+											onCheckedChange={(checked) =>
+												toggleSplitPayer(option.value, Boolean(checked))
+											}
+										/>
+										<span className="min-w-0 flex-1">
+											<PayerSelectContent
+												label={option.label}
+												avatarUrl={option.avatarUrl}
+											/>
+										</span>
+									</label>
+									{isSelected && share ? (
+										<>
+											<CurrencyInput
+												value={share.amount}
+												onValueChange={(value) =>
+													handleSecondaryAmountChange(option.value, value)
+												}
+												placeholder="R$ 0,00"
+												aria-label={`Valor de ${option.label}`}
+												className="h-9 text-sm"
+											/>
+											{renderPercentInput(
+												share.amount,
+												(percent) =>
+													handleSecondaryPercentChange(option.value, percent),
+												`Percentual de ${option.label}`,
+											)}
+										</>
+									) : (
+										<>
+											<div className={splitDisabledFieldClassName} />
+											<div className={splitDisabledFieldClassName} />
+										</>
+									)}
+								</div>
+							);
+						})}
+					</div>
+				</div>
+
+				<DialogFooter className="shrink-0">
+					<Button type="button" variant="outline" onClick={handleDisableSplit}>
+						Cancelar divisão
+					</Button>
+					<Button type="button" onClick={() => onOpenChange(false)}>
+						Concluir
+					</Button>
+				</DialogFooter>
+			</DialogContent>
+		</Dialog>
+	);
+}
--- a/src/features/transactions/components/dialogs/transaction-dialog/transaction-dialog-types.ts
+++ b/src/features/transactions/components/dialogs/transaction-dialog/transaction-dialog-types.ts
@@ -17,6 +17,7 @@ export interface TransactionDialogProps {
 	estabelecimentos: string[];
 	transaction?: TransactionItem;
 	defaultPeriod?: string;
+	defaultAccountId?: string | null;
 	defaultCardId?: string | null;
 	defaultPaymentMethod?: string | null;
 	defaultPurchaseDate?: string | null;
@@ -95,7 +96,7 @@ export interface CategorySectionProps extends BaseFieldSectionProps {

 export interface PayerSectionProps extends BaseFieldSectionProps {
 	payerOptions: SelectOption[];
-	secondaryPayerOptions: SelectOption[];
+	splitPayerOptions: SelectOption[];
 	totalAmount: number;
 }

--- a/src/features/transactions/components/dialogs/transaction-dialog/transaction-dialog.tsx
+++ b/src/features/transactions/components/dialogs/transaction-dialog/transaction-dialog.tsx
@@ -11,10 +11,7 @@ import {
 	detachTransactionAttachmentAction,
 	getPresignedUploadUrlAction,
 } from "@/features/transactions/actions/attachments";
-import {
-	filterSecondaryPayerOptions,
-	groupAndSortCategories,
-} from "@/features/transactions/lib/category-helpers";
+import { groupAndSortCategories } from "@/features/transactions/lib/category-helpers";
 import {
 	applyFieldDependencies,
 	buildTransactionInitialState,
@@ -50,6 +47,7 @@ import type {
 	FormState,
 	TransactionDialogProps,
 } from "./transaction-dialog-types";
+import { TransactionSummaryCard } from "./transaction-summary-card";

 export function TransactionDialog({
 	mode,
@@ -65,6 +63,7 @@ export function TransactionDialog({
 	estabelecimentos,
 	transaction,
 	defaultPeriod,
+	defaultAccountId,
 	defaultCardId,
 	defaultPaymentMethod,
 	defaultPurchaseDate,
@@ -88,6 +87,7 @@ export function TransactionDialog({

 	const [formState, setFormState] = useState<FormState>(() =>
 		buildTransactionInitialState(transaction, defaultPayerId, defaultPeriod, {
+			defaultAccountId,
 			defaultCardId,
 			defaultPaymentMethod,
 			defaultPurchaseDate,
@@ -112,6 +112,7 @@ export function TransactionDialog({
 				defaultPayerId,
 				defaultPeriod,
 				{
+					defaultAccountId,
 					defaultCardId,
 					defaultPaymentMethod,
 					defaultPurchaseDate,
@@ -151,6 +152,7 @@ export function TransactionDialog({
 		transaction,
 		defaultPayerId,
 		defaultPeriod,
+		defaultAccountId,
 		defaultCardId,
 		defaultPaymentMethod,
 		defaultPurchaseDate,
@@ -162,13 +164,6 @@ export function TransactionDialog({
 		mode,
 	]);

-	const primaryPayerId = formState.payerId;
-
-	const secondaryPayerOptions = useMemo(
-		() => filterSecondaryPayerOptions(splitPayerOptions, primaryPayerId),
-		[splitPayerOptions, primaryPayerId],
-	);
-
 	const categoryGroups = useMemo(() => {
 		const filtered = categoryOptions.filter(
 			(option) =>
@@ -255,14 +250,6 @@ export function TransactionDialog({
 			return;
 		}

-		if (formState.isSplit && !formState.secondaryPayerId) {
-			const message =
-				"Selecione a pessoa secundário para dividir o lançamento.";
-			setErrorMessage(message);
-			toast.error(message);
-			return;
-		}
-
 		const amountValue = Number(formState.amount);
 		if (Number.isNaN(amountValue)) {
 			const message = "Informe um valor válido.";
@@ -272,6 +259,44 @@ export function TransactionDialog({
 		}

 		const sanitizedAmount = Math.abs(amountValue);
+		const normalizedSplitShares = formState.isSplit
+			? [
+					{
+						payerId: formState.payerId ?? "",
+						amount: Number.parseFloat(formState.primarySplitAmount) || 0,
+					},
+					...formState.splitShares.map((share) => ({
+						payerId: share.payerId,
+						amount: Number.parseFloat(share.amount) || 0,
+					})),
+				]
+			: undefined;
+
+		if (formState.isSplit) {
+			if (formState.splitShares.length === 0) {
+				const message = "Selecione pelo menos uma pessoa para dividir.";
+				setErrorMessage(message);
+				toast.error(message);
+				return;
+			}
+
+			if (normalizedSplitShares?.some((share) => share.amount <= 0)) {
+				const message = "Informe um valor maior que zero para cada pessoa.";
+				setErrorMessage(message);
+				toast.error(message);
+				return;
+			}
+
+			const splitTotal =
+				normalizedSplitShares?.reduce((sum, share) => sum + share.amount, 0) ??
+				0;
+			if (Math.abs(splitTotal - sanitizedAmount) > 0.01) {
+				const message = "A soma das divisões deve ser igual ao valor total.";
+				setErrorMessage(message);
+				toast.error(message);
+				return;
+			}
+		}

 		if (!formState.categoryId) {
 			const message = "Selecione uma categoria.";
@@ -305,9 +330,7 @@ export function TransactionDialog({
 			paymentMethod:
 				formState.paymentMethod as CreateTransactionInput["paymentMethod"],
 			payerId: formState.payerId ?? null,
-			secondaryPayerId: formState.isSplit
-				? formState.secondaryPayerId
-				: undefined,
+			splitShares: normalizedSplitShares,
 			isSplit: formState.isSplit,
 			primarySplitAmount: formState.isSplit
 				? Number.parseFloat(formState.primarySplitAmount) || undefined
@@ -327,6 +350,12 @@ export function TransactionDialog({
 				formState.condition === "Parcelado" && formState.installmentCount
 					? Number(formState.installmentCount)
 					: undefined,
+			startInstallment:
+				mode === "create" &&
+				formState.condition === "Parcelado" &&
+				formState.startInstallment
+					? Number(formState.startInstallment)
+					: undefined,
 			recurrenceCount:
 				formState.condition === "Recorrente" && formState.recurrenceCount
 					? Number(formState.recurrenceCount)
@@ -559,7 +588,7 @@ export function TransactionDialog({
 				>
 					<div
 						ref={scrollContainerRef}
-						className="min-h-0 min-w-0 flex-1 overflow-x-hidden overflow-y-auto overscroll-contain pr-1 pb-1"
+						className="-mx-1 min-h-0 min-w-0 flex-1 overflow-x-hidden overflow-y-auto overscroll-contain px-1 pb-1"
 					>
 						{/* Detalhes */}
 						<div className="space-y-3">
@@ -588,7 +617,7 @@ export function TransactionDialog({
 							formState={formState}
 							onFieldChange={handleFieldChange}
 							payerOptions={payerOptions}
-							secondaryPayerOptions={secondaryPayerOptions}
+							splitPayerOptions={splitPayerOptions}
 							totalAmount={totalAmount}
 						/>

@@ -661,7 +690,10 @@ export function TransactionDialog({
 								className="min-w-0"
 							>
 								<CollapsibleTrigger className="flex w-full items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors cursor-pointer [&[data-state=open]>svg]:rotate-180 mt-4">
-									<RiArrowDropDownLine className="text-primary size-4 transition-transform duration-200" />
+									<RiArrowDropDownLine
+										className="text-primary size-4 transition-transform duration-200"
+										aria-hidden
+									/>
 									Condições, anotações e anexos
 								</CollapsibleTrigger>
 								<CollapsibleContent className="min-w-0 overflow-hidden space-y-3 pt-3">
@@ -697,6 +729,16 @@ export function TransactionDialog({
 								</CollapsibleContent>
 							</Collapsible>
 						)}
+
+						<div className="mt-3">
+							<TransactionSummaryCard
+								formState={formState}
+								payerOptions={payerOptions}
+								accountOptions={accountOptions}
+								cardOptions={cardOptions}
+								categoryOptions={categoryOptions}
+							/>
+						</div>
 					</div>

 					{errorMessage ? (
--- a/src/features/transactions/components/dialogs/transaction-dialog/transaction-summary-card.tsx
+++ b/src/features/transactions/components/dialogs/transaction-dialog/transaction-summary-card.tsx
@@ -0,0 +1,261 @@
+"use client";
+
+import {
+	type RemixiconComponentType,
+	RiBankCard2Line,
+	RiBankLine,
+	RiCalendarScheduleLine,
+	RiPriceTag3Line,
+} from "@remixicon/react";
+import type { ReactNode } from "react";
+import { formatCurrency } from "@/shared/utils/currency";
+import { safeToNumber } from "@/shared/utils/number";
+import { MONTH_NAMES, parsePeriod } from "@/shared/utils/period";
+import { cn } from "@/shared/utils/ui";
+import type { SelectOption } from "../../types";
+import type { FormState } from "./transaction-dialog-types";
+
+type TransactionSummaryCardProps = {
+	formState: FormState;
+	payerOptions: SelectOption[];
+	accountOptions: SelectOption[];
+	cardOptions: SelectOption[];
+	categoryOptions: SelectOption[];
+};
+
+type ShareSummary = {
+	payerId: string | undefined;
+	label: string;
+	amountCents: number;
+};
+
+type SummaryChipProps = {
+	icon: RemixiconComponentType;
+	children: ReactNode;
+};
+
+const splitCents = (totalCents: number, parts: number) => {
+	if (parts <= 0) return [];
+
+	const base = Math.trunc(totalCents / parts);
+	const remainder = totalCents % parts;
+
+	return Array.from(
+		{ length: parts },
+		(_, index) => base + (index < remainder ? 1 : 0),
+	);
+};
+
+const toCents = (value: string | number) =>
+	Math.round(safeToNumber(value) * 100);
+
+const firstName = (label: string) => label.trim().split(/\s+/)[0] || label;
+
+function getOptionLabel(options: SelectOption[], value?: string) {
+	if (!value) return null;
+	return options.find((option) => option.value === value)?.label ?? null;
+}
+
+function SummaryChip({ icon: Icon, children }: SummaryChipProps) {
+	return (
+		<span className="inline-flex items-center gap-1 rounded-md bg-background/70 px-1.5 py-0.5 text-[0.7rem] leading-5 text-foreground/80 ring-1 ring-primary/10">
+			<Icon className="size-3 shrink-0 text-primary/65" aria-hidden />
+			<span className="min-w-0 truncate">{children}</span>
+		</span>
+	);
+}
+
+function getShareSummaries(
+	formState: FormState,
+	payerOptions: SelectOption[],
+	totalCents: number,
+): ShareSummary[] {
+	if (!formState.isSplit) {
+		const label = getOptionLabel(payerOptions, formState.payerId) ?? "Pessoa";
+		return [{ payerId: formState.payerId, label, amountCents: totalCents }];
+	}
+
+	const shares = [
+		{
+			payerId: formState.payerId,
+			amountCents: toCents(formState.primarySplitAmount),
+		},
+		...formState.splitShares.map((share) => ({
+			payerId: share.payerId,
+			amountCents: toCents(share.amount),
+		})),
+	].filter((share) => share.payerId || share.amountCents > 0);
+
+	return shares.map((share, index) => ({
+		payerId: share.payerId,
+		label:
+			getOptionLabel(payerOptions, share.payerId) ??
+			(index === 0 ? "Pessoa principal" : "Pessoa"),
+		amountCents: share.amountCents,
+	}));
+}
+
+function formatInstallmentPart(totalCents: number, installmentCount: number) {
+	const parts = splitCents(totalCents, installmentCount);
+	const uniqueValues = Array.from(new Set(parts));
+
+	if (parts.length === 0) return null;
+	if (uniqueValues.length === 1) {
+		return `${installmentCount}x de ${formatCurrency(parts[0] / 100)}`;
+	}
+
+	return `${installmentCount}x de ~${formatCurrency(Math.max(...parts) / 100)}`;
+}
+
+function formatInvoicePeriod(period: string) {
+	try {
+		const { year, month } = parsePeriod(period);
+		return `${MONTH_NAMES[month - 1]} de ${year}`;
+	} catch {
+		return period;
+	}
+}
+
+export function TransactionSummaryCard({
+	formState,
+	payerOptions,
+	accountOptions,
+	cardOptions,
+	categoryOptions,
+}: TransactionSummaryCardProps) {
+	const totalCents = Math.abs(toCents(formState.amount));
+	const totalAmount = totalCents / 100;
+	const installmentCount = Math.max(
+		0,
+		Math.trunc(safeToNumber(formState.installmentCount)),
+	);
+	const startInstallment = Math.max(
+		1,
+		Math.trunc(safeToNumber(formState.startInstallment, 1)),
+	);
+	const isInstallment =
+		formState.condition === "Parcelado" && installmentCount > 1;
+	const remainingInstallments = isInstallment
+		? Math.max(0, installmentCount - startInstallment + 1)
+		: 1;
+	const shares = getShareSummaries(formState, payerOptions, totalCents);
+	const targetLabel =
+		formState.paymentMethod === "Cartão de crédito"
+			? getOptionLabel(cardOptions, formState.cardId)
+			: getOptionLabel(accountOptions, formState.accountId);
+	const categoryLabel = getOptionLabel(categoryOptions, formState.categoryId);
+	const shareTotalCents = shares.reduce(
+		(sum, share) => sum + share.amountCents,
+		0,
+	);
+	const hasSplitDifference =
+		formState.isSplit && Math.abs(shareTotalCents - totalCents) > 1;
+	const displayedShares = shares.slice(0, 3);
+	const remainingShares = Math.max(0, shares.length - displayedShares.length);
+	const operationCount =
+		Math.max(1, remainingInstallments) * Math.max(1, shares.length);
+	const statusLabel =
+		formState.paymentMethod === "Cartão de crédito"
+			? `na fatura de ${formatInvoicePeriod(formState.period)}`
+			: formState.isSettled
+				? "como pago"
+				: "em aberto";
+
+	return (
+		<section className="rounded-lg border border-primary/20 bg-primary/5 px-3 py-2.5 text-xs shadow-xs shadow-primary/5">
+			<div className="flex items-start justify-between gap-3">
+				<div className="min-w-0">
+					<p className="font-semibold text-foreground">Resumo da operação</p>
+					<p className="mt-0.5 text-muted-foreground">
+						{formState.transactionType || "Lançamento"} de{" "}
+						<span className="font-medium text-foreground">
+							{formatCurrency(totalAmount)}
+						</span>{" "}
+						{statusLabel}
+					</p>
+				</div>
+				<span
+					className={cn(
+						"shrink-0 rounded-full px-2 py-0.5 font-medium",
+						formState.transactionType === "Receita"
+							? "bg-emerald-500/10 text-emerald-700 dark:text-emerald-300"
+							: "bg-orange-500/10 text-orange-700 dark:text-orange-300",
+					)}
+				>
+					{operationCount} lançamento{operationCount > 1 ? "s" : ""}
+				</span>
+			</div>
+
+			<div className="mt-2 flex flex-wrap gap-1 text-muted-foreground">
+				<SummaryChip
+					icon={
+						formState.paymentMethod === "Cartão de crédito"
+							? RiBankCard2Line
+							: RiBankLine
+					}
+				>
+					{formState.paymentMethod || "Forma não informada"}
+				</SummaryChip>
+				{targetLabel ? (
+					<SummaryChip
+						icon={
+							formState.paymentMethod === "Cartão de crédito"
+								? RiBankCard2Line
+								: RiBankLine
+						}
+					>
+						{targetLabel}
+					</SummaryChip>
+				) : null}
+				{categoryLabel ? (
+					<SummaryChip icon={RiPriceTag3Line}>{categoryLabel}</SummaryChip>
+				) : null}
+				{isInstallment ? (
+					<SummaryChip icon={RiCalendarScheduleLine}>
+						{startInstallment > 1
+							? `${remainingInstallments} parcelas restantes de ${installmentCount}`
+							: `${installmentCount} parcelas`}
+					</SummaryChip>
+				) : null}
+			</div>
+
+			<div className="mt-2 space-y-1">
+				{displayedShares.map((share) => {
+					const installmentLabel = isInstallment
+						? formatInstallmentPart(share.amountCents, installmentCount)
+						: null;
+
+					return (
+						<div
+							key={`${share.payerId ?? share.label}-${share.amountCents}`}
+							className="flex items-center justify-between gap-3 text-muted-foreground"
+						>
+							<span className="min-w-0 truncate">{firstName(share.label)}</span>
+							<span className="shrink-0 text-right text-foreground">
+								{formatCurrency(share.amountCents / 100)}
+								{installmentLabel ? (
+									<span className="text-muted-foreground">
+										{" "}
+										· {installmentLabel}
+									</span>
+								) : null}
+							</span>
+						</div>
+					);
+				})}
+				{remainingShares > 0 ? (
+					<p className="text-muted-foreground">
+						+{remainingShares} pessoas na divisão
+					</p>
+				) : null}
+			</div>
+
+			{hasSplitDifference ? (
+				<p className="mt-2 text-[0.7rem] text-destructive">
+					A divisão soma {formatCurrency(shareTotalCents / 100)} de{" "}
+					{formatCurrency(totalAmount)}.
+				</p>
+			) : null}
+		</section>
+	);
+}
--- a/src/features/transactions/components/import/global-fields.tsx
+++ b/src/features/transactions/components/import/global-fields.tsx
@@ -74,16 +74,16 @@ export function GlobalFields({
 	return (
 		<div className="flex flex-col gap-2">
 			<p className="text-muted-foreground text-sm">
-				Aplicado a todos os lançamentos importados.
+				Aplicado aos lançamentos selecionados.
 			</p>
-			<div className="flex flex-wrap gap-4">
-				<div className="flex min-w-44 flex-col gap-1.5">
+			<div className="grid w-full grid-cols-1 items-end justify-start gap-3 sm:grid-cols-[repeat(2,minmax(0,14rem))] lg:grid-cols-[16rem_14rem_18rem_14rem]">
+				<div className="flex min-w-0 flex-col gap-1.5">
 					<Label>Conta / Cartão</Label>
 					<Select
 						value={accountCardValue ?? ""}
 						onValueChange={(v) => onAccountCardChange(v || null)}
 					>
-						<SelectTrigger>
+						<SelectTrigger className="w-full">
 							<SelectValue placeholder="Selecionar conta ou cartão…" />
 						</SelectTrigger>
 						<SelectContent>
@@ -122,14 +122,14 @@ export function GlobalFields({
 					</Select>
 				</div>

-				<div className="flex min-w-44 flex-col gap-1.5">
+				<div className="flex min-w-0 flex-col gap-1.5">
 					<Label>Pessoa</Label>
 					<Select
 						value={payerId ?? ""}
 						onValueChange={(v) => onPayerChange(v || null)}
 					>
-						<SelectTrigger>
-							<SelectValue placeholder="Selecionar pessoa…" />
+						<SelectTrigger className="w-full">
+							<SelectValue placeholder="Aplicar pessoa…" />
 						</SelectTrigger>
 						<SelectContent>
 							{payerOptions.map((opt) => (
@@ -144,10 +144,10 @@ export function GlobalFields({
 					</Select>
 				</div>

-				<div className="flex min-w-44 flex-col gap-1.5">
+				<div className="flex min-w-0 flex-col gap-1.5">
 					<Label>Categoria</Label>
 					<Select onValueChange={onBulkCategoryChange}>
-						<SelectTrigger>
+						<SelectTrigger className="w-full">
 							<SelectValue placeholder="Aplicar a todas selecionadas…" />
 						</SelectTrigger>
 						<SelectContent>
@@ -185,7 +185,7 @@ export function GlobalFields({
 				</div>

 				{isCard && (
-					<div className="flex min-w-44 flex-col gap-1.5">
+					<div className="flex min-w-0 flex-col gap-1.5">
 						<Label>Fatura</Label>
 						<PeriodPicker
 							value={invoicePeriod ?? ""}
--- a/src/features/transactions/components/import/import-page.tsx
+++ b/src/features/transactions/components/import/import-page.tsx
@@ -44,6 +44,11 @@ import {
 import { Skeleton } from "@/shared/components/ui/skeleton";
 import type { ImportStatement } from "@/shared/lib/import/types";

+const categoryGroupByTransactionType = {
+	expense: "despesa",
+	income: "receita",
+} as const;
+
 interface ImportPageProps {
 	payerOptions: SelectOption[];
 	accountOptions: SelectOption[];
@@ -69,33 +74,63 @@ export function ImportPage({
 	const [accountCardValue, setAccountCardValue] = useState<string | null>(null);
 	const [invoicePeriod, setInvoicePeriod] = useState<string | null>(null);

-	const handleParsed = useCallback(async (stmt: ImportStatement) => {
-		setStatement(stmt);
-		setIsChecking(true);
+	const categoryGroupById = useMemo(
+		() =>
+			new Map(categoryOptions.map((option) => [option.value, option.group])),
+		[categoryOptions],
+	);

-		try {
-			const fitIds = stmt.transactions
-				.map((t) => t.externalId)
-				.filter((id): id is string => id !== null);
+	const isCategoryCompatible = useCallback(
+		(
+			categoryId: string | null,
+			transactionType: ReviewRow["transactionType"],
+		) =>
+			!categoryId ||
+			categoryGroupById.get(categoryId) ===
+				categoryGroupByTransactionType[transactionType],
+		[categoryGroupById],
+	);

-			const [duplicates, categoryMappings] = await Promise.all([
-				checkDuplicateFitIds(fitIds).then((ids) => new Set(ids)),
-				fetchCategoryMappings(stmt.transactions.map((t) => t.description)),
-			]);
+	const handleParsed = useCallback(
+		async (stmt: ImportStatement) => {
+			setStatement(stmt);
+			setIsChecking(true);

-			setRows(
-				stmt.transactions.map((t) => ({
-					...t,
-					isDuplicate: t.externalId ? duplicates.has(t.externalId) : false,
-					selected: t.externalId ? !duplicates.has(t.externalId) : true,
-					categoryId:
-						categoryMappings[normalizeDescriptionKey(t.description)] ?? null,
-				})),
-			);
-		} finally {
-			setIsChecking(false);
-		}
-	}, []);
+			try {
+				const fitIds = stmt.transactions
+					.map((t) => t.externalId)
+					.filter((id): id is string => id !== null);
+
+				const [duplicates, categoryMappings] = await Promise.all([
+					checkDuplicateFitIds(fitIds).then((ids) => new Set(ids)),
+					fetchCategoryMappings(stmt.transactions.map((t) => t.description)),
+				]);
+
+				setRows(
+					stmt.transactions.map((t) => {
+						const mappedCategoryId =
+							categoryMappings[normalizeDescriptionKey(t.description)] ?? null;
+
+						return {
+							...t,
+							isDuplicate: t.externalId ? duplicates.has(t.externalId) : false,
+							selected: t.externalId ? !duplicates.has(t.externalId) : true,
+							payerId,
+							categoryId: isCategoryCompatible(
+								mappedCategoryId,
+								t.transactionType,
+							)
+								? mappedCategoryId
+								: null,
+						};
+					}),
+				);
+			} finally {
+				setIsChecking(false);
+			}
+		},
+		[isCategoryCompatible, payerId],
+	);

 	// Pré-seleciona cartão ou conta com base no tipo detectado no OFX
 	useEffect(() => {
@@ -121,7 +156,17 @@ export function ImportPage({

 	const handleCategoryChange = (index: number, categoryId: string | null) => {
 		setRows((prev) =>
-			prev.map((r, i) => (i === index ? { ...r, categoryId } : r)),
+			prev.map((r, i) =>
+				i === index && isCategoryCompatible(categoryId, r.transactionType)
+					? { ...r, categoryId }
+					: r,
+			),
+		);
+	};
+
+	const handlePayerChange = (index: number, payerId: string | null) => {
+		setRows((prev) =>
+			prev.map((r, i) => (i === index ? { ...r, payerId } : r)),
 		);
 	};

@@ -150,17 +195,36 @@ export function ImportPage({
 	};

 	const handleBulkCategoryChange = (categoryId: string) => {
-		setRows((prev) => prev.map((r) => (r.selected ? { ...r, categoryId } : r)));
+		setRows((prev) =>
+			prev.map((r) =>
+				r.selected && isCategoryCompatible(categoryId, r.transactionType)
+					? { ...r, categoryId }
+					: r,
+			),
+		);
+	};
+
+	const handleBulkPayerChange = (nextPayerId: string | null) => {
+		setPayerId(nextPayerId);
+		setRows((prev) =>
+			prev.map((r) => (r.selected ? { ...r, payerId: nextPayerId } : r)),
+		);
 	};

 	const isCard = accountCardValue?.startsWith("card:") ?? false;

-	const { selectedRows, duplicateCount, uncategorizedCount } = useMemo(() => {
+	const {
+		selectedRows,
+		duplicateCount,
+		uncategorizedCount,
+		withoutPayerCount,
+	} = useMemo(() => {
 		const selected = rows.filter((r) => r.selected);
 		return {
 			selectedRows: selected,
 			duplicateCount: rows.filter((r) => r.isDuplicate).length,
 			uncategorizedCount: selected.filter((r) => !r.categoryId).length,
+			withoutPayerCount: selected.filter((r) => !r.payerId).length,
 		};
 	}, [rows]);

@@ -168,6 +232,7 @@ export function ImportPage({
 		selectedRows.length > 0 &&
 		!!accountCardValue &&
 		uncategorizedCount === 0 &&
+		withoutPayerCount === 0 &&
 		(!isCard || !!invoicePeriod) &&
 		!isPending;

@@ -191,6 +256,7 @@ export function ImportPage({
 					description: r.description,
 					transactionType: r.transactionType,
 					categoryId: r.categoryId,
+					payerId: r.payerId,
 				})),
 				payerId,
 				accountId,
@@ -280,6 +346,7 @@ export function ImportPage({
 								selected={selectedRows.length}
 								duplicates={duplicateCount}
 								uncategorized={uncategorizedCount}
+								withoutPayer={withoutPayerCount}
 							/>

 							<GlobalFields
@@ -291,23 +358,25 @@ export function ImportPage({
 								payerId={payerId}
 								invoicePeriod={invoicePeriod}
 								onAccountCardChange={setAccountCardValue}
-								onPayerChange={setPayerId}
+								onPayerChange={handleBulkPayerChange}
 								onInvoicePeriodChange={setInvoicePeriod}
 								onBulkCategoryChange={handleBulkCategoryChange}
 							/>

 							<ReviewTable
 								rows={rows}
+								payerOptions={payerOptions}
 								categoryOptions={categoryOptions}
 								onToggle={toggleRow}
 								onToggleAll={toggleAll}
+								onPayerChange={handlePayerChange}
 								onCategoryChange={handleCategoryChange}
 								onDescriptionChange={handleDescriptionChange}
 								onUndoDuplicate={handleUndoDuplicate}
 							/>

 							{/* Sticky footer */}
-							<div className="sticky bottom-0 -mx-6 border-t bg-background px-6 py-4">
+							<div className="sticky bottom-0 -mx-6 px-6">
 								<div className="flex items-center justify-between gap-4">
 									<Button
 										variant="outline"
--- a/src/features/transactions/components/import/import-summary.tsx
+++ b/src/features/transactions/components/import/import-summary.tsx
@@ -10,6 +10,7 @@ interface ImportSummaryProps {
 	selected: number;
 	duplicates: number;
 	uncategorized: number;
+	withoutPayer: number;
 }

 export function ImportSummary({
@@ -18,9 +19,10 @@ export function ImportSummary({
 	selected,
 	duplicates,
 	uncategorized,
+	withoutPayer,
 }: ImportSummaryProps) {
 	return (
-		<Card className="flex flex-col gap-1 p-5 text-sm bg-linear-to-br from-primary/5 to-transparent">
+		<Card className="flex flex-col gap-1 p-5 text-sm bg-primary/10 shadow-none ">
 			{/* Linha 1: título */}
 			<div className="flex items-center gap-2">
 				<span className="font-medium">{statement.source}</span>
@@ -40,8 +42,7 @@ export function ImportSummary({
 				)}

 				<span>
-					<span className="font-medium text-foreground">{selected}</span>/
-					{total} selecionadas
+					{selected}/{total} selecionadas
 				</span>

 				{duplicates > 0 && (
@@ -59,6 +60,16 @@ export function ImportSummary({
 						</span>
 					)
 				)}
+
+				{withoutPayer > 0 ? (
+					<span>{withoutPayer} sem pessoa</span>
+				) : (
+					selected > 0 && (
+						<span className="text-emerald-600 dark:text-emerald-400">
+							todas com pessoa ✓
+						</span>
+					)
+				)}
 			</div>
 		</Card>
 	);
--- a/src/features/transactions/components/import/review-table.tsx
+++ b/src/features/transactions/components/import/review-table.tsx
@@ -2,7 +2,10 @@

 import { useVirtualizer } from "@tanstack/react-virtual";
 import { useRef } from "react";
-import { CategorySelectContent } from "@/features/transactions/components/select-items";
+import {
+	CategorySelectContent,
+	PayerSelectContent,
+} from "@/features/transactions/components/select-items";
 import type { SelectOption } from "@/features/transactions/components/types";
 import MoneyValues from "@/shared/components/money-values";
 import { TransactionTypeBadge } from "@/shared/components/transaction-type-badge";
@@ -31,17 +34,28 @@ import {
 import type { ImportedTransaction } from "@/shared/lib/import/types";
 import { formatDate } from "@/shared/utils/date";

+const categoryGroupByTransactionType: Record<
+	ImportedTransaction["transactionType"],
+	string
+> = {
+	expense: "despesa",
+	income: "receita",
+};
+
 export type ReviewRow = ImportedTransaction & {
 	selected: boolean;
 	isDuplicate: boolean;
 	categoryId: string | null;
+	payerId: string | null;
 };

 interface ReviewTableProps {
 	rows: ReviewRow[];
+	payerOptions: SelectOption[];
 	categoryOptions: SelectOption[];
 	onToggle: (index: number) => void;
 	onToggleAll: (selected: boolean) => void;
+	onPayerChange: (index: number, payerId: string | null) => void;
 	onCategoryChange: (index: number, categoryId: string | null) => void;
 	onDescriptionChange: (index: number, description: string) => void;
 	onUndoDuplicate: (index: number) => void;
@@ -49,9 +63,11 @@ interface ReviewTableProps {

 export function ReviewTable({
 	rows,
+	payerOptions,
 	categoryOptions,
 	onToggle,
 	onToggleAll,
+	onPayerChange,
 	onCategoryChange,
 	onDescriptionChange,
 	onUndoDuplicate,
@@ -97,6 +113,7 @@ export function ReviewTable({
 							</TableHead>
 							<TableHead className="w-24">Data</TableHead>
 							<TableHead>Descrição</TableHead>
+							<TableHead className="w-44">Pessoa</TableHead>
 							<TableHead className="w-44">Categoria</TableHead>
 							<TableHead className="w-20">Tipo</TableHead>
 							<TableHead className="w-28 text-right">Valor</TableHead>
@@ -106,7 +123,7 @@ export function ReviewTable({
 						{paddingTop > 0 && (
 							<TableRow>
 								<TableCell
-									colSpan={6}
+									colSpan={7}
 									style={{ height: paddingTop, padding: 0 }}
 								/>
 							</TableRow>
@@ -117,6 +134,11 @@ export function ReviewTable({
 								return null;
 							}
 							const index = virtualRow.index;
+							const categoryOptionsForRow = categoryOptions.filter(
+								(option) =>
+									option.group ===
+									categoryGroupByTransactionType[row.transactionType],
+							);
 							return (
 								<TableRow
 									key={row.externalId ?? `${row.date}-${index}`}
@@ -177,6 +199,26 @@ export function ReviewTable({
 											</div>
 										)}
 									</TableCell>
+									<TableCell>
+										<Select
+											value={row.payerId ?? ""}
+											onValueChange={(v) => onPayerChange(index, v || null)}
+										>
+											<SelectTrigger className="h-8 text-xs">
+												<SelectValue placeholder="Pessoa…" />
+											</SelectTrigger>
+											<SelectContent>
+												{payerOptions.map((opt) => (
+													<SelectItem key={opt.value} value={opt.value}>
+														<PayerSelectContent
+															label={opt.label}
+															avatarUrl={opt.avatarUrl}
+														/>
+													</SelectItem>
+												))}
+											</SelectContent>
+										</Select>
+									</TableCell>
 									<TableCell>
 										<Select
 											value={row.categoryId ?? ""}
@@ -186,7 +228,7 @@ export function ReviewTable({
 												<SelectValue placeholder="Categoria…" />
 											</SelectTrigger>
 											<SelectContent>
-												{categoryOptions.map((opt) => (
+												{categoryOptionsForRow.map((opt) => (
 													<SelectItem key={opt.value} value={opt.value}>
 														<CategorySelectContent
 															label={opt.label}
@@ -225,7 +267,7 @@ export function ReviewTable({
 						{paddingBottom > 0 && (
 							<TableRow>
 								<TableCell
-									colSpan={6}
+									colSpan={7}
 									style={{ height: paddingBottom, padding: 0 }}
 								/>
 							</TableRow>
--- a/src/features/transactions/components/page/transactions-page.tsx
+++ b/src/features/transactions/components/page/transactions-page.tsx
@@ -63,6 +63,7 @@ interface TransactionsPageProps {
 	categoryFilterOptions: TransactionFilterOption[];
 	accountCardFilterOptions: AccountCardFilterOption[];
 	selectedPeriod: string;
+	defaultAccountId?: string | null;
 	estabelecimentos: string[];
 	allowCreate?: boolean;
 	noteAsColumn?: boolean;
@@ -96,6 +97,7 @@ export function TransactionsPage({
 	categoryFilterOptions,
 	accountCardFilterOptions,
 	selectedPeriod,
+	defaultAccountId,
 	estabelecimentos,
 	allowCreate = true,
 	noteAsColumn = false,
@@ -562,6 +564,7 @@ export function TransactionsPage({
 				categoryOptions={categoryOptions}
 				estabelecimentos={estabelecimentos}
 				defaultPeriod={selectedPeriod}
+				defaultAccountId={defaultAccountId}
 				defaultCardId={defaultCardId}
 				defaultPaymentMethod={defaultPaymentMethod}
 				lockCardSelection={lockCardSelection}
@@ -585,6 +588,7 @@ export function TransactionsPage({
 				categoryOptions={categoryOptions}
 				estabelecimentos={estabelecimentos}
 				defaultPeriod={selectedPeriod}
+				defaultAccountId={defaultAccountId}
 				defaultCardId={defaultCardId}
 				defaultPaymentMethod={defaultPaymentMethod}
 				lockCardSelection={lockCardSelection}
@@ -648,6 +652,7 @@ export function TransactionsPage({
 				estabelecimentos={estabelecimentos}
 				transaction={transactionToCopy ?? undefined}
 				defaultPeriod={selectedPeriod}
+				defaultAccountId={defaultAccountId}
 				maxSizeMb={attachmentMaxSizeMb}
 			/>

@@ -669,6 +674,7 @@ export function TransactionsPage({
 				estabelecimentos={estabelecimentos}
 				transaction={transactionToImport ?? undefined}
 				defaultPeriod={selectedPeriod}
+				defaultAccountId={defaultAccountId}
 				isImporting={true}
 				maxSizeMb={attachmentMaxSizeMb}
 			/>
@@ -697,6 +703,7 @@ export function TransactionsPage({
 				estabelecimentos={estabelecimentos}
 				transaction={selectedTransaction ?? undefined}
 				defaultPeriod={selectedPeriod}
+				defaultAccountId={defaultAccountId}
 				onBulkEditRequest={handleBulkEditRequest}
 				onSplitEditRequest={handleSplitEditRequest}
 				maxSizeMb={attachmentMaxSizeMb}
@@ -844,16 +851,6 @@ export function TransactionsPage({
 					onOpenChange={setAnticipationHistoryOpen}
 					seriesId={selectedForAnticipation.seriesId as string}
 					lancamentoName={selectedForAnticipation.name}
-					onViewLancamento={(transactionId) => {
-						const transaction = transactionList.find(
-							(l) => l.id === transactionId,
-						);
-						if (transaction) {
-							setSelectedTransaction(transaction);
-							setDetailsOpen(true);
-							setAnticipationHistoryOpen(false);
-						}
-					}}
 				/>
 			)}
 		</>
--- a/src/features/transactions/components/select-items.tsx
+++ b/src/features/transactions/components/select-items.tsx
@@ -29,7 +29,7 @@ export function PayerSelectContent({

 	return (
 		<span className="flex items-center gap-2">
-			<Avatar className="size-5 border border-border/60 bg-background">
+			<Avatar className="size-6 border border-border/60 bg-background">
 				<AvatarImage src={avatarSrc} alt={`Avatar de ${label}`} />
 				<AvatarFallback className="text-xs font-medium uppercase">
 					{initial}
--- a/src/features/transactions/components/shared/anticipation-card.tsx
+++ b/src/features/transactions/components/shared/anticipation-card.tsx
@@ -1,21 +1,15 @@
 "use client";

-import { RiCalendarCheckLine, RiCloseLine, RiEyeLine } from "@remixicon/react";
+import { RiCalendarCheckLine } from "@remixicon/react";
 import { format } from "date-fns";
 import { ptBR } from "date-fns/locale";
-import { useTransition } from "react";
-import { toast } from "sonner";
-import { cancelInstallmentAnticipationAction } from "@/features/transactions/actions/anticipation";
+import type { ReactNode } from "react";
 import type { InstallmentAnticipationListItem } from "@/features/transactions/hooks/use-installment-anticipations";
-import { ConfirmActionDialog } from "@/shared/components/confirm-action-dialog";
 import MoneyValues from "@/shared/components/money-values";
 import { Badge } from "@/shared/components/ui/badge";
-import { Button } from "@/shared/components/ui/button";
 import {
 	Card,
 	CardContent,
-	CardDescription,
-	CardFooter,
 	CardHeader,
 	CardTitle,
 } from "@/shared/components/ui/card";
@@ -23,174 +17,129 @@ import { displayPeriod } from "@/shared/utils/period";

 interface AnticipationCardProps {
 	anticipation: InstallmentAnticipationListItem;
-	onViewLancamento?: (transactionId: string) => void;
-	onCanceled?: () => void;
 }

-export function AnticipationCard({
-	anticipation,
-	onViewLancamento,
-	onCanceled,
-}: AnticipationCardProps) {
-	const [isPending, startTransition] = useTransition();
-
+export function AnticipationCard({ anticipation }: AnticipationCardProps) {
 	const isSettled = anticipation.transaction?.isSettled === true;
-	const canCancel = !isSettled;
+	const totalAmount = Number(anticipation.totalAmount);
+	const discount = Number(anticipation.discount);
+
+	const finalAmount =
+		totalAmount < 0 ? totalAmount + discount : totalAmount - discount;
+
+	const hasDiscount = discount > 0;

 	const formatDate = (date: string) => {
-		return format(new Date(date), "dd 'de' MMMM 'de' yyyy", { locale: ptBR });
-	};
-
-	const handleCancel = async () => {
-		startTransition(async () => {
-			const result = await cancelInstallmentAnticipationAction({
-				anticipationId: anticipation.id,
-			});
-
-			if (result.success) {
-				toast.success(result.message);
-				onCanceled?.();
-			} else {
-				toast.error(result.error || "Erro ao cancelar antecipação");
-			}
+		return format(new Date(date), "dd 'de' MMMM 'de' yyyy", {
+			locale: ptBR,
 		});
 	};

-	const handleViewLancamento = () => {
-		onViewLancamento?.(anticipation.transactionId);
-	};
-
 	return (
-		<Card>
-			<CardHeader className="flex flex-row items-start justify-between space-y-0 pb-3">
-				<div className="space-y-1">
-					<CardTitle className="text-base">
-						{anticipation.installmentCount}{" "}
-						{anticipation.installmentCount === 1
-							? "parcela antecipada"
-							: "parcelas antecipadas"}
-					</CardTitle>
-					<CardDescription>
-						<RiCalendarCheckLine className="mr-1 inline size-3.5" />
-						{formatDate(anticipation.anticipationDate)}
-					</CardDescription>
+		<Card className="shadow-none py-2">
+			<CardHeader className="space-y-3 p-4 pb-1">
+				<div className="flex min-w-0 items-start justify-between gap-3">
+					<div className="min-w-0 space-y-1">
+						<CardTitle className="text-base leading-none">
+							{anticipation.installmentCount}{" "}
+							{anticipation.installmentCount === 1
+								? "parcela antecipada"
+								: "parcelas antecipadas"}
+						</CardTitle>
+
+						<div className="flex items-center gap-1.5 text-xs text-muted-foreground">
+							<RiCalendarCheckLine className="size-3 shrink-0" />
+							<span>{formatDate(anticipation.anticipationDate)}</span>
+						</div>
+					</div>
+
+					<Badge variant="secondary" className="shrink-0 rounded-full px-3">
+						{displayPeriod(anticipation.anticipationPeriod)}
+					</Badge>
+				</div>
+
+				<div className="flex items-center justify-between gap-3 rounded-lg bg-primary/10 p-3">
+					<span className="text-xs font-medium text-foreground">
+						{hasDiscount ? "Valor Final" : "Valor Total"}
+					</span>
+
+					<span className="text-lg font-semibold leading-none text-primary">
+						<MoneyValues amount={finalAmount} />
+					</span>
 				</div>
-				<Badge variant="secondary">
-					{displayPeriod(anticipation.anticipationPeriod)}
-				</Badge>
 			</CardHeader>

-			<CardContent className="space-y-3">
-				<dl className="grid grid-cols-2 gap-3 text-sm">
-					<div>
-						<dt className="text-muted-foreground">Valor Original</dt>
-						<dd className="mt-1 font-medium">
-							<MoneyValues amount={Number(anticipation.totalAmount)} />
-						</dd>
-					</div>
+			<CardContent className="px-4 pb-4 pt-0">
+				<dl className="grid grid-cols-2 gap-x-6 gap-y-3 text-sm">
+					<DetailItem label="Valor Original">
+						<MoneyValues amount={totalAmount} />
+					</DetailItem>

-					{Number(anticipation.discount) > 0 && (
-						<div>
-							<dt className="text-muted-foreground">Desconto</dt>
-							<dd className="mt-1 font-medium text-success">
-								- <MoneyValues amount={Number(anticipation.discount)} />
-							</dd>
-						</div>
+					{hasDiscount ? (
+						<DetailItem label="Desconto" valueClassName="text-success">
+							- <MoneyValues amount={discount} />
+						</DetailItem>
+					) : (
+						<div />
 					)}

-					<div
-						className={
-							Number(anticipation.discount) > 0
-								? "col-span-2 border-t pt-3"
-								: ""
-						}
-					>
-						<dt className="text-muted-foreground">
-							{Number(anticipation.discount) > 0
-								? "Valor Final"
-								: "Valor Total"}
-						</dt>
-						<dd className="mt-1 text-lg font-semibold text-primary">
-							<MoneyValues
-								amount={
-									Number(anticipation.totalAmount) < 0
-										? Number(anticipation.totalAmount) +
-											Number(anticipation.discount)
-										: Number(anticipation.totalAmount) -
-											Number(anticipation.discount)
-								}
-							/>
-						</dd>
-					</div>
+					<DetailItem label="Status">
+						<Badge
+							variant={isSettled ? "success" : "outline"}
+							className="h-5 rounded-full px-2 text-xs"
+						>
+							{isSettled ? "Pago" : "Pendente"}
+						</Badge>
+					</DetailItem>

-					<div>
-						<dt className="text-muted-foreground">Status do Lançamento</dt>
-						<dd className="mt-1">
-							<Badge variant={isSettled ? "success" : "outline"}>
-								{isSettled ? "Pago" : "Pendente"}
-							</Badge>
-						</dd>
-					</div>
-
-					{anticipation.payer && (
-						<div>
-							<dt className="text-muted-foreground">Pessoa</dt>
-							<dd className="mt-1 font-medium">{anticipation.payer.name}</dd>
-						</div>
+					{anticipation.payer ? (
+						<DetailItem label="Pessoa">{anticipation.payer.name}</DetailItem>
+					) : (
+						<div />
 					)}

-					{anticipation.category && (
-						<div>
-							<dt className="text-muted-foreground">Categoria</dt>
-							<dd className="mt-1 font-medium">{anticipation.category.name}</dd>
-						</div>
-					)}
+					{anticipation.category ? (
+						<DetailItem label="Categoria">
+							{anticipation.category.name}
+						</DetailItem>
+					) : null}
 				</dl>

-				{anticipation.note && (
-					<div className="rounded-lg border p-3">
-						<dt className="text-xs font-medium text-muted-foreground">
+				{anticipation.note ? (
+					<div className="mt-3 border-t pt-3">
+						<p className="text-xs font-medium text-muted-foreground">
 							Observação
-						</dt>
-						<dd className="mt-1 text-sm">{anticipation.note}</dd>
+						</p>
+						<p className="mt-1 text-sm leading-snug">{anticipation.note}</p>
 					</div>
-				)}
+				) : null}
 			</CardContent>
-
-			<CardFooter className="flex flex-wrap items-center justify-between gap-2 border-t pt-4">
-				<Button
-					variant="outline"
-					size="sm"
-					onClick={handleViewLancamento}
-					disabled={isPending}
-				>
-					<RiEyeLine className="mr-2 size-4" />
-					Ver Lançamento
-				</Button>
-
-				{canCancel && (
-					<ConfirmActionDialog
-						trigger={
-							<Button variant="destructive" size="sm" disabled={isPending}>
-								<RiCloseLine className="mr-2 size-4" />
-								Cancelar Antecipação
-							</Button>
-						}
-						title="Cancelar antecipação?"
-						description="Esta ação irá reverter a antecipação e restaurar as parcelas originais. O lançamento de antecipação será removido."
-						confirmLabel="Cancelar Antecipação"
-						confirmVariant="destructive"
-						pendingLabel="Cancelando..."
-						onConfirm={handleCancel}
-					/>
-				)}
-
-				{isSettled && (
-					<div className="text-xs text-muted-foreground">
-						Não é possível cancelar uma antecipação paga
-					</div>
-				)}
-			</CardFooter>
 		</Card>
 	);
 }
+
+function DetailItem({
+	label,
+	children,
+	valueClassName,
+}: {
+	label: string;
+	children: ReactNode;
+	valueClassName?: string;
+}) {
+	return (
+		<div className="min-w-0 space-y-1">
+			<dt className="text-xs font-medium leading-none text-muted-foreground">
+				{label}
+			</dt>
+
+			<dd
+				className={`truncate text-sm font-medium leading-tight ${
+					valueClassName ?? ""
+				}`}
+			>
+				{children}
+			</dd>
+		</div>
+	);
+}
--- a/src/features/transactions/components/table/transaction-actions-menu.tsx
+++ b/src/features/transactions/components/table/transaction-actions-menu.tsx
@@ -0,0 +1,157 @@
+"use client";
+
+import {
+	RiCheckLine,
+	RiDeleteBin5Line,
+	RiFileCopyLine,
+	RiFileList2Line,
+	RiHistoryLine,
+	RiMoreFill,
+	RiPencilLine,
+	RiRefundLine,
+	RiTimeLine,
+} from "@remixicon/react";
+import { Button } from "@/shared/components/ui/button";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuSeparator,
+	DropdownMenuTrigger,
+} from "@/shared/components/ui/dropdown-menu";
+import { REFUND_NOTE_PREFIX } from "@/shared/lib/accounts/constants";
+import type { TransactionItem } from "../types";
+
+type TransactionActionsMenuProps = {
+	item: TransactionItem;
+	currentUserId: string;
+	onEdit?: (item: TransactionItem) => void;
+	onCopy?: (item: TransactionItem) => void;
+	onImport?: (item: TransactionItem) => void;
+	onConfirmDelete?: (item: TransactionItem) => void;
+	onViewDetails?: (item: TransactionItem) => void;
+	onRefund?: (item: TransactionItem) => void;
+	onAnticipate?: (item: TransactionItem) => void;
+	onViewAnticipationHistory?: (item: TransactionItem) => void;
+};
+
+export function TransactionActionsMenu({
+	item,
+	currentUserId,
+	onEdit,
+	onCopy,
+	onImport,
+	onConfirmDelete,
+	onViewDetails,
+	onRefund,
+	onAnticipate,
+	onViewAnticipationHistory,
+}: TransactionActionsMenuProps) {
+	const isOwnData = item.userId === currentUserId;
+	const canRefund =
+		isOwnData &&
+		item.transactionType === "Despesa" &&
+		item.condition === "À vista" &&
+		!item.splitGroupId &&
+		!item.readonly &&
+		!item.note?.startsWith(REFUND_NOTE_PREFIX);
+	const showInstallmentActions =
+		isOwnData && item.condition === "Parcelado" && item.seriesId;
+
+	return (
+		<DropdownMenu>
+			<DropdownMenuTrigger asChild>
+				<Button variant="ghost" size="icon-sm">
+					<RiMoreFill className="size-4" aria-hidden />
+					<span className="sr-only">Abrir ações do lançamento</span>
+				</Button>
+			</DropdownMenuTrigger>
+			<DropdownMenuContent align="end" className="w-44">
+				<DropdownMenuItem
+					onSelect={() => onViewDetails?.(item)}
+					disabled={!onViewDetails}
+				>
+					<RiFileList2Line className="size-4" aria-hidden />
+					Detalhes
+				</DropdownMenuItem>
+
+				{isOwnData ? (
+					<DropdownMenuItem
+						onSelect={() => onEdit?.(item)}
+						disabled={item.readonly || !onEdit}
+					>
+						<RiPencilLine className="size-4" aria-hidden />
+						Editar
+					</DropdownMenuItem>
+				) : null}
+
+				{!item.readonly && isOwnData ? (
+					<DropdownMenuItem onSelect={() => onCopy?.(item)} disabled={!onCopy}>
+						<RiFileCopyLine className="size-4" aria-hidden />
+						Copiar
+					</DropdownMenuItem>
+				) : null}
+
+				{!item.readonly && !isOwnData ? (
+					<DropdownMenuItem
+						onSelect={() => onImport?.(item)}
+						disabled={!onImport}
+					>
+						<RiFileCopyLine className="size-4" aria-hidden />
+						Importar para Minha Conta
+					</DropdownMenuItem>
+				) : null}
+
+				{canRefund ? (
+					<DropdownMenuItem
+						onSelect={() => onRefund?.(item)}
+						disabled={!onRefund}
+					>
+						<RiRefundLine className="size-4" aria-hidden />
+						Reembolso
+					</DropdownMenuItem>
+				) : null}
+
+				{isOwnData ? (
+					<DropdownMenuItem
+						variant="destructive"
+						onSelect={() => onConfirmDelete?.(item)}
+						disabled={item.readonly || !onConfirmDelete}
+					>
+						<RiDeleteBin5Line className="size-4" aria-hidden />
+						Remover
+					</DropdownMenuItem>
+				) : null}
+
+				{showInstallmentActions ? (
+					<>
+						<DropdownMenuSeparator />
+
+						{!item.isAnticipated && onAnticipate ? (
+							<DropdownMenuItem onSelect={() => onAnticipate(item)}>
+								<RiTimeLine className="size-4" aria-hidden />
+								Antecipar Parcelas
+							</DropdownMenuItem>
+						) : null}
+
+						{onViewAnticipationHistory ? (
+							<DropdownMenuItem
+								onSelect={() => onViewAnticipationHistory(item)}
+							>
+								<RiHistoryLine className="size-4" aria-hidden />
+								Histórico de Antecipações
+							</DropdownMenuItem>
+						) : null}
+
+						{item.isAnticipated ? (
+							<DropdownMenuItem disabled>
+								<RiCheckLine className="size-4 text-success" aria-hidden />
+								Parcela Antecipada
+							</DropdownMenuItem>
+						) : null}
+					</>
+				) : null}
+			</DropdownMenuContent>
+		</DropdownMenu>
+	);
+}
--- a/src/features/transactions/components/table/transaction-settlement-button.tsx
+++ b/src/features/transactions/components/table/transaction-settlement-button.tsx
@@ -0,0 +1,116 @@
+"use client";
+
+import {
+	RiBankCard2Line,
+	RiCheckboxBlankCircleLine,
+	RiCheckboxCircleFill,
+} from "@remixicon/react";
+import {
+	CREDIT_CARD_PAYMENT_METHOD,
+	SETTLEABLE_PAYMENT_METHODS,
+} from "@/features/transactions/lib/constants";
+import { Button } from "@/shared/components/ui/button";
+import { Spinner } from "@/shared/components/ui/spinner";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "@/shared/components/ui/tooltip";
+import { cn } from "@/shared/utils/ui";
+import type { TransactionItem } from "../types";
+
+type TransactionSettlementButtonProps = {
+	item: TransactionItem;
+	isLoading: boolean;
+	onToggle?: (item: TransactionItem) => void;
+};
+
+export function TransactionSettlementButton({
+	item,
+	isLoading,
+	onToggle,
+}: TransactionSettlementButtonProps) {
+	const isCreditCard = item.paymentMethod === CREDIT_CARD_PAYMENT_METHOD;
+	const canToggleSettlement = (
+		SETTLEABLE_PAYMENT_METHODS as readonly string[]
+	).includes(item.paymentMethod);
+
+	if (!canToggleSettlement && !isCreditCard) {
+		return null;
+	}
+
+	if (isCreditCard) {
+		const invoicePaid = Boolean(item.isSettled);
+
+		return (
+			<Tooltip>
+				<TooltipTrigger asChild>
+					<span className="inline-flex">
+						<Button
+							variant="ghost"
+							size="icon-sm"
+							disabled
+							className={cn(
+								"transition-colors",
+								invoicePaid
+									? "bg-success/10 text-success"
+									: "text-muted-foreground/30",
+							)}
+						>
+							{invoicePaid ? (
+								<RiCheckboxCircleFill className="size-4" aria-hidden />
+							) : (
+								<RiBankCard2Line className="size-4" aria-hidden />
+							)}
+							<span className="sr-only">
+								{invoicePaid
+									? "Fatura paga"
+									: "Lançamento de cartão de crédito"}
+							</span>
+						</Button>
+					</span>
+				</TooltipTrigger>
+				<TooltipContent side="top" className="max-w-48 text-center">
+					{invoicePaid
+						? "Fatura paga"
+						: "Lançamentos de cartão de crédito são liquidados ao pagar a fatura"}
+				</TooltipContent>
+			</Tooltip>
+		);
+	}
+
+	const settled = Boolean(item.isSettled);
+
+	return (
+		<Tooltip>
+			<TooltipTrigger asChild>
+				<Button
+					variant="ghost"
+					size="icon-sm"
+					onClick={() => onToggle?.(item)}
+					disabled={isLoading || item.readonly}
+					className={cn(
+						"transition-colors",
+						settled
+							? "bg-success/10 text-success hover:bg-success/20 hover:text-success"
+							: "text-muted-foreground hover:text-foreground",
+					)}
+				>
+					{isLoading ? (
+						<Spinner className="size-4" />
+					) : settled ? (
+						<RiCheckboxCircleFill className="size-4" aria-hidden />
+					) : (
+						<RiCheckboxBlankCircleLine className="size-4" aria-hidden />
+					)}
+					<span className="sr-only">
+						{settled ? "Desfazer pagamento" : "Marcar como pago"}
+					</span>
+				</Button>
+			</TooltipTrigger>
+			<TooltipContent side="top">
+				{settled ? "Desfazer pagamento" : "Marcar como pago"}
+			</TooltipContent>
+		</Tooltip>
+	);
+}
--- a/src/features/transactions/components/table/transactions-columns.tsx
+++ b/src/features/transactions/components/table/transactions-columns.tsx
@@ -1,28 +1,13 @@
 import {
 	RiAttachment2,
-	RiBankCard2Line,
 	RiChat1Line,
-	RiCheckboxBlankCircleLine,
-	RiCheckboxCircleFill,
-	RiCheckLine,
-	RiDeleteBin5Line,
-	RiFileCopyLine,
-	RiFileList2Line,
 	RiGroupLine,
-	RiHistoryLine,
-	RiMoreFill,
-	RiPencilLine,
-	RiRefundLine,
 	RiTimeLine,
 } from "@remixicon/react";
 import type { ColumnDef } from "@tanstack/react-table";
 import Image from "next/image";
 import Link from "next/link";
 import { DEFAULT_TRANSACTIONS_COLUMN_ORDER } from "@/features/transactions/lib/column-order";
-import {
-	CREDIT_CARD_PAYMENT_METHOD,
-	SETTLEABLE_PAYMENT_METHODS,
-} from "@/features/transactions/lib/constants";
 import {
 	CategoryIconBadge,
 	EstablishmentLogo,
@@ -35,28 +20,20 @@ import {
 	AvatarImage,
 } from "@/shared/components/ui/avatar";
 import { Badge } from "@/shared/components/ui/badge";
-import { Button } from "@/shared/components/ui/button";
 import { Checkbox } from "@/shared/components/ui/checkbox";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "@/shared/components/ui/dropdown-menu";
-import { Spinner } from "@/shared/components/ui/spinner";
 import {
 	Tooltip,
 	TooltipContent,
 	TooltipTrigger,
 } from "@/shared/components/ui/tooltip";
-import { REFUND_NOTE_PREFIX } from "@/shared/lib/accounts/constants";
 import { resolveLogoSrc } from "@/shared/lib/logo";
 import { getAvatarSrc } from "@/shared/lib/payers/utils";
 import { formatDate } from "@/shared/utils/date";
 import { getConditionIcon, getPaymentMethodIcon } from "@/shared/utils/icons";
 import { cn } from "@/shared/utils/ui";
 import type { TransactionItem } from "../types";
+import { TransactionActionsMenu } from "./transaction-actions-menu";
+import { TransactionSettlementButton } from "./transaction-settlement-button";

 type BuildColumnsArgs = {
 	currentUserId: string;
@@ -426,7 +403,7 @@ function buildColumns({
 				const initial = displayName.charAt(0).toUpperCase() || "?";
 				const content = (
 					<>
-						<Avatar className="size-7">
+						<Avatar className="size-8">
 							<AvatarImage src={avatarSrc} alt={`Avatar de ${label}`} />
 							<AvatarFallback className="text-xs font-medium uppercase">
 								{initial}
@@ -477,15 +454,21 @@ function buildColumns({
 				const content = (
 					<span className="inline-flex items-center gap-2">
 						{logoSrc && (
-							<Image
-								src={logoSrc}
-								alt={`Logo de ${label}`}
-								width={30}
-								height={30}
-								className="rounded-full"
-							/>
+							<Avatar className="size-8">
+								<AvatarImage src={logoSrc} alt={`Logo de ${label}`} />
+								<AvatarFallback className="text-xs font-medium uppercase">
+									{label}
+								</AvatarFallback>
+							</Avatar>
 						)}
-						<span className="truncate">{label}</span>
+						<span
+							className={cn(
+								"truncate underline-offset-2",
+								isOwnData && href && "group-hover:underline",
+							)}
+						>
+							{label}
+						</span>
 					</span>
 				);

@@ -503,7 +486,7 @@ function buildColumns({
 				return (
 					<Tooltip>
 						<TooltipTrigger asChild>
-							<Link href={href} className="hover:underline">
+							<Link href={href} className="group">
 								{content}
 							</Link>
 						</TooltipTrigger>
@@ -545,195 +528,23 @@ function buildColumns({
 			enableSorting: false,
 			cell: ({ row }) => (
 				<div className="flex items-center gap-2">
-					{(() => {
-						const paymentMethod = row.original.paymentMethod;
-						const isCreditCard = paymentMethod === CREDIT_CARD_PAYMENT_METHOD;
-						const canToggleSettlement = (
-							SETTLEABLE_PAYMENT_METHODS as readonly string[]
-						).includes(paymentMethod);
-
-						if (!canToggleSettlement && !isCreditCard) return null;
-
-						if (isCreditCard) {
-							const invoicePaid = Boolean(row.original.isSettled);
-							return (
-								<Tooltip>
-									<TooltipTrigger asChild>
-										<span className="inline-flex">
-											<Button
-												variant="ghost"
-												size="icon-sm"
-												disabled
-												className={cn(
-													"transition-colors",
-													invoicePaid
-														? "bg-success/10 text-success"
-														: "text-muted-foreground/30",
-												)}
-											>
-												{invoicePaid ? (
-													<RiCheckboxCircleFill className="size-4" />
-												) : (
-													<RiBankCard2Line className="size-4" />
-												)}
-												<span className="sr-only">
-													{invoicePaid
-														? "Fatura paga"
-														: "Lançamento de cartão de crédito"}
-												</span>
-											</Button>
-										</span>
-									</TooltipTrigger>
-									<TooltipContent side="top" className="max-w-48 text-center">
-										{invoicePaid
-											? "Fatura paga"
-											: "Lançamentos de cartão de crédito são liquidados ao pagar a fatura"}
-									</TooltipContent>
-								</Tooltip>
-							);
-						}
-
-						const readOnly = row.original.readonly;
-						const loading = isSettlementLoading(row.original.id);
-						const settled = Boolean(row.original.isSettled);
-
-						return (
-							<Tooltip>
-								<TooltipTrigger asChild>
-									<Button
-										variant="ghost"
-										size="icon-sm"
-										onClick={() => handleToggleSettlement(row.original)}
-										disabled={loading || readOnly}
-										className={cn(
-											"transition-colors",
-											settled
-												? "bg-success/10 text-success hover:bg-success/20 hover:text-success"
-												: "text-muted-foreground hover:text-foreground",
-										)}
-									>
-										{loading ? (
-											<Spinner className="size-4" />
-										) : settled ? (
-											<RiCheckboxCircleFill className="size-4" />
-										) : (
-											<RiCheckboxBlankCircleLine className="size-4" />
-										)}
-										<span className="sr-only">
-											{settled ? "Desfazer pagamento" : "Marcar como pago"}
-										</span>
-									</Button>
-								</TooltipTrigger>
-								<TooltipContent side="top">
-									{settled ? "Desfazer pagamento" : "Marcar como pago"}
-								</TooltipContent>
-							</Tooltip>
-						);
-					})()}
-
-					<DropdownMenu>
-						<DropdownMenuTrigger asChild>
-							<Button variant="ghost" size="icon-sm">
-								<RiMoreFill className="size-4" />
-								<span className="sr-only">Abrir ações do lançamento</span>
-							</Button>
-						</DropdownMenuTrigger>
-						<DropdownMenuContent align="end" className="w-44">
-							<DropdownMenuItem
-								onSelect={() => handleViewDetails(row.original)}
-							>
-								<RiFileList2Line className="size-4" />
-								Detalhes
-							</DropdownMenuItem>
-							{row.original.userId === currentUserId && (
-								<DropdownMenuItem
-									onSelect={() => handleEdit(row.original)}
-									disabled={row.original.readonly}
-								>
-									<RiPencilLine className="size-4" />
-									Editar
-								</DropdownMenuItem>
-							)}
-							{row.original.categoriaName !== "Pagamentos" &&
-								row.original.userId === currentUserId && (
-									<DropdownMenuItem onSelect={() => handleCopy(row.original)}>
-										<RiFileCopyLine className="size-4" />
-										Copiar
-									</DropdownMenuItem>
-								)}
-							{row.original.categoriaName !== "Pagamentos" &&
-								row.original.userId !== currentUserId && (
-									<DropdownMenuItem onSelect={() => handleImport(row.original)}>
-										<RiFileCopyLine className="size-4" />
-										Importar para Minha Conta
-									</DropdownMenuItem>
-								)}
-							{(() => {
-								const item = row.original;
-								const canRefund =
-									item.userId === currentUserId &&
-									item.transactionType === "Despesa" &&
-									item.condition === "À vista" &&
-									!item.splitGroupId &&
-									!item.readonly &&
-									!item.note?.startsWith(REFUND_NOTE_PREFIX);
-
-								if (!canRefund) return null;
-
-								return (
-									<DropdownMenuItem onSelect={() => handleRefund(item)}>
-										<RiRefundLine className="size-4" />
-										Reembolso
-									</DropdownMenuItem>
-								);
-							})()}
-							{row.original.userId === currentUserId && (
-								<DropdownMenuItem
-									variant="destructive"
-									onSelect={() => handleConfirmDelete(row.original)}
-									disabled={row.original.readonly}
-								>
-									<RiDeleteBin5Line className="size-4" />
-									Remover
-								</DropdownMenuItem>
-							)}
-
-							{row.original.userId === currentUserId &&
-								row.original.condition === "Parcelado" &&
-								row.original.seriesId && (
-									<>
-										<DropdownMenuSeparator />
-
-										{!row.original.isAnticipated && onAnticipate && (
-											<DropdownMenuItem
-												onSelect={() => handleAnticipate(row.original)}
-											>
-												<RiTimeLine className="size-4" />
-												Antecipar Parcelas
-											</DropdownMenuItem>
-										)}
-
-										{onViewAnticipationHistory && (
-											<DropdownMenuItem
-												onSelect={() =>
-													handleViewAnticipationHistory(row.original)
-												}
-											>
-												<RiHistoryLine className="size-4" />
-												Histórico de Antecipações
-											</DropdownMenuItem>
-										)}
-
-										{row.original.isAnticipated && (
-											<DropdownMenuItem disabled>
-												<RiCheckLine className="size-4 text-success" />
-												Parcela Antecipada
-											</DropdownMenuItem>
-										)}
-									</>
-								)}
-						</DropdownMenuContent>
-					</DropdownMenu>
+					<TransactionSettlementButton
+						item={row.original}
+						isLoading={isSettlementLoading(row.original.id)}
+						onToggle={handleToggleSettlement}
+					/>
+					<TransactionActionsMenu
+						item={row.original}
+						currentUserId={currentUserId}
+						onEdit={handleEdit}
+						onCopy={handleCopy}
+						onImport={handleImport}
+						onConfirmDelete={handleConfirmDelete}
+						onViewDetails={handleViewDetails}
+						onRefund={handleRefund}
+						onAnticipate={handleAnticipate}
+						onViewAnticipationHistory={handleViewAnticipationHistory}
+					/>
 				</div>
 			),
 		});
--- a/src/features/transactions/components/table/transactions-filters.tsx
+++ b/src/features/transactions/components/table/transactions-filters.tsx
@@ -23,12 +23,17 @@ import {
 import {
 	AMOUNT_MAX_PARAM,
 	AMOUNT_MIN_PARAM,
+	DATE_END_PARAM,
+	DATE_START_PARAM,
 	PAYMENT_METHODS,
 	SETTLED_FILTER_VALUES,
 	TRANSACTION_CONDITIONS,
 	TRANSACTION_TYPES,
 } from "@/features/transactions/lib/constants";
-import { parsePositiveAmount } from "@/features/transactions/lib/page-helpers";
+import {
+	parseDateFilterParam,
+	parsePositiveAmount,
+} from "@/features/transactions/lib/page-helpers";
 import { Button } from "@/shared/components/ui/button";
 import { Checkbox } from "@/shared/components/ui/checkbox";
 import {
@@ -39,6 +44,7 @@ import {
 	CommandItem,
 	CommandList,
 } from "@/shared/components/ui/command";
+import { DatePicker } from "@/shared/components/ui/date-picker";
 import {
 	Drawer,
 	DrawerContent,
@@ -60,7 +66,13 @@ import {
 	SelectItem,
 	SelectTrigger,
 } from "@/shared/components/ui/select";
+import { Separator } from "@/shared/components/ui/separator";
+import { Spinner } from "@/shared/components/ui/spinner";
 import { Switch } from "@/shared/components/ui/switch";
+import {
+	ToggleGroup,
+	ToggleGroupItem,
+} from "@/shared/components/ui/toggle-group";
 import { slugify } from "@/shared/utils/string";
 import { cn } from "@/shared/utils/ui";
 import {
@@ -83,6 +95,9 @@ const normalizeAmountParam = (raw: string): string | null => {
 	return parsed === null ? null : parsed.toString();
 };

+const normalizeDateParam = (raw: string): string | null =>
+	parseDateFilterParam(raw.trim());
+
 function useDebouncedAmountFilter(
 	param: string,
 	searchParams: URLSearchParams | ReadonlyURLSearchParams,
@@ -135,6 +150,7 @@ function FilterSelect({
 		value === FILTER_EMPTY_VALUE
 			? placeholder
 			: (current?.label ?? placeholder);
+	const hasSelection = value !== FILTER_EMPTY_VALUE && Boolean(current);

 	return (
 		<Select
@@ -148,8 +164,13 @@ function FilterSelect({
 				className={cn("text-sm border-dashed", widthClass)}
 				disabled={disabled}
 			>
-				<span className="truncate">
-					{value !== FILTER_EMPTY_VALUE && current && renderContent
+				<span
+					className={cn(
+						"truncate",
+						hasSelection ? "text-foreground" : "text-muted-foreground",
+					)}
+				>
+					{current && renderContent
 						? renderContent(current.label)
 						: displayLabel}
 				</span>
@@ -173,6 +194,16 @@ type MultiOption = {
 	render?: ReactNode;
 };

+const getCategoryFilterGroup = (type?: string | null) => {
+	if (type === "receita") {
+		return "Receitas";
+	}
+	if (type === "despesa") {
+		return "Despesas";
+	}
+	return "Outras";
+};
+
 interface MultiSelectFilterProps {
 	placeholder: string;
 	options: MultiOption[];
@@ -255,15 +286,25 @@ function MultiSelectFilter({
 					role="combobox"
 					aria-expanded={open}
 					className={cn(
-						"justify-between text-sm border-dashed font-normal",
+						"justify-between text-sm border-dashed font-normal shadow-none",
 						widthClass,
 					)}
 					disabled={disabled}
 				>
-					<span className="truncate flex items-center gap-2">
+					<span
+						className={cn(
+							"truncate flex items-center gap-2",
+							selectedOptions.length > 0
+								? "text-foreground"
+								: "text-muted-foreground",
+						)}
+					>
 						{triggerLabel}
 					</span>
-					<RiExpandUpDownLine className="ml-2 size-4 shrink-0 opacity-50" />
+					<RiExpandUpDownLine
+						className="ml-2 size-4 shrink-0 opacity-50"
+						aria-hidden
+					/>
 				</Button>
 			</PopoverTrigger>
 			<PopoverContent align="start" className="w-[260px] p-0">
@@ -304,7 +345,10 @@ function MultiSelectFilter({
 												{option.render ?? option.label}
 											</span>
 											{isSelected ? (
-												<RiCheckLine className="ml-auto size-4 shrink-0" />
+												<RiCheckLine
+													className="ml-auto size-4 shrink-0"
+													aria-hidden
+												/>
 											) : null}
 										</CommandItem>
 									);
@@ -392,6 +436,13 @@ export function TransactionsFilters({
 		[searchParams, pathname, router],
 	);

+	const handleDateFilterChange = useCallback(
+		(key: string, value: string) => {
+			handleFilterChange(key, normalizeDateParam(value));
+		},
+		[handleFilterChange],
+	);
+
 	const [searchValue, setSearchValue] = useState(searchParams.get("q") ?? "");
 	const currentSearchParam = searchParams.get("q") ?? "";

@@ -484,6 +535,7 @@ export function TransactionsFilters({
 			categoryOptions.map((option) => ({
 				value: option.slug,
 				label: option.label,
+				group: getCategoryFilterGroup(option.type),
 				render: (
 					<CategorySelectContent label={option.label} icon={option.icon} />
 				),
@@ -509,27 +561,49 @@ export function TransactionsFilters({
 	);

 	const [drawerOpen, setDrawerOpen] = useState(false);
-
-	const hasActiveFilters =
-		searchParams.get("type") ||
-		searchParams.getAll("condition").length > 0 ||
-		searchParams.getAll("payment").length > 0 ||
-		searchParams.getAll("payer").length > 0 ||
-		searchParams.getAll("category").length > 0 ||
-		searchParams.getAll("accountCard").length > 0 ||
-		searchParams.get("settled") ||
-		searchParams.get("hasAttachment") ||
-		searchParams.get("isDivided") ||
-		searchParams.get(AMOUNT_MIN_PARAM) ||
-		searchParams.get(AMOUNT_MAX_PARAM);
+	const hasDateRangeFilter =
+		Boolean(searchParams.get(DATE_START_PARAM)) ||
+		Boolean(searchParams.get(DATE_END_PARAM));
+	const hasAmountFilter =
+		Boolean(searchParams.get(AMOUNT_MIN_PARAM)) ||
+		Boolean(searchParams.get(AMOUNT_MAX_PARAM));
+	const activeFilterCount = [
+		Boolean(searchParams.get("type")),
+		searchParams.getAll("condition").length > 0,
+		searchParams.getAll("payment").length > 0,
+		searchParams.getAll("payer").length > 0,
+		searchParams.getAll("category").length > 0,
+		searchParams.getAll("accountCard").length > 0,
+		Boolean(searchParams.get("settled")),
+		Boolean(searchParams.get("hasAttachment")),
+		Boolean(searchParams.get("isDivided")),
+		hasAmountFilter,
+		hasDateRangeFilter,
+	].filter(Boolean).length;
+	const hasActiveFilters = activeFilterCount > 0;
+	const settledFilterValue = searchParams.get("settled") ?? FILTER_EMPTY_VALUE;

 	const handleResetFilters = () => {
 		handleReset();
 		setDrawerOpen(false);
 	};

+	const handleResetDateRange = () => {
+		const nextParams = new URLSearchParams(searchParams.toString());
+		nextParams.delete(DATE_START_PARAM);
+		nextParams.delete(DATE_END_PARAM);
+		nextParams.delete("page");
+		startTransition(() => {
+			const target = nextParams.toString()
+				? `${pathname}?${nextParams.toString()}`
+				: pathname;
+			router.replace(target, { scroll: false });
+		});
+	};
+
 	return (
 		<div
+			aria-busy={isPending}
 			className={cn(
 				"flex flex-col gap-2 md:flex-row md:flex-wrap md:items-center",
 				className,
@@ -553,7 +627,7 @@ export function TransactionsFilters({
 						aria-label="Limpar busca"
 						className="absolute top-1/2 right-2 -translate-y-1/2 rounded-sm p-0.5 text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
 					>
-						<RiCloseLine className="size-4" />
+						<RiCloseLine className="size-4" aria-hidden />
 					</button>
 				) : null}
 			</div>
@@ -575,12 +649,19 @@ export function TransactionsFilters({
 							<Button
 								variant="outline"
 								className="flex-1 md:flex-none text-sm border-dashed relative bg-transparent"
-								aria-label="Abrir filtros"
+								aria-label={isPending ? "Aplicando filtros" : "Abrir filtros"}
 							>
-								<RiFilterLine className="size-4" />
-								Filtros
+								{isPending ? (
+									<Spinner className="size-4" role="presentation" aria-hidden />
+								) : (
+									<RiFilterLine className="size-4" aria-hidden />
+								)}
+								{isPending ? "Aplicando..." : "Filtros"}
 								{hasActiveFilters && (
-									<span className="absolute -top-1 -right-1 size-3 rounded-full bg-primary" />
+									<span
+										className="absolute -top-1 -right-1 size-3 rounded-full bg-primary"
+										aria-hidden
+									/>
 								)}
 							</Button>
 						</DrawerTrigger>
@@ -594,7 +675,7 @@ export function TransactionsFilters({
 								aria-label="Limpar filtros"
 								className="text-xs text-muted-foreground hover:text-foreground h-9 px-2"
 							>
-								<RiCloseLine className="size-3.5" />
+								<RiCloseLine className="size-3.5" aria-hidden />
 								Limpar
 							</Button>
 						)}
@@ -607,182 +688,235 @@ export function TransactionsFilters({
 							</DrawerHeader>

 							<div className="flex-1 overflow-y-auto px-4 space-y-4">
-								<div className="space-y-2">
-									<label className="text-sm font-medium">
-										Tipo de Lançamento
-									</label>
-									<FilterSelect
-										param="type"
-										placeholder="Todos"
-										options={TRANSACTION_TYPES.map((v) => ({
-											value: slugify(v),
-											label: v,
-										}))}
-										widthClass="w-full border-dashed"
-										disabled={isPending}
-										getParamValue={getParamValue}
-										onChange={handleFilterChange}
-										renderContent={(label) => (
-											<TransactionTypeSelectContent label={label} />
-										)}
-									/>
-								</div>
+								<div>
+									<div className="grid gap-3 sm:grid-cols-2">
+										<div className="space-y-1.5">
+											<label className="text-xs font-medium text-muted-foreground">
+												Tipo de lançamento
+											</label>
+											<FilterSelect
+												param="type"
+												placeholder="Todos"
+												options={TRANSACTION_TYPES.map((v) => ({
+													value: slugify(v),
+													label: v,
+												}))}
+												widthClass="w-full border-dashed"
+												disabled={isPending}
+												getParamValue={getParamValue}
+												onChange={handleFilterChange}
+												renderContent={(label) => (
+													<TransactionTypeSelectContent label={label} />
+												)}
+											/>
+										</div>

-								<div className="space-y-2">
-									<label className="text-sm font-medium">
-										Condição de Lançamento
-									</label>
-									<MultiSelectFilter
-										placeholder="Todas"
-										options={conditionOptions}
-										selected={getParamValues("condition")}
-										onChange={(values) =>
-											handleMultiFilterChange("condition", values)
-										}
-										disabled={isPending}
-									/>
-								</div>
+										<div className="space-y-1.5">
+											<label className="text-xs font-medium text-muted-foreground">
+												Condição de pagamento
+											</label>
+											<MultiSelectFilter
+												placeholder="Todas"
+												options={conditionOptions}
+												selected={getParamValues("condition")}
+												onChange={(values) =>
+													handleMultiFilterChange("condition", values)
+												}
+												disabled={isPending}
+											/>
+										</div>

-								<div className="space-y-2">
-									<label className="text-sm font-medium">
-										Forma de Pagamento
-									</label>
-									<MultiSelectFilter
-										placeholder="Todas"
-										options={paymentOptions}
-										selected={getParamValues("payment")}
-										onChange={(values) =>
-											handleMultiFilterChange("payment", values)
-										}
-										disabled={isPending}
-									/>
-								</div>
+										<div className="space-y-1.5">
+											<label className="text-xs font-medium text-muted-foreground">
+												Forma de pagamento
+											</label>
+											<MultiSelectFilter
+												placeholder="Todas"
+												options={paymentOptions}
+												selected={getParamValues("payment")}
+												onChange={(values) =>
+													handleMultiFilterChange("payment", values)
+												}
+												disabled={isPending}
+											/>
+										</div>

-								<div className="space-y-2">
-									<label className="text-sm font-medium">Pessoa</label>
-									<MultiSelectFilter
-										placeholder="Todas"
-										options={payerMultiOptions}
-										selected={getParamValues("payer")}
-										onChange={(values) =>
-											handleMultiFilterChange("payer", values)
-										}
-										disabled={isPending}
-										searchable
-										searchPlaceholder="Buscar pessoa..."
-									/>
-								</div>
+										<div className="space-y-1.5">
+											<label className="text-xs font-medium text-muted-foreground">
+												Pessoa
+											</label>
+											<MultiSelectFilter
+												placeholder="Todas"
+												options={payerMultiOptions}
+												selected={getParamValues("payer")}
+												onChange={(values) =>
+													handleMultiFilterChange("payer", values)
+												}
+												disabled={isPending}
+												searchable
+												searchPlaceholder="Buscar pessoa..."
+											/>
+										</div>

-								<div className="space-y-2">
-									<label className="text-sm font-medium">Categoria</label>
-									<MultiSelectFilter
-										placeholder="Todas"
-										options={categoryMultiOptions}
-										selected={getParamValues("category")}
-										onChange={(values) =>
-											handleMultiFilterChange("category", values)
-										}
-										disabled={isPending}
-										searchable
-										searchPlaceholder="Buscar categoria..."
-									/>
-								</div>
+										<div className="space-y-1.5">
+											<label className="text-xs font-medium text-muted-foreground">
+												Categoria
+											</label>
+											<MultiSelectFilter
+												placeholder="Todas"
+												options={categoryMultiOptions}
+												selected={getParamValues("category")}
+												onChange={(values) =>
+													handleMultiFilterChange("category", values)
+												}
+												disabled={isPending}
+												searchable
+												searchPlaceholder="Buscar categoria..."
+												groupOrder={["Despesas", "Receitas", "Outras"]}
+											/>
+										</div>

-								<div className="space-y-2">
-									<label className="text-sm font-medium">Conta/Cartão</label>
-									<MultiSelectFilter
-										placeholder="Todos"
-										options={accountCardMultiOptions}
-										selected={getParamValues("accountCard")}
-										onChange={(values) =>
-											handleMultiFilterChange("accountCard", values)
-										}
-										disabled={isPending}
-										searchable
-										searchPlaceholder="Buscar conta ou cartão..."
-										groupOrder={["Contas", "Cartões"]}
-									/>
-								</div>
-
-								<div className="space-y-2">
-									<label className="text-sm font-medium">Faixa de valor</label>
-									<div className="flex items-center gap-2">
-										<Input
-											type="number"
-											inputMode="decimal"
-											min="0"
-											step="0.01"
-											placeholder="Mínimo"
-											aria-label="Valor mínimo"
-											value={valorMinValue}
-											onChange={(event) => setValorMinValue(event.target.value)}
-											disabled={isPending}
-											className="text-sm border-dashed"
-										/>
-										<span className="text-xs text-muted-foreground">até</span>
-										<Input
-											type="number"
-											inputMode="decimal"
-											min="0"
-											step="0.01"
-											placeholder="Máximo"
-											aria-label="Valor máximo"
-											value={valorMaxValue}
-											onChange={(event) => setValorMaxValue(event.target.value)}
-											disabled={isPending}
-											className="text-sm border-dashed"
-										/>
+										<div className="space-y-1.5">
+											<label className="text-xs font-medium text-muted-foreground">
+												Conta/Cartão
+											</label>
+											<MultiSelectFilter
+												placeholder="Todos"
+												options={accountCardMultiOptions}
+												selected={getParamValues("accountCard")}
+												onChange={(values) =>
+													handleMultiFilterChange("accountCard", values)
+												}
+												disabled={isPending}
+												searchable
+												searchPlaceholder="Buscar conta ou cartão..."
+												groupOrder={["Contas", "Cartões"]}
+											/>
+										</div>
 									</div>
 								</div>

+								<Separator />
+
 								<div className="space-y-3">
-									<p className="text-sm font-medium">Status</p>
-									<div className="space-y-3">
-										<div className="flex items-center justify-between">
-											<label
-												htmlFor="filter-pago"
-												className="text-sm text-muted-foreground cursor-pointer"
-											>
-												Somente pagos
+									<div className="space-y-2">
+										<div className="flex items-center justify-between gap-2">
+											<label className="text-xs font-medium text-muted-foreground">
+												Intervalo de datas
 											</label>
-											<Switch
-												id="filter-pago"
-												checked={
-													searchParams.get("settled") ===
-													SETTLED_FILTER_VALUES.PAID
-												}
-												disabled={isPending}
-												onCheckedChange={(checked) => {
-													handleFilterChange(
-														"settled",
-														checked ? SETTLED_FILTER_VALUES.PAID : null,
-													);
-												}}
-											/>
+											{hasDateRangeFilter ? (
+												<button
+													type="button"
+													onClick={handleResetDateRange}
+													disabled={isPending}
+													className="text-xs text-muted-foreground underline-offset-2 hover:text-foreground hover:underline disabled:pointer-events-none disabled:opacity-50"
+												>
+													Limpar período
+												</button>
+											) : null}
 										</div>
-										<div className="flex items-center justify-between">
-											<label
-												htmlFor="filter-nao-pago"
-												className="text-sm text-muted-foreground cursor-pointer"
-											>
-												Somente não pagos
-											</label>
-											<Switch
-												id="filter-nao-pago"
-												checked={
-													searchParams.get("settled") ===
-													SETTLED_FILTER_VALUES.UNPAID
+										<div className="grid gap-2 sm:grid-cols-[1fr_auto_1fr] sm:items-center">
+											<DatePicker
+												value={searchParams.get(DATE_START_PARAM) ?? ""}
+												onChange={(value) =>
+													handleDateFilterChange(DATE_START_PARAM, value)
 												}
+												placeholder="Data inicial"
 												disabled={isPending}
-												onCheckedChange={(checked) => {
-													handleFilterChange(
-														"settled",
-														checked ? SETTLED_FILTER_VALUES.UNPAID : null,
-													);
-												}}
+												inputClassName="border-dashed"
+												compact
+											/>
+											<span className="hidden text-xs text-muted-foreground sm:block">
+												até
+											</span>
+											<DatePicker
+												value={searchParams.get(DATE_END_PARAM) ?? ""}
+												onChange={(value) =>
+													handleDateFilterChange(DATE_END_PARAM, value)
+												}
+												placeholder="Data final"
+												disabled={isPending}
+												inputClassName="border-dashed"
+												compact
 											/>
 										</div>
 									</div>
+
+									<div className="space-y-2">
+										<label className="text-xs font-medium text-muted-foreground">
+											Faixa de valor
+										</label>
+										<div className="flex items-center gap-2">
+											<Input
+												type="number"
+												inputMode="decimal"
+												min="0"
+												step="0.01"
+												placeholder="Mínimo"
+												aria-label="Valor mínimo"
+												value={valorMinValue}
+												onChange={(event) =>
+													setValorMinValue(event.target.value)
+												}
+												disabled={isPending}
+												className="text-sm border-dashed"
+											/>
+											<span className="text-xs text-muted-foreground">até</span>
+											<Input
+												type="number"
+												inputMode="decimal"
+												min="0"
+												step="0.01"
+												placeholder="Máximo"
+												aria-label="Valor máximo"
+												value={valorMaxValue}
+												onChange={(event) =>
+													setValorMaxValue(event.target.value)
+												}
+												disabled={isPending}
+												className="text-sm border-dashed"
+											/>
+										</div>
+									</div>
+								</div>
+
+								<Separator />
+
+								<div className="space-y-3">
+									<ToggleGroup
+										type="single"
+										value={settledFilterValue}
+										onValueChange={(value) => {
+											if (!value) return;
+											handleFilterChange(
+												"settled",
+												value === FILTER_EMPTY_VALUE ? null : value,
+											);
+										}}
+										variant="outline"
+										size="sm"
+										className="grid w-full grid-cols-3 rounded-md bg-muted/30 p-0.5"
+										aria-label="Status de pagamento"
+									>
+										<ToggleGroupItem
+											value={FILTER_EMPTY_VALUE}
+											className="text-xs font-medium transition-all data-[state=on]:border-foreground data-[state=on]:bg-foreground data-[state=on]:text-background data-[state=on]:shadow-sm"
+										>
+											Todos
+										</ToggleGroupItem>
+										<ToggleGroupItem
+											value={SETTLED_FILTER_VALUES.PAID}
+											className="text-xs font-medium transition-all data-[state=on]:border-foreground data-[state=on]:bg-foreground data-[state=on]:text-background data-[state=on]:shadow-sm"
+										>
+											Pagos
+										</ToggleGroupItem>
+										<ToggleGroupItem
+											value={SETTLED_FILTER_VALUES.UNPAID}
+											className="text-xs font-medium transition-all data-[state=on]:border-foreground data-[state=on]:bg-foreground data-[state=on]:text-background data-[state=on]:shadow-sm"
+										>
+											Não pagos
+										</ToggleGroupItem>
+									</ToggleGroup>
 								</div>

 								<div className="flex items-center justify-between">
@@ -824,14 +958,45 @@ export function TransactionsFilters({
 							</div>

 							<DrawerFooter>
-								<Button
-									type="button"
-									variant="outline"
-									onClick={handleResetFilters}
-									disabled={isPending || !hasActiveFilters}
-								>
-									Limpar filtros
-								</Button>
+								<div className="flex items-center justify-between gap-3 rounded-md border border-dashed px-3 py-2">
+									<div className="flex min-w-0 flex-col gap-0.5">
+										<span
+											className="text-xs text-muted-foreground"
+											aria-live="polite"
+										>
+											{hasActiveFilters
+												? `${activeFilterCount} ${
+														activeFilterCount === 1
+															? "filtro ativo"
+															: "filtros ativos"
+													}`
+												: "Nenhum filtro ativo"}
+										</span>
+										{isPending ? (
+											<span
+												className="inline-flex items-center gap-1.5 text-xs text-muted-foreground"
+												role="status"
+											>
+												<Spinner
+													className="size-3"
+													role="presentation"
+													aria-hidden
+												/>
+												Aplicando filtros...
+											</span>
+										) : null}
+									</div>
+									<Button
+										type="button"
+										variant="ghost"
+										size="sm"
+										onClick={handleResetFilters}
+										disabled={isPending || !hasActiveFilters}
+										className="h-7 px-2 text-xs text-muted-foreground hover:text-foreground"
+									>
+										Limpar
+									</Button>
+								</div>
 							</DrawerFooter>
 						</DrawerContent>
 					</Drawer>
--- a/src/features/transactions/components/table/transactions-mobile-list.tsx
+++ b/src/features/transactions/components/table/transactions-mobile-list.tsx
@@ -0,0 +1,328 @@
+"use client";
+
+import {
+	RiArrowLeftRightLine,
+	RiArrowRightDownLine,
+	RiArrowRightUpLine,
+	RiAttachment2,
+	RiCalendarEventLine,
+	RiChat1Line,
+	RiGroupLine,
+	RiTimeLine,
+} from "@remixicon/react";
+import Image from "next/image";
+import type { ReactNode } from "react";
+import { EstablishmentLogo } from "@/shared/components/entity-avatar";
+import MoneyValues from "@/shared/components/money-values";
+import { Badge } from "@/shared/components/ui/badge";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "@/shared/components/ui/tooltip";
+import { formatDate } from "@/shared/utils/date";
+import { getConditionIcon, getPaymentMethodIcon } from "@/shared/utils/icons";
+import { cn } from "@/shared/utils/ui";
+import type { TransactionItem } from "../types";
+import { TransactionActionsMenu } from "./transaction-actions-menu";
+import { TransactionSettlementButton } from "./transaction-settlement-button";
+
+type TransactionsMobileListProps = {
+	data: TransactionItem[];
+	currentUserId: string;
+	onEdit?: (item: TransactionItem) => void;
+	onCopy?: (item: TransactionItem) => void;
+	onImport?: (item: TransactionItem) => void;
+	onConfirmDelete?: (item: TransactionItem) => void;
+	onViewDetails?: (item: TransactionItem) => void;
+	onRefund?: (item: TransactionItem) => void;
+	onToggleSettlement?: (item: TransactionItem) => void;
+	onAnticipate?: (item: TransactionItem) => void;
+	onViewAnticipationHistory?: (item: TransactionItem) => void;
+	isSettlementLoading: (id: string) => boolean;
+	showActions?: boolean;
+};
+
+export function TransactionsMobileList({
+	data,
+	currentUserId,
+	onEdit,
+	onCopy,
+	onImport,
+	onConfirmDelete,
+	onViewDetails,
+	onRefund,
+	onToggleSettlement,
+	onAnticipate,
+	onViewAnticipationHistory,
+	isSettlementLoading,
+	showActions = true,
+}: TransactionsMobileListProps) {
+	return (
+		<div className="space-y-3 md:hidden">
+			{data.map((item) => (
+				<TransactionMobileCard
+					key={item.id}
+					item={item}
+					currentUserId={currentUserId}
+					onEdit={onEdit}
+					onCopy={onCopy}
+					onImport={onImport}
+					onConfirmDelete={onConfirmDelete}
+					onViewDetails={onViewDetails}
+					onRefund={onRefund}
+					onToggleSettlement={onToggleSettlement}
+					onAnticipate={onAnticipate}
+					onViewAnticipationHistory={onViewAnticipationHistory}
+					isSettlementLoading={isSettlementLoading}
+					showActions={showActions}
+				/>
+			))}
+		</div>
+	);
+}
+
+type TransactionMobileCardProps = Omit<TransactionsMobileListProps, "data"> & {
+	item: TransactionItem;
+};
+
+function TransactionMobileCard({
+	item,
+	currentUserId,
+	onEdit,
+	onCopy,
+	onImport,
+	onConfirmDelete,
+	onViewDetails,
+	onRefund,
+	onToggleSettlement,
+	onAnticipate,
+	onViewAnticipationHistory,
+	isSettlementLoading,
+	showActions = true,
+}: TransactionMobileCardProps) {
+	const installmentBadge =
+		item.currentInstallment && item.installmentCount
+			? `${item.currentInstallment} de ${item.installmentCount}`
+			: null;
+	const isBoleto = item.paymentMethod === "Boleto" && item.dueDate;
+	const dueDateLabel =
+		isBoleto && item.dueDate ? `Venc. ${formatDate(item.dueDate)}` : null;
+	const hasNote = Boolean(item.note?.trim().length);
+	const isLastInstallment =
+		item.currentInstallment === item.installmentCount &&
+		item.installmentCount &&
+		item.installmentCount > 1;
+	const isReceita = item.transactionType === "Receita";
+	const isTransfer = item.transactionType === "Transferência";
+	const isIncomingTransfer = isTransfer && Number(item.amount) > 0;
+	const payerLabel = item.pagadorName?.trim() || "Sem pessoa";
+	const payerDisplayName = payerLabel.split(/\s+/)[0] ?? payerLabel;
+	const paymentMethodLabel =
+		item.paymentMethod === "Transferência bancária"
+			? "Transf. bancária"
+			: item.paymentMethod;
+
+	const type =
+		item.categoriaName === "Saldo inicial"
+			? "Saldo inicial"
+			: item.transactionType;
+
+	return (
+		<article
+			className={cn(
+				"rounded-md border bg-card px-3 py-2.5 shadow-xs",
+				item.paymentMethod === "Boleto" &&
+					item.dueDate &&
+					!item.isSettled &&
+					new Date(item.dueDate) < new Date() &&
+					"border-destructive/20 bg-destructive/3",
+			)}
+		>
+			<div className="flex items-center gap-2.5">
+				<EstablishmentLogo name={item.name} size={34} />
+				<div className="min-w-0 flex-1">
+					<div className="flex min-w-0 items-start justify-between gap-2">
+						<div className="min-w-0 flex-1">
+							<h3 className="truncate text-sm font-semibold leading-tight">
+								{item.name}
+							</h3>
+							<div className="mt-1 flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1 text-xs text-muted-foreground">
+								<span className="inline-flex items-center gap-1">
+									<RiCalendarEventLine className="size-3.5" aria-hidden />
+									{formatDate(item.purchaseDate)}
+								</span>
+								{dueDateLabel ? (
+									<span className="font-medium text-primary">
+										{dueDateLabel}
+									</span>
+								) : null}
+								<span className="truncate">{payerDisplayName}</span>
+							</div>
+						</div>
+						<div className="shrink-0 text-right">
+							<MoneyValues
+								amount={item.amount}
+								showPositiveSign={isReceita || isIncomingTransfer}
+								className={cn(
+									"whitespace-nowrap text-sm font-semibold",
+									isReceita ? "text-success" : "text-foreground",
+									isTransfer && "text-info",
+								)}
+							/>
+						</div>
+					</div>
+
+					<div className="mt-2 flex items-center justify-between gap-2">
+						<div className="flex min-w-0 flex-wrap items-center gap-1.5">
+							<IconBadge
+								label={type}
+								compact
+								className={getTransactionTypeIconClassName(type)}
+							>
+								{getTransactionTypeIcon(type)}
+							</IconBadge>
+							<IconBadge label={paymentMethodLabel} compact>
+								{getPaymentMethodIcon(item.paymentMethod)}
+							</IconBadge>
+							<IconBadge label={item.condition} compact>
+								{getConditionIcon(item.condition)}
+							</IconBadge>
+							{installmentBadge ? (
+								<Badge variant="outline" className="px-1.5 text-xs">
+									{installmentBadge}
+								</Badge>
+							) : null}
+							{item.isDivided ? (
+								<IconBadge label="Dividido entre pessoas" compact>
+									<RiGroupLine className="size-3.5" aria-hidden />
+								</IconBadge>
+							) : null}
+							{isLastInstallment ? (
+								<Tooltip>
+									<TooltipTrigger asChild>
+										<span className="inline-flex size-6 items-center justify-center rounded-full border text-muted-foreground">
+											<Image
+												src="/icons/party.svg"
+												alt=""
+												width={14}
+												height={14}
+												className="size-3.5"
+											/>
+											<span className="sr-only">Última parcela</span>
+										</span>
+									</TooltipTrigger>
+									<TooltipContent side="top">Última parcela!</TooltipContent>
+								</Tooltip>
+							) : null}
+							{item.isAnticipated ? (
+								<IconBadge label="Parcela antecipada" compact>
+									<RiTimeLine className="size-3.5" aria-hidden />
+								</IconBadge>
+							) : null}
+							{hasNote ? (
+								<Tooltip>
+									<TooltipTrigger asChild>
+										<span className="inline-flex size-6 items-center justify-center rounded-full border text-muted-foreground">
+											<RiChat1Line className="size-3.5" aria-hidden />
+											<span className="sr-only">Ver anotação</span>
+										</span>
+									</TooltipTrigger>
+									<TooltipContent
+										side="top"
+										align="start"
+										className="max-w-xs whitespace-pre-line"
+									>
+										{item.note}
+									</TooltipContent>
+								</Tooltip>
+							) : null}
+							{item.hasAttachments ? (
+								<IconBadge label="Possui anexos" compact>
+									<RiAttachment2 className="size-3.5" aria-hidden />
+								</IconBadge>
+							) : null}
+						</div>
+						{showActions ? (
+							<div className="flex shrink-0 items-center gap-1">
+								<TransactionSettlementButton
+									item={item}
+									isLoading={isSettlementLoading(item.id)}
+									onToggle={onToggleSettlement}
+								/>
+								<TransactionActionsMenu
+									item={item}
+									currentUserId={currentUserId}
+									onEdit={onEdit}
+									onCopy={onCopy}
+									onImport={onImport}
+									onConfirmDelete={onConfirmDelete}
+									onViewDetails={onViewDetails}
+									onRefund={onRefund}
+									onAnticipate={onAnticipate}
+									onViewAnticipationHistory={onViewAnticipationHistory}
+								/>
+							</div>
+						) : null}
+					</div>
+				</div>
+			</div>
+		</article>
+	);
+}
+
+function IconBadge({
+	label,
+	children,
+	compact = false,
+	className,
+}: {
+	label: string;
+	children: ReactNode;
+	compact?: boolean;
+	className?: string;
+}) {
+	if (!children) return null;
+
+	return (
+		<Tooltip>
+			<TooltipTrigger asChild>
+				<span
+					className={cn(
+						"inline-flex items-center rounded-full border text-xs text-muted-foreground",
+						compact ? "size-6 justify-center" : "gap-1 px-2 py-0.5",
+						className,
+					)}
+				>
+					{children}
+					{compact ? <span className="sr-only">{label}</span> : label}
+				</span>
+			</TooltipTrigger>
+			<TooltipContent side="top">{label}</TooltipContent>
+		</Tooltip>
+	);
+}
+
+function getTransactionTypeIcon(type: string) {
+	if (type === "Receita" || type === "Saldo inicial") {
+		return <RiArrowRightDownLine className="size-3.5" aria-hidden />;
+	}
+
+	if (type === "Transferência") {
+		return <RiArrowLeftRightLine className="size-3.5" aria-hidden />;
+	}
+
+	return <RiArrowRightUpLine className="size-3.5" aria-hidden />;
+}
+
+function getTransactionTypeIconClassName(type: string) {
+	if (type === "Receita" || type === "Saldo inicial") {
+		return "border-success/30 bg-success/5 text-success";
+	}
+
+	if (type === "Transferência") {
+		return "border-info/30 bg-info/5 text-info";
+	}
+
+	return "border-destructive/30 bg-destructive/5 text-destructive";
+}
--- a/src/features/transactions/components/table/transactions-table.tsx
+++ b/src/features/transactions/components/table/transactions-table.tsx
@@ -47,6 +47,7 @@ import type {
 import { TransactionsBulkBar } from "./transactions-bulk-bar";
 import { getTransactionColumns } from "./transactions-columns";
 import { TransactionsFilters } from "./transactions-filters";
+import { TransactionsMobileList } from "./transactions-mobile-list";
 import { TransactionsPagination } from "./transactions-pagination";

 type TransactionsTableProps = {
@@ -174,7 +175,7 @@ export function TransactionsTable({
 			: getPaginationRowModel(),
 		manualPagination: isServerPaginated,
 		pageCount: serverPagination?.totalPages,
-		enableRowSelection: true,
+		enableRowSelection: (row) => !row.original.readonly,
 	});

 	const rowModel = table.getRowModel();
@@ -349,7 +350,23 @@ export function TransactionsTable({
 				<CardContent className="px-2 py-4 sm:px-4">
 					{hasRows ? (
 						<>
-							<div className="overflow-x-auto">
+							<TransactionsMobileList
+								data={rowModel.rows.map((row) => row.original)}
+								currentUserId={currentUserId}
+								onEdit={onEdit}
+								onCopy={onCopy}
+								onImport={onImport}
+								onConfirmDelete={onConfirmDelete}
+								onViewDetails={onViewDetails}
+								onRefund={onRefund}
+								onToggleSettlement={onToggleSettlement}
+								onAnticipate={onAnticipate}
+								onViewAnticipationHistory={onViewAnticipationHistory}
+								isSettlementLoading={isSettlementLoading ?? (() => false)}
+								showActions={showActions}
+							/>
+
+							<div className="hidden overflow-x-auto md:block">
 								<Table>
 									<TableHeader>
 										{table.getHeaderGroups().map((headerGroup) => (
--- a/src/features/transactions/components/transactions-export.tsx
+++ b/src/features/transactions/components/transactions-export.tsx
@@ -43,15 +43,34 @@ const loadPdfDeps = async () => {
 	return { jsPDF, autoTable };
 };

+const formatPeriodDate = (dateString: string) =>
+	formatDateOnly(dateString, {
+		day: "2-digit",
+		month: "2-digit",
+		year: "numeric",
+	}) ?? dateString;
+
 export function TransactionsExport({
 	lancamentos,
 	period,
 	exportContext,
 }: TransactionsExportProps) {
 	const [isExporting, setIsExporting] = useState(false);
+	const dateStartFilter = exportContext?.filters.dateStartFilter ?? null;
+	const dateEndFilter = exportContext?.filters.dateEndFilter ?? null;
+	const periodLabel =
+		dateStartFilter || dateEndFilter
+			? `${dateStartFilter ? formatPeriodDate(dateStartFilter) : "Início"} até ${
+					dateEndFilter ? formatPeriodDate(dateEndFilter) : "hoje"
+				}`
+			: displayPeriod(period);
+	const filePeriodSlug =
+		dateStartFilter || dateEndFilter
+			? `${dateStartFilter ?? "inicio"}-${dateEndFilter ?? "hoje"}`
+			: period;

 	const getFileName = (extension: string) => {
-		return `lancamentos-${period}.${extension}`;
+		return `lancamentos-${filePeriodSlug}.${extension}`;
 	};

 	const formatDate = (dateString: string) => {
@@ -251,7 +270,7 @@ export function TransactionsExport({
 			doc.text("Lançamentos", titleX, 15);

 			doc.setFontSize(10);
-			doc.text(`Período: ${displayPeriod(period)}`, titleX, 22);
+			doc.text(`Período: ${periodLabel}`, titleX, 22);
 			doc.text(
 				`Gerado em: ${
 					formatDateTime(new Date(), {
--- a/src/features/transactions/components/types.ts
+++ b/src/features/transactions/components/types.ts
@@ -57,6 +57,7 @@ export type TransactionFilterOption = {
 	label: string;
 	icon?: string | null;
 	avatarUrl?: string | null;
+	type?: string | null;
 };

 export type AccountCardFilterOption = TransactionFilterOption & {
--- a/src/features/transactions/lib/constants.ts
+++ b/src/features/transactions/lib/constants.ts
@@ -33,3 +33,5 @@ export const SETTLED_FILTER_VALUES = {

 export const AMOUNT_MIN_PARAM = "valorMin";
 export const AMOUNT_MAX_PARAM = "valorMax";
+export const DATE_START_PARAM = "dataInicio";
+export const DATE_END_PARAM = "dataFim";
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Felipe Coutinho	e50eeba36e	feat(insights): adiciona suporte ao Ollama	2026-05-28 20:01:44 -03:00
Felipe Coutinho	26cb18a9ad	chore(release): prepara versao 2.7.0	2026-05-28 11:00:27 -03:00
Felipe Coutinho	382727a96d	chore(deps): atualiza dependencias do workspace	2026-05-28 11:00:20 -03:00
Felipe Coutinho	0df648c7f3	chore(config): atualiza ambiente e setup	2026-05-28 11:00:14 -03:00
Felipe Coutinho	27f361923c	style(ui): ajusta tipografia e descricoes	2026-05-28 10:59:46 -03:00
Felipe Coutinho	60b2612e8a	feat(relatorios): refina indicadores e filtros	2026-05-28 10:59:36 -03:00
Felipe Coutinho	0171b0ce2f	feat(lancamentos): refina filtros e tabela responsiva	2026-05-28 10:59:24 -03:00
Felipe Coutinho	311369f81b	feat(lancamentos): amplia divisao e resumo do modal	2026-05-28 10:59:13 -03:00
Felipe Coutinho	ef2c8c50e8	feat(contas): adiciona rendimento pelo extrato	2026-05-28 10:58:59 -03:00
Felipe Coutinho	5319d8a5a6	feat(insights): adiciona suporte ao MiniMax	2026-05-28 10:58:52 -03:00
Felipe Coutinho	37247e319c	feat(auth): adiciona sessao persistente no login	2026-05-28 10:58:43 -03:00
Felipe Coutinho	766af2b347	fix(ci): atualiza actions para checkout em Node 24	2026-05-23 13:27:22 -03:00
Felipe Coutinho	5dcd30010e	fix(lancamentos): corrige tipo do filtro selecionado	2026-05-23 13:22:32 -03:00
Felipe Coutinho	d589df6993	chore(release): prepara versao 2.6.4	2026-05-23 13:18:15 -03:00
Felipe Coutinho	8a19f0f311	feat(lancamentos): aprimora antecipacao de parcelas	2026-05-23 13:17:55 -03:00
Felipe Coutinho	887885cd98	feat(relatorios): refina analise de parcelas	2026-05-23 13:17:49 -03:00
Felipe Coutinho	7a0e33efd8	feat(lancamentos): adiciona filtro por intervalo de datas	2026-05-23 13:17:42 -03:00
Felipe Coutinho	b9557961e5	style(logos): formata dicionario de nomes	2026-05-23 13:03:27 -03:00
Felipe Coutinho	53c8e47981	Merge branch 'pr-69'	2026-05-23 12:57:48 -03:00
Felipe Coutinho	adc9292cd8	Merge branch 'pr-72'	2026-05-23 12:57:47 -03:00
Felipe Coutinho	b95d6f6752	Merge branch 'pr-70'	2026-05-23 12:57:43 -03:00
lucas	c9f667a065	fix(transactions): restaura scroll no container de anexos do TransactionDialog Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-23 12:08:30 -03:00
lucas	01d9c6ea05	(HEAD) fix(transactions): remove overflow styles do container de rolagem do TransactionDialog	2026-05-23 11:58:53 -03:00
lucas	d383d2db91	fix(transactions): usa data da última transação ao adicionar nova linha no MassAddDialog Quando o usuário adiciona uma nova linha de transação no dialog de múltiplos lançamentos, a data agora é pré-preenchida com o valor da transação anterior em vez da data atual. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-23 11:27:43 -03:00
lucas	7a8d01debe	feat(logos): adiciona nomes de exibicao via dicionario e busca sem acentos - Adiciona arquivo display-names.ts com 433 nomes legiveis (ex: bb.png → "Banco do Brasil") - Adiciona getLogoDisplayName() que consulta dicionario primeiro, com fallback para deriveNameFromLogo - Adiciona normalizeForSearch() para busca accent-insensitive - Atualiza account-dialog, card-dialog, logo-picker e use-logo-selection para usar a nova API Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-22 23:35:11 -03:00
lucas	3be15d3b15	feat(transactions): adiciona dialogo de confirmacao ao descartar lancamentos massivos Quando o usuario tenta fechar ou cancelar o dialogo de multiplos lancamentos com dados ainda nao salvos, agora exibe um ConfirmActionDialog pedindo confirmacao. Evita perda acidental de dados preenchidos. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-22 21:30:48 -03:00
Felipe Coutinho	fea9cf81d8	fix(docker): aplica configuracao do pnpm no build	2026-05-21 14:15:24 +00:00
Felipe Coutinho	7a10d431ab	chore(release): prepara versao 2.6.1	2026-05-21 14:06:08 +00:00
Felipe Coutinho	b7343eb235	fix(ci): usa pnpm do packageManager no workflow	2026-05-21 13:59:14 +00:00
Felipe Coutinho	3bcc392f38	chore(release): prepara versao 2.6.0	2026-05-21 13:48:19 +00:00
Felipe Coutinho	5241de44af	chore(deps): atualiza dependencias e pnpm	2026-05-21 13:48:07 +00:00
Felipe Coutinho	1a75662120	style(ui): refina indicadores e componentes visuais	2026-05-21 13:47:53 +00:00
Felipe Coutinho	7ca3f92467	feat(logos): adiciona logo da Bipa	2026-05-21 13:47:40 +00:00
Felipe Coutinho	6b044f3bc5	feat(cartoes): exibe fatura atual e ajusta indicadores	2026-05-21 13:47:30 +00:00
Felipe Coutinho	4e8f9cc5fa	feat(lancamentos): aprimora parcelamentos e protecoes	2026-05-21 13:47:14 +00:00
Felipe Coutinho	b6659ef66e	feat(importacao): melhora revisao de extratos	2026-05-21 13:46:42 +00:00
Felipe Coutinho	21d7396c80	feat(auth): permite bloquear novos cadastros	2026-05-21 13:46:26 +00:00
				`@@ -0,0 +1 @@`
				<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>MiniMax</title><defs><linearGradient id="lobe-icons-minimax-gradient" x1="0%" x2="100.182%" y1="50.057%" y2="50.057%"><stop offset="0%" stop-color="#E2167E"/><stop offset="100%" stop-color="#FE603C"/></linearGradient></defs><path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z" fill="url(#lobe-icons-minimax-gradient)" fill-rule="nonzero"/></svg>
				`@@ -0,0 +1 @@`
				`export const USER_INSTRUCTIONS_MAX_LENGTH = 1000;`