[INTW26] Conflict Dialog#247

Merged

mxc-maggiechen merged 15 commits intostagingfrom

sparsh/INTF26-conflict-dialog

May 7, 2026

Commits on Apr 4, 2026

rebase sparshs pr

Maggie Chen
authored and
Maggie Chen
committed
clean up styling for report button

Maggie Chen
authored and
Maggie Chen
committed
fix: address conflict dialog review feedback

OpsEclipse
authored and
Maggie Chen
committed
fix: align review flow with applicant record ids

OpsEclipse
authored and
Maggie Chen
committed
fix: remove unrelated branch changes

OpsEclipse
authored and
Maggie Chen
committed
refactor: make conflictDialogue api and panellayout api more abstract

Maggie Chen
authored and
Maggie Chen
committed
fix: remove stale back to home

Maggie Chen
authored and
Maggie Chen
committed
revert changes on tables

Maggie Chen
authored and
Maggie Chen
committed

Commits on Apr 15, 2026

address import comments

Maggie Chen
authored and
Maggie Chen
committed

Commits on Apr 17, 2026

refactor: address review cleanup comments
OpsEclipse
committed

Commits on May 6, 2026

fix styling on modals
mxc-maggiechen
committed