Skip to content

fix: replace Slashtags with Pubky in terms of use - #1936

Merged
ovitrif merged 2 commits into
masterfrom
fix/tos-replace-slashtags
Nov 16, 2026
Merged

ovitrif merged 2 commits into
masterfrom
fix/tos-replace-slashtags

Conversation

@jvsena42

@jvsena42 jvsena42 commented Nov 16, 2026 •

Copy link
Copy Markdown
Member

Description

Replaces Slashtags with Pubky in the in-app Terms of Use, mirroring the same change on bitkit.to (synonymdev/synonym-website, see the linked PR there). Bitkit no longer uses Slashtags.

  • Section 6 "SLASHTAGS" is now "6. PUBKY AND CONTACT PAYMENTS". Clauses 6.1–6.4 carry over with Pubky and Paykit in place of Slashtags.
  • Definitions: "Slashtags" is removed; "Paykit" (2.1.33) and "Pubky" (2.1.39) are added, and the definitions after them are renumbered. "Bitkit Services" (2.1.5) and 7.1.1 say Pubky.
  • Effective date: November 27, 2026, the due date of the 3.2.0 milestone (was October 20, 2026).
  • journeys/terms-of-use.xml: checks the new date, the USDT definition at 2.1.50, and the Section 6 heading.

The clauses about public payments (6.5–6.5.5) are in #1933, stacked on this PR, so they can be reviewed on their own.

Twin: synonymdev/bitkit-ios#1345

Out of Scope

QA Notes

  • Not run on a device yet. Journey: journeys/terms-of-use.xml.

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@jvsena42 jvsena42 self-assigned this Nov 16, 2026
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@talosmachina
talosmachina self-requested a review November 16, 2026 14:04
@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
@ovitrif

ovitrif commented Nov 16, 2026

Copy link
Copy Markdown
Collaborator

Triage: this PR goes in the 3.2.0 milestone under #1938, with #1933 stacked on it; that one closes the issue once it targets master. Twin: synonymdev/bitkit-ios#1345.

@greptile-apps

greptile-apps Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] The PR appears safe to merge.

Summary

Replaces Slashtags with Pubky and Paykit in the in-app terms.

  • Bitkit’s terms describe profiles and contact payments as Pubky and Paykit.
  • The terms screen shows November 27, 2026 as its effective date.

No actionable issues found. Device tests were not run.

Reviews (1) · Last reviewed commit: "chore: add changelog fragment" · Reviewed by Greptile

@github-actions

Copy link
Copy Markdown
Contributor

Regtest APK

Built from 197244b (run).

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

@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. Replaces Slashtags with Pubky and Paykit in the in-app Terms of Use (section 6, definitions 2.1.5/2.1.33/2.1.39, 7.1.1) and moves the effective date to November 27, 2026. Reviewed 197244b, full tier, root of the stack under #1933.

What I checked, and 4 candidates I ruled out

Read in full: TOS.kt at the head, journeys/terms-of-use.xml, the changelog fragment
CI: green (build-and-test, compose-ui, detekt, e2e-tests-local shards, Greptile)
Build: not run here; on the Bitkit Android track the branch is reviewed from the code and CI, which built and tested it

Ruled out

  • Definition numbering: the 54 2.1.x entries run 1 to 54 with no gap or duplicate after inserting Paykit (2.1.33) and Pubky (2.1.39) and dropping Slashtags; alphabetical order holds.
  • Stale cross-references: no clause refers to a definition by number, and the remaining section references (9, 10.2, 14.1, 20) are unaffected by the change; no Slashtags is left in TOS.kt.
  • Journey drift: USDT really is 2.1.50 now, and the section 6 heading matches the new step word for word.
  • Twin parity: the 2.1.5/2.1.33/2.1.39 and 6.1 to 6.4 text matches Tos.swift on synonymdev/bitkit-ios word for word, and so does the effective date.

Merge confidence: 5/5, CI green, files read whole, and the change is legal copy, which no unit test applies to (the journey covers the heading and date).

Reviewer model: claude-opus-5-5
Reasoning effort: Not exposed (the run metadata does not record it)

@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 197244b:

Onboarding terms and Continue ✅ The new date, USDT definition and Pubky heading render correctly, the journey's bold spans and final clause remain readable, and Continue opens the welcome screen.

Drove journeys/terms-of-use.xml on a fresh English Android 16 install using an assembleDevDebug build of this head. Both welcome controls are visible; SkipIntro was checked visually because its tag is omitted from the UI dump, and the tag is present in source.

Recordings follow the journey in order, at 2× speed.

Date and definitions Warnings and Pubky heading Final clauses and Continue
terms-start2x.2x.mp4
terms-middle2x.small.mp4
terms-end2x.2x.mp4
Check: terms numbering and twin parity ✅ Source comparison confirms consecutive definitions, removal of Slashtags and matching replacement wording.

Definitions run from 2.1.1 through 2.1.54 without gaps or duplicates. The changed prose matches synonym-website#266 fix: replace Slashtags with Pubky in Bitkit terms. Journey XML parsing and git diff --check pass.

No planned cases remain unrun. Full review of abf4665..197244b, covering all three changed files and the onboarding rendering path; changelog and full copy parity were checked in source.

Twin: bitkit-ios#1345 fix: replace Slashtags with Pubky in terms of use at d328bec matches the changed wording, date and journey.


Reviewed by gpt-6.1-sol-high

@ben-kaufman ben-kaufman 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 material findings in the terminology and terms changes at 197244b. This review did not verify device rendering or run journeys/terms-of-use.xml. The public-payment wording in #1933 is outside this approval.

Reviewer model: gpt-6.1-sol
Reasoning effort: xhigh

@ovitrif

ovitrif commented Nov 16, 2026

Copy link
Copy Markdown
Collaborator

Merged, as it was approved and green.

@ovitrif
ovitrif merged commit 924604e into master Nov 16, 2026
36 of 40 checks passed
@ovitrif
ovitrif deleted the fix/tos-replace-slashtags branch November 16, 2026 17:10
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.

4 participants