Skip to content

fix: add public payment terms - #1933

Open
jvsena42 wants to merge 6 commits into
masterfrom
fix/tos-pubky-contact-payments
Open

jvsena42 wants to merge 6 commits into
masterfrom
fix/tos-pubky-contact-payments

Conversation

@jvsena42

@jvsena42 jvsena42 commented Nov 16, 2026 •

Copy link
Copy Markdown
Member

Closes #1938

Description

Adds the Terms of Use clauses for public payments. Bitkit makes private and public contact payments always on while a Pubky profile exists, with no toggle; deleting the profile stops them (Slack). App changes: synonymdev/bitkit-ios#1338, #1932.

Stacked on #1936, which replaces Slashtags with Pubky, adds the definitions and sets the effective date. This PR only adds clauses 6.5–6.5.5 and the journey check of 6.5.1. Mirrors synonymdev/synonym-website#265.

New clause 6.5 and its sub-clauses:

  • 6.5: creating or connecting a Pubky profile lets you receive payments through Paykit, and you agree to the clauses below.
  • 6.5.1: public payments are turned on when you create or connect a profile, an app update may turn them on for an existing profile, they stay on while you have a profile, and deleting or disconnecting it stops them.
  • 6.5.2: what public payments publish (payment details on your homeserver, readable by anyone who knows your Pubky) and that on-chain payments to them can be linked to your Pubky.
  • 6.5.3: deleting or disconnecting the profile stops new publishing and removes published details where the homeserver allows; copies others already read can't be recalled.
  • 6.5.4: the profile and payment details live on the homeserver that hosts your Pubky; a third-party homeserver is a Third-Party Service under Section 9.
  • 6.5.5: Synonym doesn't verify the identity behind a Pubky or its payment details.

Private contact payments get no new clause: JC confirmed the current Terms and Privacy Policy already cover them being on by default (Slack). JC should confirm that also covers payments having no off switch.

Twin: synonymdev/bitkit-ios#1342

Design

N/A — text-only change to an existing screen.

Preview

N/A

QA Notes

Setup

N/A — text-only change.

Journeys

  • J1: updated terms-of-use.xml — the USDT definition is now checked at 2.1.50 (was 2.1.49), and a new step checks the "6. PUBKY AND CONTACT PAYMENTS" heading and clause 6.5.1; same step sequence as the iOS twin

Manual Tests

  • 1. Fresh install → onboarding Terms of Use shows "6. PUBKY AND CONTACT PAYMENTS" with 6.1 to 6.5.5, definitions 2.1.33 "Paykit" and 2.1.39 "Pubky", and no "Slashtags" — reading legal copy against the website is not a listed journey capability

Automated Checks

  • ran compileDevDebugKotlin and detekt — pass

Evidence

Compile and detekt passed on this branch. The terms text was compared against the website PR's diff.

Gaps

J1 and manual test 1 not run on a device.

Models used

  • Planning/scoping: Claude Opus 5.5 (reasoning: Not exposed)
  • Implementation: Claude Opus 5.5 (reasoning: Not exposed)
  • Review: Not performed

🤖 Generated with Claude Code

@github-actions

github-actions Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

Regtest APK

Built from d170e23 (run).

Download bitkit-dev-debug universal APK (expires in 30 days).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
jvsena42 and others added 2 commits November 16, 2026 11:02
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@jvsena42
jvsena42 force-pushed the fix/tos-pubky-contact-payments branch from 57a6fb4 to e24e5a5 Compare November 16, 2026 14:02
@jvsena42
jvsena42 changed the base branch from master to fix/tos-replace-slashtags November 16, 2026 14:02
@jvsena42 jvsena42 changed the title fix: cover Pubky contact payments in terms of use fix: add public payment terms Nov 16, 2026
@talosmachina
talosmachina self-requested a review November 16, 2026 14:04
@ovitrif

ovitrif commented Nov 16, 2026

Copy link
Copy Markdown
Collaborator

Triage: #1938 tracks this PR in the 3.2.0 milestone, with the contact payments change it covers (#1932). Twin: synonymdev/bitkit-ios#1342 (synonymdev/bitkit-ios#1347).

@jvsena42
jvsena42 marked this pull request as ready for review November 16, 2026 14:09
@jvsena42
jvsena42 requested review from a team, ben-kaufman and ovitrif and removed request for a team November 16, 2026 14:09
@greptile-apps

greptile-apps Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 5/5

[Low impact] The PR appears safe to merge; no actionable issues remain.

Summary

Adds public-payment terms covering automatic publishing, public visibility, profile removal, homeservers, and recipient checks.

  • Bitkit’s terms explain when Pubky public payments stay on and what they reveal.

Reviews (3) · Last reviewed commit: "fix: name disconnecting as a way to stop..." · Reviewed by Greptile

@jvsena42
jvsena42 marked this pull request as draft November 16, 2026 14:21
jvsena42 and others added 2 commits November 16, 2026 11:25
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@jvsena42
jvsena42 marked this pull request as ready for review November 16, 2026 14:53
@jvsena42
jvsena42 marked this pull request as draft November 16, 2026 14:57
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@jvsena42
jvsena42 marked this pull request as ready for review November 16, 2026 15:03

@talosmachina talosmachina left a comment

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.

No findings. Adds Terms of Use clauses 6.5 to 6.5.5 (public payments through Paykit) to the onboarding TOS screen, plus a changelog fragment and a journey step for 6.5.1. Reviewed d170e23, light tier (text-only, 15 added lines), stacked on #1936.

What I checked, and 3 candidates I ruled out

Read in full: TOS.kt at the head, the journeys/terms-of-use.xml hunk, the changelog fragment.
Parity: the six clauses are word for word the same as the iOS twin synonymdev/bitkit-ios#1342.
CI: lint and detekt pass. The red build check is the gate job of a run whose build and Compose UI jobs were cancelled (BUILD_RESULT: cancelled, COMPOSE_RESULT: cancelled), not a failure; the newer build-and-test and compose-ui runs were still pending when I looked. Not built here: a text-only change in a Kotlin raw string, CI is the gate.

Ruled out

  • Defined terms: "Paykit" (2.1.33) and "Pubky" (2.1.39) are defined in the base PR; "Third-Party Service" in 6.5.4 matches the spelling Section 9 already uses throughout (the 2.1.49 definition spells it without the hyphen, which predates this PR).
  • Cross-reference: "Section 9" is "9. THIRD PARTY SERVICES" in the same file.
  • Journey order: the new 6.5.1 step sits between the section 6 heading and section 7.2, matching the scroll direction.

Merge confidence: 4/5, the change is copy, but CI has not finished a green run on this head yet.

@ovitrif
ovitrif changed the base branch from fix/tos-replace-slashtags to master November 16, 2026 17:09

@ovi-reviewer ovi-reviewer Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Verdict: ✅ Approve

Findings: None.

QA for d170e23:

Read the onboarding terms and continue ✅ The terms render through the final clause, and Continue opens the welcome screen without a checkbox.

J1, fresh English install, Android 16 / API 36, dev debug build from this head. Checked the November 27 date, required bold definitions and warnings, Section 6, clause 6.5.1, jury-trial waiver and final acceptance paragraph. Both welcome buttons are visible. GetStarted appears in the UI dump; the CLI omits SkipIntro, whose tag was confirmed in IntroScreen.kt.

J1-2x.small.mp4

Terms journey, 2× speed.

Read the public-payment clauses ✅ The Paykit and Pubky definitions and Section 6 through 6.5.5 render on a fresh installation.

Manual test 1. Read the public-payment wording, including disconnecting, public visibility, endpoint removal, homeservers and recipient checks. Source comparison confirms all six new clauses match the website and iOS twin exactly, and no Slashtags wording remains in TOS.kt.

manual1-2x.small.mp4

Definitions and public-payment clauses, 2× speed.

Check: wording and cross-platform parity ✅ The six clauses match, and the existing homeserver wording correction holds.

Checked the corrected homeserver clause, the Section 9 reference and the terms rendering path. The complete journey action sequence matches iOS. assembleDevDebug and git diff --check passed. Unit and lint suites were not rerun locally; build and tests and lint are green.

Twin: synonymdev/bitkit-ios#1342 fix: add public payment terms at 94efdb4 matches word for word. Its recorded terms QA covers the iOS flow.

Website: synonymdev/synonym-website#265 fix: add public payment terms to Bitkit terms at 8cd42b6 matches all six new clauses.

Coverage: full three-file diff 197244b..d170e23. No planned device cases remain unrun. Device QA covers the terms and acceptance flow; payment publishing and profile removal were not exercised by this text-only change.


Reviewed by gpt-6.1-sol-high

@ovitrif ovitrif left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

utAck

@jvsena42
jvsena42 enabled auto-merge November 17, 2026 14:29
@jvsena42
jvsena42 disabled auto-merge November 17, 2026 14:29

This branch has not been deployed

No deployments
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.

feat: terms of use cover contact payments

3 participants