feat: persist hardware activities

[ovitrif]

Closes#1029
Refs #998

Description

This PR:

1. Persists hardware-wallet watcher activities and Electrum transaction details in bitkit-core under the wallet ID already derived and stored by master.
2. Uses the current bitkit-core activity model and the existing HwWalletId/KnownDevice identity path across watcher events, navigation, detail loading, tags, seen state, boost relationships, and deletion.
3. Returns app and paired hardware-wallet activity through one sorted Core list while retaining wallet-scoped row identity, detail lookup, transaction lookup, tags, and UI keys.
4. Reconciles each hardware watcher snapshot with Core, keeps live watcher state visible during persistence recovery, and emits received-transaction notifications after successful persistence.
5. Preserves Transfer To Spending metadata on the hardware wallet activity so one blue Transfer / From Savings row represents the funding transaction.
6. Deletes the removed device's Core activity scope and rebuilds that wallet's visible history from the watcher after re-pairing.

Preview

No visual redesign. Home, All Activity, Activity Detail, tag filtering, and Explore now render the wallet-scoped hardware activities supplied by bitkit-core.

QA Notes

Manual Tests

• 1. Settings → Advanced → Dev Settings → Trezor → pair the Bridge emulator: Home shows the connected hardware wallet tile, balance, and blue hardware activities.
• 2. Fund two hardware addresses with distinct amounts → mine a block → Home → Show All: both blue received rows appear once in the unified activity list.
• 3. Blue hardware receive → Activity Detail → add a tag → back → reopen → Explore: the tag persists and Inputs plus Outputs contain the Electrum transaction details.
• 4. All Activity → tag filter → select the hardware tag: the tagged blue row remains and untagged rows are absent.
• 5. Hardware wallet → Transfer To Spending → 25% → Continue → Open Trezor Connect → approve Recipient, Amount, Locktime, and Summary → Continue Using Bitkit: Home shows exactly one new blue Transfer / From Savings row and its detail shows TO SPENDING.
• 6. All Activity → switch Sent, Received, Other, and All: received hardware rows appear under Received, the hardware Transfer appears under Other, and All restores the combined list without a default-wallet duplicate.
• 7. Settings → Hardware Wallets → remove the paired device → re-pair the same wallet: its scoped activity disappears on removal and rebuilds without duplicate rows after pairing.
• 8.regression: app on-chain and LN activity → Activity Detail, tags, Explore, and wallet-specific lists: behavior matches master.

Automated Checks

• Unit tests updated:
  • coverage active watcher ownership, Core snapshot persistence, persistence recovery, wallet removal, transfer metadata, and activity/transaction ID collisions across wallet scopes: HwWalletRepoTest.kt, ActivityRepoTest.kt, and TransferRepoTest.kt
  • coverage for scoped detail/tag calls, global unified listing, scoped navigation, hardware notification routing, and Transfer To Spending ownership: ActivityDetailViewModelTest.kt, ActivityListViewModelTest.kt, AppViewModelSendFlowTest.kt, and TransferViewModelTest.kt
  • retain default-wallet behavior with the scoped repository API: NotifyPaymentReceivedHandlerTest.kt and BoostTransactionViewModelTest.kt
• Hardware-wallet journeys updated:
  • activity-blue-icons.xml and transfer-to-spending.xml; activity-detail-hw-tags.xml adds persisted tag and inputs/outputs coverage.
• Functional verification:
  • Android 17 emulator and deterministic T2T1 Bridge emulator completed pairing, two confirmed hardware receives, persisted tags, tag filtering, Core inputs/outputs, all activity-tab assertions, four-step device signing, and one wallet-scoped pending transfer row.
• Local checks:
  • just compile, just test, and just lint passed; all hardware-wallet journey XML files passed xmllint.

[ovitrif]

Indeed, most of these changes were already implemented

I rebuilt the branch from current master and retained the missing bitkit-core persistence and unified activity integration. The Trezor lifecycle, wallet identity, watcher APIs, and hardware-wallet foundation now come directly from master; the branch-local type and identity implementations are removed. The full repository checks and Bridge-backed hardware journeys pass on the reconstructed head.

Resolved in b4bbc26

[piotr-iohk]

There are some conflicts that would be good to resolve before testing.

[ovitrif]

There are some conflicts that would be good to resolve before testing.

I rebased this branch onto current origin/master (fe0ae42af), resolved the notification-handler test against the new presentation lifecycle, and reran just compile, just test, and just lint.

Resolved in 64cf108

[jvsena42]

tAck

[ovitrif]

Closes#1029
Refs #998

Description

This PR:

1. Persists hardware-wallet watcher activities and Electrum transaction details in bitkit-core under the wallet ID already derived and stored by master.
2. Uses the current bitkit-core activity model and the existing HwWalletId/KnownDevice identity path across watcher events, navigation, detail loading, tags, seen state, boost relationships, and deletion.
3. Returns app and paired hardware-wallet activity through one sorted Core list while retaining wallet-scoped row identity, detail lookup, transaction lookup, tags, and UI keys.
4. Reconciles each hardware watcher snapshot with Core, keeps live watcher state visible during persistence recovery, and emits received-transaction notifications after successful persistence.
5. Preserves Transfer To Spending metadata on the hardware wallet activity so one blue Transfer / From Savings row represents the funding transaction.
6. Deletes the removed device's Core activity scope and rebuilds that wallet's visible history from the watcher after re-pairing.

Preview

No visual redesign. Home, All Activity, Activity Detail, tag filtering, and Explore now render the wallet-scoped hardware activities supplied by bitkit-core.

QA Notes

Manual Tests

• 1. Settings → Advanced → Dev Settings → Trezor → pair the Bridge emulator: Home shows the connected hardware wallet tile, balance, and blue hardware activities.
• 2. Fund two hardware addresses with distinct amounts → mine a block → Home → Show All: both blue received rows appear once in the unified activity list.
• 3. Blue hardware receive → Activity Detail → add a tag → back → reopen → Explore: the tag persists and Inputs plus Outputs contain the Electrum transaction details.
• 4. All Activity → tag filter → select the hardware tag: the tagged blue row remains and untagged rows are absent.
• 5. Hardware wallet → Transfer To Spending → 25% → Continue → Open Trezor Connect → approve Recipient, Amount, Locktime, and Summary → Continue Using Bitkit: Home shows exactly one new blue Transfer / From Savings row and its detail shows TO SPENDING.
• 6. All Activity → switch Sent, Received, Other, and All: received hardware rows appear under Received, the hardware Transfer appears under Other, and All restores the combined list without a default-wallet duplicate.
• 7. Settings → Hardware Wallets → remove the paired device → re-pair the same wallet: its scoped activity disappears on removal and rebuilds without duplicate rows after pairing.
• 8.regression: app on-chain and LN activity → Activity Detail, tags, Explore, and wallet-specific lists: behavior matches master.

Automated Checks

• Unit tests updated:
  • coverage active watcher ownership, Core snapshot persistence, persistence recovery, wallet removal, transfer metadata, and activity/transaction ID collisions across wallet scopes: HwWalletRepoTest.kt, ActivityRepoTest.kt, and TransferRepoTest.kt
  • coverage for scoped detail/tag calls, global unified listing, scoped navigation, hardware notification routing, and Transfer To Spending ownership: ActivityDetailViewModelTest.kt, ActivityListViewModelTest.kt, AppViewModelSendFlowTest.kt, and TransferViewModelTest.kt
  • retain default-wallet behavior with the scoped repository API: NotifyPaymentReceivedHandlerTest.kt and BoostTransactionViewModelTest.kt
• Hardware-wallet journeys updated:
  • activity-blue-icons.xml and transfer-to-spending.xml; activity-detail-hw-tags.xml adds persisted tag and inputs/outputs coverage.
• Functional verification:
  • Android 17 emulator and deterministic T2T1 Bridge emulator completed pairing, two confirmed hardware receives, persisted tags, tag filtering, Core inputs/outputs, all activity-tab assertions, four-step device signing, and one wallet-scoped pending transfer row.
• Local checks:
  • just compile, just test, and just lint passed; all hardware-wallet journey XML files passed xmllint.

[ovitrif]

Indeed, most of these changes were already implemented

I rebuilt the branch from current master and retained the missing bitkit-core persistence and unified activity integration. The Trezor lifecycle, wallet identity, watcher APIs, and hardware-wallet foundation now come directly from master; the branch-local type and identity implementations are removed. The full repository checks and Bridge-backed hardware journeys pass on the reconstructed head.

Resolved in b4bbc26

[piotr-iohk]

There are some conflicts that would be good to resolve before testing.

[ovitrif]

There are some conflicts that would be good to resolve before testing.

I rebased this branch onto current origin/master (fe0ae42af), resolved the notification-handler test against the new presentation lifecycle, and reran just compile, just test, and just lint.

Resolved in 64cf108

[jvsena42]

tAck

[ovitrif]

Closes#1029
Refs #998

Description

This PR:

1. Persists hardware-wallet watcher activities and Electrum transaction details in bitkit-core under the wallet ID already derived and stored by master.
2. Uses the current bitkit-core activity model and the existing HwWalletId/KnownDevice identity path across watcher events, navigation, detail loading, tags, seen state, boost relationships, and deletion.
3. Returns app and paired hardware-wallet activity through one sorted Core list while retaining wallet-scoped row identity, detail lookup, transaction lookup, tags, and UI keys.
4. Reconciles each hardware watcher snapshot with Core, keeps live watcher state visible during persistence recovery, and emits received-transaction notifications after successful persistence.
5. Preserves Transfer To Spending metadata on the hardware wallet activity so one blue Transfer / From Savings row represents the funding transaction.
6. Deletes the removed device's Core activity scope and rebuilds that wallet's visible history from the watcher after re-pairing.

Preview

No visual redesign. Home, All Activity, Activity Detail, tag filtering, and Explore now render the wallet-scoped hardware activities supplied by bitkit-core.

QA Notes

Manual Tests

• 1. Settings → Advanced → Dev Settings → Trezor → pair the Bridge emulator: Home shows the connected hardware wallet tile, balance, and blue hardware activities.
• 2. Fund two hardware addresses with distinct amounts → mine a block → Home → Show All: both blue received rows appear once in the unified activity list.
• 3. Blue hardware receive → Activity Detail → add a tag → back → reopen → Explore: the tag persists and Inputs plus Outputs contain the Electrum transaction details.
• 4. All Activity → tag filter → select the hardware tag: the tagged blue row remains and untagged rows are absent.
• 5. Hardware wallet → Transfer To Spending → 25% → Continue → Open Trezor Connect → approve Recipient, Amount, Locktime, and Summary → Continue Using Bitkit: Home shows exactly one new blue Transfer / From Savings row and its detail shows TO SPENDING.
• 6. All Activity → switch Sent, Received, Other, and All: received hardware rows appear under Received, the hardware Transfer appears under Other, and All restores the combined list without a default-wallet duplicate.
• 7. Settings → Hardware Wallets → remove the paired device → re-pair the same wallet: its scoped activity disappears on removal and rebuilds without duplicate rows after pairing.
• 8.regression: app on-chain and LN activity → Activity Detail, tags, Explore, and wallet-specific lists: behavior matches master.

Automated Checks

• Unit tests updated:
  • coverage active watcher ownership, Core snapshot persistence, persistence recovery, wallet removal, transfer metadata, and activity/transaction ID collisions across wallet scopes: HwWalletRepoTest.kt, ActivityRepoTest.kt, and TransferRepoTest.kt
  • coverage for scoped detail/tag calls, global unified listing, scoped navigation, hardware notification routing, and Transfer To Spending ownership: ActivityDetailViewModelTest.kt, ActivityListViewModelTest.kt, AppViewModelSendFlowTest.kt, and TransferViewModelTest.kt
  • retain default-wallet behavior with the scoped repository API: NotifyPaymentReceivedHandlerTest.kt and BoostTransactionViewModelTest.kt
• Hardware-wallet journeys updated:
  • activity-blue-icons.xml and transfer-to-spending.xml; activity-detail-hw-tags.xml adds persisted tag and inputs/outputs coverage.
• Functional verification:
  • Android 17 emulator and deterministic T2T1 Bridge emulator completed pairing, two confirmed hardware receives, persisted tags, tag filtering, Core inputs/outputs, all activity-tab assertions, four-step device signing, and one wallet-scoped pending transfer row.
• Local checks:
  • just compile, just test, and just lint passed; all hardware-wallet journey XML files passed xmllint.

[ovitrif]

Indeed, most of these changes were already implemented

I rebuilt the branch from current master and retained the missing bitkit-core persistence and unified activity integration. The Trezor lifecycle, wallet identity, watcher APIs, and hardware-wallet foundation now come directly from master; the branch-local type and identity implementations are removed. The full repository checks and Bridge-backed hardware journeys pass on the reconstructed head.

Resolved in b4bbc26

[piotr-iohk]

There are some conflicts that would be good to resolve before testing.

[ovitrif]

There are some conflicts that would be good to resolve before testing.

I rebased this branch onto current origin/master (fe0ae42af), resolved the notification-handler test against the new presentation lifecycle, and reran just compile, just test, and just lint.

Resolved in 64cf108

[jvsena42]

tAck

[ovitrif]

Closes#1029
Refs #998

Description

This PR:

1. Persists hardware-wallet watcher activities and Electrum transaction details in bitkit-core under the wallet ID already derived and stored by master.
2. Uses the current bitkit-core activity model and the existing HwWalletId/KnownDevice identity path across watcher events, navigation, detail loading, tags, seen state, boost relationships, and deletion.
3. Returns app and paired hardware-wallet activity through one sorted Core list while retaining wallet-scoped row identity, detail lookup, transaction lookup, tags, and UI keys.
4. Reconciles each hardware watcher snapshot with Core, keeps live watcher state visible during persistence recovery, and emits received-transaction notifications after successful persistence.
5. Preserves Transfer To Spending metadata on the hardware wallet activity so one blue Transfer / From Savings row represents the funding transaction.
6. Deletes the removed device's Core activity scope and rebuilds that wallet's visible history from the watcher after re-pairing.

Preview

No visual redesign. Home, All Activity, Activity Detail, tag filtering, and Explore now render the wallet-scoped hardware activities supplied by bitkit-core.

QA Notes

Manual Tests

• 1. Settings → Advanced → Dev Settings → Trezor → pair the Bridge emulator: Home shows the connected hardware wallet tile, balance, and blue hardware activities.
• 2. Fund two hardware addresses with distinct amounts → mine a block → Home → Show All: both blue received rows appear once in the unified activity list.
• 3. Blue hardware receive → Activity Detail → add a tag → back → reopen → Explore: the tag persists and Inputs plus Outputs contain the Electrum transaction details.
• 4. All Activity → tag filter → select the hardware tag: the tagged blue row remains and untagged rows are absent.
• 5. Hardware wallet → Transfer To Spending → 25% → Continue → Open Trezor Connect → approve Recipient, Amount, Locktime, and Summary → Continue Using Bitkit: Home shows exactly one new blue Transfer / From Savings row and its detail shows TO SPENDING.
• 6. All Activity → switch Sent, Received, Other, and All: received hardware rows appear under Received, the hardware Transfer appears under Other, and All restores the combined list without a default-wallet duplicate.
• 7. Settings → Hardware Wallets → remove the paired device → re-pair the same wallet: its scoped activity disappears on removal and rebuilds without duplicate rows after pairing.
• 8.regression: app on-chain and LN activity → Activity Detail, tags, Explore, and wallet-specific lists: behavior matches master.

Automated Checks

• Unit tests updated:
  • coverage active watcher ownership, Core snapshot persistence, persistence recovery, wallet removal, transfer metadata, and activity/transaction ID collisions across wallet scopes: HwWalletRepoTest.kt, ActivityRepoTest.kt, and TransferRepoTest.kt
  • coverage for scoped detail/tag calls, global unified listing, scoped navigation, hardware notification routing, and Transfer To Spending ownership: ActivityDetailViewModelTest.kt, ActivityListViewModelTest.kt, AppViewModelSendFlowTest.kt, and TransferViewModelTest.kt
  • retain default-wallet behavior with the scoped repository API: NotifyPaymentReceivedHandlerTest.kt and BoostTransactionViewModelTest.kt
• Hardware-wallet journeys updated:
  • activity-blue-icons.xml and transfer-to-spending.xml; activity-detail-hw-tags.xml adds persisted tag and inputs/outputs coverage.
• Functional verification:
  • Android 17 emulator and deterministic T2T1 Bridge emulator completed pairing, two confirmed hardware receives, persisted tags, tag filtering, Core inputs/outputs, all activity-tab assertions, four-step device signing, and one wallet-scoped pending transfer row.
• Local checks:
  • just compile, just test, and just lint passed; all hardware-wallet journey XML files passed xmllint.

[ovitrif]

Indeed, most of these changes were already implemented

I rebuilt the branch from current master and retained the missing bitkit-core persistence and unified activity integration. The Trezor lifecycle, wallet identity, watcher APIs, and hardware-wallet foundation now come directly from master; the branch-local type and identity implementations are removed. The full repository checks and Bridge-backed hardware journeys pass on the reconstructed head.

Resolved in b4bbc26

[piotr-iohk]

There are some conflicts that would be good to resolve before testing.

[ovitrif]

There are some conflicts that would be good to resolve before testing.

I rebased this branch onto current origin/master (fe0ae42af), resolved the notification-handler test against the new presentation lifecycle, and reran just compile, just test, and just lint.

Resolved in 64cf108

[jvsena42]

tAck

[ovitrif]

Closes#1029
Refs #998

Description

This PR:

1. Persists hardware-wallet watcher activities and Electrum transaction details in bitkit-core under the wallet ID already derived and stored by master.
2. Uses the current bitkit-core activity model and the existing HwWalletId/KnownDevice identity path across watcher events, navigation, detail loading, tags, seen state, boost relationships, and deletion.
3. Returns app and paired hardware-wallet activity through one sorted Core list while retaining wallet-scoped row identity, detail lookup, transaction lookup, tags, and UI keys.
4. Reconciles each hardware watcher snapshot with Core, keeps live watcher state visible during persistence recovery, and emits received-transaction notifications after successful persistence.
5. Preserves Transfer To Spending metadata on the hardware wallet activity so one blue Transfer / From Savings row represents the funding transaction.
6. Deletes the removed device's Core activity scope and rebuilds that wallet's visible history from the watcher after re-pairing.

Preview

No visual redesign. Home, All Activity, Activity Detail, tag filtering, and Explore now render the wallet-scoped hardware activities supplied by bitkit-core.

QA Notes

Manual Tests

• 1. Settings → Advanced → Dev Settings → Trezor → pair the Bridge emulator: Home shows the connected hardware wallet tile, balance, and blue hardware activities.
• 2. Fund two hardware addresses with distinct amounts → mine a block → Home → Show All: both blue received rows appear once in the unified activity list.
• 3. Blue hardware receive → Activity Detail → add a tag → back → reopen → Explore: the tag persists and Inputs plus Outputs contain the Electrum transaction details.
• 4. All Activity → tag filter → select the hardware tag: the tagged blue row remains and untagged rows are absent.
• 5. Hardware wallet → Transfer To Spending → 25% → Continue → Open Trezor Connect → approve Recipient, Amount, Locktime, and Summary → Continue Using Bitkit: Home shows exactly one new blue Transfer / From Savings row and its detail shows TO SPENDING.
• 6. All Activity → switch Sent, Received, Other, and All: received hardware rows appear under Received, the hardware Transfer appears under Other, and All restores the combined list without a default-wallet duplicate.
• 7. Settings → Hardware Wallets → remove the paired device → re-pair the same wallet: its scoped activity disappears on removal and rebuilds without duplicate rows after pairing.
• 8.regression: app on-chain and LN activity → Activity Detail, tags, Explore, and wallet-specific lists: behavior matches master.

Automated Checks

• Unit tests updated:
  • coverage active watcher ownership, Core snapshot persistence, persistence recovery, wallet removal, transfer metadata, and activity/transaction ID collisions across wallet scopes: HwWalletRepoTest.kt, ActivityRepoTest.kt, and TransferRepoTest.kt
  • coverage for scoped detail/tag calls, global unified listing, scoped navigation, hardware notification routing, and Transfer To Spending ownership: ActivityDetailViewModelTest.kt, ActivityListViewModelTest.kt, AppViewModelSendFlowTest.kt, and TransferViewModelTest.kt
  • retain default-wallet behavior with the scoped repository API: NotifyPaymentReceivedHandlerTest.kt and BoostTransactionViewModelTest.kt
• Hardware-wallet journeys updated:
  • activity-blue-icons.xml and transfer-to-spending.xml; activity-detail-hw-tags.xml adds persisted tag and inputs/outputs coverage.
• Functional verification:
  • Android 17 emulator and deterministic T2T1 Bridge emulator completed pairing, two confirmed hardware receives, persisted tags, tag filtering, Core inputs/outputs, all activity-tab assertions, four-step device signing, and one wallet-scoped pending transfer row.
• Local checks:
  • just compile, just test, and just lint passed; all hardware-wallet journey XML files passed xmllint.

[ovitrif]

Indeed, most of these changes were already implemented

I rebuilt the branch from current master and retained the missing bitkit-core persistence and unified activity integration. The Trezor lifecycle, wallet identity, watcher APIs, and hardware-wallet foundation now come directly from master; the branch-local type and identity implementations are removed. The full repository checks and Bridge-backed hardware journeys pass on the reconstructed head.

Resolved in b4bbc26

[piotr-iohk]

There are some conflicts that would be good to resolve before testing.

[ovitrif]

There are some conflicts that would be good to resolve before testing.

I rebased this branch onto current origin/master (fe0ae42af), resolved the notification-handler test against the new presentation lifecycle, and reran just compile, just test, and just lint.

Resolved in 64cf108

[jvsena42]

tAck

[ovitrif]

Closes#1029
Refs #998

Description

This PR:

1. Persists hardware-wallet watcher activities and Electrum transaction details in bitkit-core under the wallet ID already derived and stored by master.
2. Uses the current bitkit-core activity model and the existing HwWalletId/KnownDevice identity path across watcher events, navigation, detail loading, tags, seen state, boost relationships, and deletion.
3. Returns app and paired hardware-wallet activity through one sorted Core list while retaining wallet-scoped row identity, detail lookup, transaction lookup, tags, and UI keys.
4. Reconciles each hardware watcher snapshot with Core, keeps live watcher state visible during persistence recovery, and emits received-transaction notifications after successful persistence.
5. Preserves Transfer To Spending metadata on the hardware wallet activity so one blue Transfer / From Savings row represents the funding transaction.
6. Deletes the removed device's Core activity scope and rebuilds that wallet's visible history from the watcher after re-pairing.

Preview

No visual redesign. Home, All Activity, Activity Detail, tag filtering, and Explore now render the wallet-scoped hardware activities supplied by bitkit-core.

QA Notes

Manual Tests

• 1. Settings → Advanced → Dev Settings → Trezor → pair the Bridge emulator: Home shows the connected hardware wallet tile, balance, and blue hardware activities.
• 2. Fund two hardware addresses with distinct amounts → mine a block → Home → Show All: both blue received rows appear once in the unified activity list.
• 3. Blue hardware receive → Activity Detail → add a tag → back → reopen → Explore: the tag persists and Inputs plus Outputs contain the Electrum transaction details.
• 4. All Activity → tag filter → select the hardware tag: the tagged blue row remains and untagged rows are absent.
• 5. Hardware wallet → Transfer To Spending → 25% → Continue → Open Trezor Connect → approve Recipient, Amount, Locktime, and Summary → Continue Using Bitkit: Home shows exactly one new blue Transfer / From Savings row and its detail shows TO SPENDING.
• 6. All Activity → switch Sent, Received, Other, and All: received hardware rows appear under Received, the hardware Transfer appears under Other, and All restores the combined list without a default-wallet duplicate.
• 7. Settings → Hardware Wallets → remove the paired device → re-pair the same wallet: its scoped activity disappears on removal and rebuilds without duplicate rows after pairing.
• 8.regression: app on-chain and LN activity → Activity Detail, tags, Explore, and wallet-specific lists: behavior matches master.

Automated Checks

• Unit tests updated:
  • coverage active watcher ownership, Core snapshot persistence, persistence recovery, wallet removal, transfer metadata, and activity/transaction ID collisions across wallet scopes: HwWalletRepoTest.kt, ActivityRepoTest.kt, and TransferRepoTest.kt
  • coverage for scoped detail/tag calls, global unified listing, scoped navigation, hardware notification routing, and Transfer To Spending ownership: ActivityDetailViewModelTest.kt, ActivityListViewModelTest.kt, AppViewModelSendFlowTest.kt, and TransferViewModelTest.kt
  • retain default-wallet behavior with the scoped repository API: NotifyPaymentReceivedHandlerTest.kt and BoostTransactionViewModelTest.kt
• Hardware-wallet journeys updated:
  • activity-blue-icons.xml and transfer-to-spending.xml; activity-detail-hw-tags.xml adds persisted tag and inputs/outputs coverage.
• Functional verification:
  • Android 17 emulator and deterministic T2T1 Bridge emulator completed pairing, two confirmed hardware receives, persisted tags, tag filtering, Core inputs/outputs, all activity-tab assertions, four-step device signing, and one wallet-scoped pending transfer row.
• Local checks:
  • just compile, just test, and just lint passed; all hardware-wallet journey XML files passed xmllint.

[ovitrif]

Indeed, most of these changes were already implemented

I rebuilt the branch from current master and retained the missing bitkit-core persistence and unified activity integration. The Trezor lifecycle, wallet identity, watcher APIs, and hardware-wallet foundation now come directly from master; the branch-local type and identity implementations are removed. The full repository checks and Bridge-backed hardware journeys pass on the reconstructed head.

Resolved in b4bbc26

[piotr-iohk]

There are some conflicts that would be good to resolve before testing.

[ovitrif]

There are some conflicts that would be good to resolve before testing.

I rebased this branch onto current origin/master (fe0ae42af), resolved the notification-handler test against the new presentation lifecycle, and reran just compile, just test, and just lint.

Resolved in 64cf108

[jvsena42]

tAck

[ovitrif]

Closes#1029
Refs #998

Description

This PR:

1. Persists hardware-wallet watcher activities and Electrum transaction details in bitkit-core under the wallet ID already derived and stored by master.
2. Uses the current bitkit-core activity model and the existing HwWalletId/KnownDevice identity path across watcher events, navigation, detail loading, tags, seen state, boost relationships, and deletion.
3. Returns app and paired hardware-wallet activity through one sorted Core list while retaining wallet-scoped row identity, detail lookup, transaction lookup, tags, and UI keys.
4. Reconciles each hardware watcher snapshot with Core, keeps live watcher state visible during persistence recovery, and emits received-transaction notifications after successful persistence.
5. Preserves Transfer To Spending metadata on the hardware wallet activity so one blue Transfer / From Savings row represents the funding transaction.
6. Deletes the removed device's Core activity scope and rebuilds that wallet's visible history from the watcher after re-pairing.

Preview

No visual redesign. Home, All Activity, Activity Detail, tag filtering, and Explore now render the wallet-scoped hardware activities supplied by bitkit-core.

QA Notes

Manual Tests

• 1. Settings → Advanced → Dev Settings → Trezor → pair the Bridge emulator: Home shows the connected hardware wallet tile, balance, and blue hardware activities.
• 2. Fund two hardware addresses with distinct amounts → mine a block → Home → Show All: both blue received rows appear once in the unified activity list.
• 3. Blue hardware receive → Activity Detail → add a tag → back → reopen → Explore: the tag persists and Inputs plus Outputs contain the Electrum transaction details.
• 4. All Activity → tag filter → select the hardware tag: the tagged blue row remains and untagged rows are absent.
• 5. Hardware wallet → Transfer To Spending → 25% → Continue → Open Trezor Connect → approve Recipient, Amount, Locktime, and Summary → Continue Using Bitkit: Home shows exactly one new blue Transfer / From Savings row and its detail shows TO SPENDING.
• 6. All Activity → switch Sent, Received, Other, and All: received hardware rows appear under Received, the hardware Transfer appears under Other, and All restores the combined list without a default-wallet duplicate.
• 7. Settings → Hardware Wallets → remove the paired device → re-pair the same wallet: its scoped activity disappears on removal and rebuilds without duplicate rows after pairing.
• 8.regression: app on-chain and LN activity → Activity Detail, tags, Explore, and wallet-specific lists: behavior matches master.

Automated Checks

• Unit tests updated:
  • coverage active watcher ownership, Core snapshot persistence, persistence recovery, wallet removal, transfer metadata, and activity/transaction ID collisions across wallet scopes: HwWalletRepoTest.kt, ActivityRepoTest.kt, and TransferRepoTest.kt
  • coverage for scoped detail/tag calls, global unified listing, scoped navigation, hardware notification routing, and Transfer To Spending ownership: ActivityDetailViewModelTest.kt, ActivityListViewModelTest.kt, AppViewModelSendFlowTest.kt, and TransferViewModelTest.kt
  • retain default-wallet behavior with the scoped repository API: NotifyPaymentReceivedHandlerTest.kt and BoostTransactionViewModelTest.kt
• Hardware-wallet journeys updated:
  • activity-blue-icons.xml and transfer-to-spending.xml; activity-detail-hw-tags.xml adds persisted tag and inputs/outputs coverage.
• Functional verification:
  • Android 17 emulator and deterministic T2T1 Bridge emulator completed pairing, two confirmed hardware receives, persisted tags, tag filtering, Core inputs/outputs, all activity-tab assertions, four-step device signing, and one wallet-scoped pending transfer row.
• Local checks:
  • just compile, just test, and just lint passed; all hardware-wallet journey XML files passed xmllint.

[ovitrif]

Indeed, most of these changes were already implemented

I rebuilt the branch from current master and retained the missing bitkit-core persistence and unified activity integration. The Trezor lifecycle, wallet identity, watcher APIs, and hardware-wallet foundation now come directly from master; the branch-local type and identity implementations are removed. The full repository checks and Bridge-backed hardware journeys pass on the reconstructed head.

Resolved in b4bbc26

[piotr-iohk]

There are some conflicts that would be good to resolve before testing.

[ovitrif]

There are some conflicts that would be good to resolve before testing.

I rebased this branch onto current origin/master (fe0ae42af), resolved the notification-handler test against the new presentation lifecycle, and reran just compile, just test, and just lint.

Resolved in 64cf108

[jvsena42]

tAck

[ovitrif]

Closes#1029
Refs #998

Description

This PR:

1. Persists hardware-wallet watcher activities and Electrum transaction details in bitkit-core under the wallet ID already derived and stored by master.
2. Uses the current bitkit-core activity model and the existing HwWalletId/KnownDevice identity path across watcher events, navigation, detail loading, tags, seen state, boost relationships, and deletion.
3. Returns app and paired hardware-wallet activity through one sorted Core list while retaining wallet-scoped row identity, detail lookup, transaction lookup, tags, and UI keys.
4. Reconciles each hardware watcher snapshot with Core, keeps live watcher state visible during persistence recovery, and emits received-transaction notifications after successful persistence.
5. Preserves Transfer To Spending metadata on the hardware wallet activity so one blue Transfer / From Savings row represents the funding transaction.
6. Deletes the removed device's Core activity scope and rebuilds that wallet's visible history from the watcher after re-pairing.

Preview

No visual redesign. Home, All Activity, Activity Detail, tag filtering, and Explore now render the wallet-scoped hardware activities supplied by bitkit-core.

QA Notes

Manual Tests

• 1. Settings → Advanced → Dev Settings → Trezor → pair the Bridge emulator: Home shows the connected hardware wallet tile, balance, and blue hardware activities.
• 2. Fund two hardware addresses with distinct amounts → mine a block → Home → Show All: both blue received rows appear once in the unified activity list.
• 3. Blue hardware receive → Activity Detail → add a tag → back → reopen → Explore: the tag persists and Inputs plus Outputs contain the Electrum transaction details.
• 4. All Activity → tag filter → select the hardware tag: the tagged blue row remains and untagged rows are absent.
• 5. Hardware wallet → Transfer To Spending → 25% → Continue → Open Trezor Connect → approve Recipient, Amount, Locktime, and Summary → Continue Using Bitkit: Home shows exactly one new blue Transfer / From Savings row and its detail shows TO SPENDING.
• 6. All Activity → switch Sent, Received, Other, and All: received hardware rows appear under Received, the hardware Transfer appears under Other, and All restores the combined list without a default-wallet duplicate.
• 7. Settings → Hardware Wallets → remove the paired device → re-pair the same wallet: its scoped activity disappears on removal and rebuilds without duplicate rows after pairing.
• 8.regression: app on-chain and LN activity → Activity Detail, tags, Explore, and wallet-specific lists: behavior matches master.

Automated Checks

• Unit tests updated:
  • coverage active watcher ownership, Core snapshot persistence, persistence recovery, wallet removal, transfer metadata, and activity/transaction ID collisions across wallet scopes: HwWalletRepoTest.kt, ActivityRepoTest.kt, and TransferRepoTest.kt
  • coverage for scoped detail/tag calls, global unified listing, scoped navigation, hardware notification routing, and Transfer To Spending ownership: ActivityDetailViewModelTest.kt, ActivityListViewModelTest.kt, AppViewModelSendFlowTest.kt, and TransferViewModelTest.kt
  • retain default-wallet behavior with the scoped repository API: NotifyPaymentReceivedHandlerTest.kt and BoostTransactionViewModelTest.kt
• Hardware-wallet journeys updated:
  • activity-blue-icons.xml and transfer-to-spending.xml; activity-detail-hw-tags.xml adds persisted tag and inputs/outputs coverage.
• Functional verification:
  • Android 17 emulator and deterministic T2T1 Bridge emulator completed pairing, two confirmed hardware receives, persisted tags, tag filtering, Core inputs/outputs, all activity-tab assertions, four-step device signing, and one wallet-scoped pending transfer row.
• Local checks:
  • just compile, just test, and just lint passed; all hardware-wallet journey XML files passed xmllint.

[ovitrif]

Indeed, most of these changes were already implemented

I rebuilt the branch from current master and retained the missing bitkit-core persistence and unified activity integration. The Trezor lifecycle, wallet identity, watcher APIs, and hardware-wallet foundation now come directly from master; the branch-local type and identity implementations are removed. The full repository checks and Bridge-backed hardware journeys pass on the reconstructed head.

Resolved in b4bbc26

[piotr-iohk]

There are some conflicts that would be good to resolve before testing.

[ovitrif]

There are some conflicts that would be good to resolve before testing.

I rebased this branch onto current origin/master (fe0ae42af), resolved the notification-handler test against the new presentation lifecycle, and reran just compile, just test, and just lint.

Resolved in 64cf108

[jvsena42]

tAck