Skip to content

Commit 076b45b

Browse files
committed
Merge branch 'master' into test/calculator-widget-device-tests
# Conflicts: # app/src/androidTest/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreenTest.kt # app/src/androidTest/java/to/bitkit/ui/screens/widgets/blocks/BlocksPreviewScreenTest.kt # app/src/androidTest/java/to/bitkit/ui/screens/widgets/facts/FactsEditScreenTest.kt # app/src/androidTest/java/to/bitkit/ui/screens/widgets/facts/FactsPreviewScreenTest.kt
2 parents ce85c70 + 6fddaf5 commit 076b45b

132 files changed

Lines changed: 5629 additions & 4542 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/e2e.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ jobs:
305305
matrix:
306306
shard:
307307
- { name: multi_address_2_regtest, grep: "@multi_address_2" }
308+
- { name: pubky_paykit, grep: "@pubky" }
308309

309310
name: e2e-tests-staging - ${{ matrix.shard.name }}
310311

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## [Unreleased]
9+
- Fix Spending and Savings screens scrolling behind top bar and add gradient fade effect #892
910

1011
### Changed
1112
- Improve Pubky profile restore, contact editing, and contact routing flows #905
@@ -25,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2526
- Show loading state on Spending tab when node is not running #875
2627

2728
### Added
29+
- Transfer from Savings button on empty Spending screen when savings balance exists #882
2830
- Pubky profile onboarding with contact sync, import, and editing #824
2931
- Lightning Connections empty state with onboarding screen #857
3032
- Unified PIN management screen (enable/disable/change in one place) #857

app/src/androidTest/java/to/bitkit/ui/screens/widgets/blocks/BlockCardTest.kt

Lines changed: 67 additions & 105 deletions
Large diffs are not rendered by default.

app/src/androidTest/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreenTest.kt

Lines changed: 0 additions & 355 deletions
This file was deleted.

0 commit comments

Comments
 (0)