Integrate pre activity metadata and receive tags #219

ben-kaufman · 2025-11-13T12:41:02Z

This PR integrates pre-activity metadata from Bitkit Core.

Fixes #197

The pre-activity metadata is created before the send/ receive activities are created, and allow Bitkit Core to automatically add tags to an activity once created (for sent txs, the previous logic to apply tags was removed). Also for sent txs, it let's Bitkit Core auto fill the address for the activity, and for receive txs it helps in a more efficient lookup for the address the activity belongs to.

This PR also extracts certain UI components related to tags and reuses them across the app.
It also fixes the VSS backup to correctly backup and restore activities tags and pre-activity metadata.

Screen.Recording.2025-11-13.at.7.31.57.AM.mov

Copilot

Pull Request Overview

This PR integrates pre-activity metadata from Bitkit Core to automatically assign tags and addresses to activities. The implementation replaces manual tag application after sends with a pre-activity metadata system that creates metadata before activities are generated, enabling automatic tag assignment by Bitkit Core. The PR also refactors tag-related UI components into reusable views and fixes VSS backup to correctly handle activity tags and pre-activity metadata.

Key changes:

Refactored tag-related UI into reusable components (TagsListView, TagSelectionView, TagInputForm, PreviouslyUsedTagsView)
Implemented pre-activity metadata creation for send and receive flows
Added efficient address lookup for received transactions using pre-activity metadata
Updated VSS backup to properly backup/restore both activity tags and pre-activity metadata

Reviewed Changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
AddTagSheet.swift	Refactored to use new reusable tag components
SendTagScreen.swift	Simplified by using shared tag input components
SendConfirmationView.swift	Creates pre-activity metadata instead of applying tags post-send
ReceiveTag.swift	Stores tags in pre-activity metadata for future activity creation
ReceiveSheet.swift	Initializes tag manager and creates pre-activity metadata on appear
ReceiveEdit.swift	Uses TagSelectionView component and manages pre-activity metadata tags
ActivityItemView.swift	Refactored to use TagsListView component
TagSettingsView.swift	Simplified using TagsListView component
TagsListView.swift	New reusable component for displaying tag lists
TagSelectionView.swift	Refactored to accept callbacks instead of navigation binding
TagInputForm.swift	New reusable component for tag text input
PreviouslyUsedTagsView.swift	New component for displaying previously used tags
WalletViewModel.swift	Added methods to retrieve payment IDs and persist pre-activity metadata
ActivityListViewModel.swift	Removed obsolete findActivityAndAddTags method
CoreService.swift	Added pre-activity metadata methods and improved address finding for received transactions
BackupService.swift	Fixed to backup/restore activity tags and pre-activity metadata correctly
BackupPayloads.swift	Updated backup structures to use PreActivityMetadata and ActivityTags
Package.resolved	Updated bitkit-core dependency revision

Bitkit/Views/Wallets/Send/SendConfirmationView.swift

Bitkit/Services/CoreService.swift

Bitkit/ViewModels/WalletViewModel.swift

jvsena42 · 2025-11-13T17:17:28Z

Roadmap item
https://docs.google.com/spreadsheets/d/1NBtx1y-_ZcODo8L0LsbudBNV_9x7cF6MyckR_W1xxq4/edit?pli=1&gid=0#gid=0&range=C14

ovitrif · 2025-11-14T08:57:33Z

@ben-kaufman Is this ready for review?

I noticed review was requested early but then there was more commits, so now it's not certain 🤷🏻 :)

Copilot

Pull Request Overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 3 comments.

Bitkit/Views/Wallets/Send/SendConfirmationView.swift

Bitkit/Services/CoreService.swift

Bitkit/Services/BackupService.swift

jvsena42 · 2025-11-14T10:03:02Z

Next time it would be good to add suggestions of test flows

Bitkit/Services/CoreService.swift

Bitkit/Views/Wallets/Receive/ReceiveSheet.swift

jvsena42 · 2025-11-14T12:03:48Z

Tests:

Lightning

Create invoice -> add tags and description -> receive -> check if tags and description were added ❌

lightning_receive_tags.mp4

scan invoice -> add tags -> send -> check tags ✅

On-chain

Create BIP 21 invoice -> add tags -> receive -> activity details -> check tags ✅
Scan BIP 21 invoice -> add tags -> send -> activity details -> check address, fee, federate and tags ✅

jvsena42

Found just an issue in the tests

ovitrif · 2025-11-14T12:12:19Z

Next time it would be good to add suggestions of test flows

Yes please 🙏🏻
Helps reviewers AND testers.

Also for docs' purposes and tests blueprints.

ben-kaufman · 2025-11-14T12:49:41Z

Issue should now be fixed @jvsena42

Testing instructions are as you did + click in savings balance -> transfer to spending -> make sure the resulting activity is shown as transfer.

jvsena42 · 2025-11-14T13:03:44Z

Waiting E2E tests finish to check again

jvsena42 · 2025-11-14T13:06:03Z

@ben-kaufman could you confirm if this solves #197 ? If yes, please, add it to the description to the issue get closed automatically

ben-kaufman · 2025-11-14T13:08:01Z

@jvsena42 yes, add to the description.

ovitrif · 2025-11-14T13:08:25Z

@ben-kaufman could you confirm if this solves #197 ? If yesterday, please, add it to the description to the issue get closed automatically

For How To, see: Using keywords in issues and pull requests

jvsena42 · 2025-11-14T13:32:37Z

@ben-kaufman I guess the test tag TagInputReceive was deleted in the refactor
https://github.com/synonymdev/bitkit-ios/actions/runs/19365035716/job/55406829516?pr=219

ben-kaufman · 2025-11-14T13:41:23Z

Readded the test identifier

ovitrif · 2025-11-14T15:42:58Z

Issue should now be fixed @jvsena42

Testing instructions are as you did + click in savings balance -> transfer to spending -> make sure the resulting activity is shown as transfer.

You mean on the previous PR that was closed in favour of this?!

ben-kaufman · 2025-11-14T15:43:58Z

You mean on the previous PR that was closed in favour of this?!

Referring to the steps here #219 (comment)

jvsena42 · 2025-11-14T16:53:04Z

Testing...

jvsena42

Lightning

Create invoice -> add tags and description -> receive -> check if tags and description were added ✅
scan invoice -> add tags -> send -> check tags ✅

On-chain

Create BIP 21 invoice -> add tags -> receive -> activity details -> check tags ✅
Scan BIP 21 invoice -> add tags -> send -> activity details -> check address, fee, federate and tags ✅
Transfer to spending ✅
Reset and restore ✅

OBS: On transfer to spending, the pending transfer activities are not being displayed. They are only displayed after confirmed. (can be fixed in #226 )

transfer.mp4

jvsena42 · 2025-11-14T17:32:45Z

@ovitrif Merged because this branch was getting too complicated to maintain. If you find some issue, we can fix in other PR

ovitrif · 2025-11-14T17:34:56Z

@ovitrif Merged because this branch was getting too complicated to maintain. If you find some issue, we can fix in other PR

No worries, I tested myself and was about to approve, I was just writing my PR review comment 🙃

Had no requests for changes in THIS PR, but I randomly found another issue related to receive that needs fixing.

ovitrif

Tests

Receive Tags: all tests ok 🟢
Transfer: test ok 🟢
Send Tags: all tests ok 🟢

While testing receive tags, In found an issue not added in these changes, but related to the feature.

Receive > Edit > Tap Note textfield > Can't add tags anymore
Really need to show QR code and then edit again.

ovitrif · 2025-11-14T14:10:22Z

Bitkit/Models/BackupPayloads.swift

    let version: Int
    let createdAt: UInt64
-    let tagMetadata: [ActivityTagsMetadata]
+    let tagMetadata: [PreActivityMetadata]


Should we name it preActivityMetadata? I can do the same in Android ;)

Or even activityMetadata, since we won't likely have a different activity metadata soon 🤷🏻

ovitrif · 2025-11-14T17:42:47Z

While testing receive tags, In found an issue not added in these changes, but related to the feature.

Receive > Edit > Tap Note textfield > Can't add tags anymore Really need to show QR code and then edit again.

Added issue for it:

Bug: Edit Invoice - Can't add tags after adding note #227

Integrate pre activity metadata and receive tags

881c861

ben-kaufman requested review from jvsena42 and ovitrif November 13, 2025 12:41

Merge branch 'master' into feat/receive-tags

43536af

jvsena42 requested a review from Copilot November 13, 2025 13:00

Copilot AI reviewed Nov 13, 2025

View reviewed changes

Bitkit/Views/Wallets/Send/SendConfirmationView.swift Show resolved Hide resolved

Bitkit/Services/CoreService.swift Outdated Show resolved Hide resolved

Bitkit/Services/CoreService.swift Outdated Show resolved Hide resolved

Bitkit/Services/CoreService.swift Outdated Show resolved Hide resolved

Fix backup metadata notifications

7746146

jvsena42 reviewed Nov 13, 2025

View reviewed changes

Bitkit/ViewModels/WalletViewModel.swift Show resolved Hide resolved

Fixes

83b6ad8

ben-kaufman self-assigned this Nov 13, 2025

jvsena42 mentioned this pull request Nov 13, 2025

feat: Transfer activities #212

Closed

ben-kaufman added 3 commits November 13, 2025 10:01

Update bitkit-core v0.1.27

fee8c6d

Add fee and is transfer to pre activity metadata

77e9458

Update createTransferMetadata to check for existing activity

b7c4b85

ben-kaufman added 3 commits November 13, 2025 12:25

Fix issue

e849885

Update activity address default value

001ecb0

Merge branch 'master' into feat/receive-tags

682eb1c

jvsena42 requested a review from Copilot November 14, 2025 09:46

Copilot AI reviewed Nov 14, 2025

View reviewed changes

Bitkit/Views/Wallets/Send/SendConfirmationView.swift Show resolved Hide resolved

Bitkit/Services/CoreService.swift Show resolved Hide resolved

Bitkit/Services/BackupService.swift Show resolved Hide resolved

jvsena42 reviewed Nov 14, 2025

View reviewed changes

Bitkit/Services/CoreService.swift Outdated Show resolved Hide resolved

jvsena42 reviewed Nov 14, 2025

View reviewed changes

Bitkit/Views/Wallets/Receive/ReceiveSheet.swift Outdated Show resolved Hide resolved

jvsena42 requested changes Nov 14, 2025

View reviewed changes

Check timestamp before update

33442f7

ben-kaufman added 2 commits November 14, 2025 07:46

Fix tags persistence when updating invoice

355db73

Merge branch 'master' into feat/receive-tags

e24cd20

ben-kaufman requested a review from jvsena42 November 14, 2025 13:15

ben-kaufman force-pushed the feat/receive-tags branch from 3584d6d to 48ec99a Compare November 14, 2025 14:56

Re-add tags input test identifier

8d4e284

ben-kaufman force-pushed the feat/receive-tags branch from 48ec99a to 8d4e284 Compare November 14, 2025 15:27

Merge branch 'master' into feat/receive-tags

a21de1c

jvsena42 approved these changes Nov 14, 2025

View reviewed changes

jvsena42 merged commit 3ed23cc into master Nov 14, 2025
6 checks passed

jvsena42 deleted the feat/receive-tags branch November 14, 2025 17:31

ovitrif reviewed Nov 14, 2025

View reviewed changes

ovitrif mentioned this pull request Nov 14, 2025

Bug: Edit Invoice - Can't add tags after adding note #227

Closed

ben-kaufman mentioned this pull request Nov 21, 2025

Update preactivity metadata and transfer activity handling synonymdev/bitkit-android#476

Merged

Integrate pre activity metadata and receive tags #219

Integrate pre activity metadata and receive tags #219

Uh oh!

Conversation

ben-kaufman commented Nov 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jvsena42 commented Nov 13, 2025

Uh oh!

ovitrif commented Nov 14, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jvsena42 commented Nov 14, 2025

Uh oh!

Uh oh!

Uh oh!

jvsena42 commented Nov 14, 2025

Uh oh!

jvsena42 left a comment

Choose a reason for hiding this comment

Uh oh!

ovitrif commented Nov 14, 2025

Uh oh!

ben-kaufman commented Nov 14, 2025

Uh oh!

jvsena42 commented Nov 14, 2025

Uh oh!

jvsena42 commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ben-kaufman commented Nov 14, 2025

Uh oh!

ovitrif commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jvsena42 commented Nov 14, 2025

Uh oh!

ben-kaufman commented Nov 14, 2025

Uh oh!

ovitrif commented Nov 14, 2025

Uh oh!

ben-kaufman commented Nov 14, 2025

Uh oh!

jvsena42 commented Nov 14, 2025

Uh oh!

jvsena42 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jvsena42 commented Nov 14, 2025

Uh oh!

ovitrif commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ovitrif left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Tests

Uh oh!

ovitrif Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ben-kaufman commented Nov 13, 2025 •

edited

Loading

jvsena42 commented Nov 14, 2025 •

edited

Loading

ovitrif commented Nov 14, 2025 •

edited

Loading

jvsena42 left a comment •

edited

Loading

ovitrif commented Nov 14, 2025 •

edited

Loading

ovitrif left a comment •

edited

Loading

ovitrif Nov 14, 2025 •

edited

Loading

ovitrif commented Nov 14, 2025 •

edited

Loading