Skip to content

fix: update merge message#440

Open
JhonataSnts wants to merge 1 commit into
he4rt:4.xfrom
JhonataSnts:fix/429-account-merge-warning
Open

fix: update merge message#440
JhonataSnts wants to merge 1 commit into
he4rt:4.xfrom
JhonataSnts:fix/429-account-merge-warning

Conversation

@JhonataSnts

Copy link
Copy Markdown

O que mudou

Este PR melhora o texto do modal de mesclagem de contas para deixar mais claro o que acontece antes do usuário confirmar a ação.

Agora o modal informa explicitamente que:

  • a conta existente será mantida como principal;
  • a conta atual será absorvida/removida;
  • o histórico associado à conta mantida será preservado;
  • após finalizar, o usuário será autenticado novamente na conta mantida.

A regra de mesclagem não foi alterada. A mudança é apenas na mensagem exibida para reduzir ambiguidade no fluxo.

Observação

Não configurei o OAuth real localmente para este PR, porque o fluxo depende de credenciais e callbacks cadastrados nos provedores.

O teste cobre o estado pós-OAuth simulando o oauth_merge_pending, que é exatamente o ponto em que o modal de confirmação é exibido.

Também fiz uma validação visual local forçando temporariamente a abertura do modal apenas para gerar o screenshot abaixo. Essa alteração temporária foi desfeita antes do commit.

Screenshots

image

Testes

  • php artisan test tests\Feature\ConnectionHubMergeModalTest.php

Closes #429

@JhonataSnts
JhonataSnts requested a review from a team July 20, 2026 22:46
@coderabbitai

coderabbitai Bot commented Jul 20, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Pro

Run ID: ce7addb2-6d46-49f9-ba0b-2cdf5cbda8c5

📥 Commits

Reviewing files that changed from the base of the PR and between 4f778b8 and 43304eb.

📒 Files selected for processing (2)
  • resources/views/livewire/connection-hub.blade.php
  • tests/Feature/ConnectionHubMergeModalTest.php

📝 Walkthrough

Walkthrough

The merge confirmation modal now uses an amber alert to identify the primary account, explain that the current account is absorbed while preserving history, and state that authentication resumes on the primary account. A feature test covers the rendered Portuguese messaging using seeded users, an external identity, and pending OAuth merge session data.

Suggested reviewers: danielhe4rt

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title is concise and accurately reflects the merge message update.
Description check ✅ Passed The description matches the UI wording change and the added feature test.
Linked Issues check ✅ Passed The PR addresses #429 by clarifying which account stays primary and which is absorbed.
Out of Scope Changes check ✅ Passed The changes stay within the account-merge messaging and its test coverage.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@fernanduandrade fernanduandrade added profile Profile module type:fix Bug fix labels Jul 21, 2026
/>
<div>
<p class="text-sm font-medium text-amber-800 dark:text-amber-300">
A conta @ {{ $mergeTarget['username'] }} será mantida como principal.

@RomuloLim RomuloLim Jul 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Dúvida genuína: @ username ao invés de @username seria um padrão que o sistema já utiliza?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Normalmente é junto, não reparei de ter um padrão para isso sinda

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

profile Profile module type:fix Bug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Mesclagem de contas (Discord/GitHub) não informa qual conta será sobreposta

4 participants