Skip to content

Include contractor milestone payments in DAO Claim - #1751

Closed
dnlbui wants to merge 3 commits into
codex/1745-dao-loadingfrom
codex/1745-dao-claims
Closed

dnlbui wants to merge 3 commits into
codex/1745-dao-loadingfrom
codex/1745-dao-claims

Conversation

@dnlbui

@dnlbui dnlbui commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor

Deferred to follow-up #1765

This work is removed from the active #1745 stack by scope decision. #1745 now contains only mobile filters/navigation and session loading. Continue project Claim discovery, contractor tracking and the smallest data ownership design in #1765. Manual Retry is a separate investigation in #1770.

The implementation is preserved on codex/1745-archive-project-claims at 514dc9bb0eba0e8db048550009058ac63ab562f0. Use the preserved phase diff when reviewing this prototype after the active stack changes. The original source branch is also retained.

Historical implementation and validation

What Changed

Phase 3 of four: expand global Claim to include contractor milestone payments alongside voting rewards.

  • Share milestone eligibility between discovery and detail actions through DaoProjectClaims.
  • Scan project and tracked-reward candidates in batches of four, including candidates beyond the first page; count each record once.
  • Preserve verified results during partial failures and provide Retry instead of reporting an incorrect zero.
  • Wire discovery into Phase 2's cancellation lifecycle immediately. Keep basic fresh-detail/settlement synchronization, remaining claims, pagination and detail focus.

Fixed Flow

  1. Open Menu → DAO → Claim.
  2. Discover eligible voting rewards and contractor milestones, with both badges on overlapping records.
  3. Retry unresolved reads without losing verified claims; open the existing detail action to claim.
  4. Update Claim after fresh detail reads or settlement; remove a row only after all its claims are gone.
  5. Close during discovery to abort reads and stop later batches.

Why

Claim previously omitted contractor payments. Shared eligibility and bounded discovery make them reachable through the existing transaction path. This phase works independently; candidate cache reuse and broader fresh-read synchronization are isolated in Phase 4.

Validation

Rebased onto main a520abce and restacked on 2026-10-08. The checks below passed again after the rebase; all 12 commits in the complete DAO stack replayed without patch changes.

  • node --test --test-reporter=spec tests/dao-navigation-state.test.mjs tests/dao-loading-followups-phase1.test.mjs tests/dao-loading-cleanup.test.mjs tests/dao-expanded-claim.test.mjs tests/dao-project-milestone-claim.test.mjs tests/dao-claim-cancellation.test.mjs — 50 passed.
  • node local-patches/dao-navigation/check-claims.cjs
  • node local-patches/dao-navigation/check-claim-refresh.cjs
  • Browser fixtures passed for eligibility, overlapping claims, partial/retry behavior, account isolation, fresh detail changes, focus, pagination and simulated settlement outcomes.
  • node --check app.js, node --check dao.js and git diff --check passed.

Tests/fixtures remain local and uncommitted. Real-network signing/settlement and external client-testing CI were not run.

Historical Phase 3 of the former four-phase stack. Closed and removed from #1745; future implementation belongs to #1765. Review the preserved phase comparison linked above.

@dnlbui
dnlbui added this pull request to stack #1754 October 6, 2026 16:07
@dnlbui
dnlbui marked this pull request as draft October 7, 2026 15:16
@dnlbui
dnlbui force-pushed the codex/1745-dao-claims branch from bfa3355 to 6f5b589 Compare October 8, 2026 16:18
@dnlbui
dnlbui removed this pull request from stack #1754 October 8, 2026 16:19
@dnlbui
dnlbui force-pushed the codex/1745-dao-claims branch from 6f5b589 to a44a7f2 Compare October 8, 2026 17:22
@dnlbui
dnlbui force-pushed the codex/1745-dao-navigation branch from ca2eb08 to 70234ef Compare October 8, 2026 17:22
@dnlbui
dnlbui changed the base branch from codex/1745-dao-navigation to codex/1745-dao-loading October 8, 2026 17:22
@dnlbui
dnlbui added this pull request to stack #1769 October 8, 2026 17:28
@dnlbui
dnlbui force-pushed the codex/1745-dao-claims branch from a44a7f2 to 514dc9b Compare October 8, 2026 17:40
@dnlbui
dnlbui force-pushed the codex/1745-dao-loading branch from 800ab89 to 13b6113 Compare October 8, 2026 17:41
@dnlbui dnlbui closed this Oct 8, 2026
@dnlbui
dnlbui removed this pull request from stack #1769 October 8, 2026 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant